GNOME.org
 

[libgda] Replace deprecated GtkHButtonBox and GtkVButtonBox with GtkButtonBox.

commit 2578bdc17da89131bc1d1abd23ae58c883ba06c3
Author: Murray Cumming <murrayc murrayc com>
Date:   Mon Jul 4 12:52:12 2011 +0200

    Replace deprecated GtkHButtonBox and GtkVButtonBox with GtkButtonBox.
    
    This (tedious) deprecation happened in GTK+ 3.1/3.2.

 libgda-ui/data-entries/common-bin.c           |    2 +-
 libgda-ui/demos/ddl_queries.c                 |    2 +-
 libgda-ui/gdaui-data-filter.c                 |    2 +-
 testing/gdaui-test-data-entries.c             |    2 +-
 tools/browser/browser-connections-list.c      |    2 +-
 tools/browser/canvas-example.c                |    2 +-
 tools/browser/canvas/browser-canvas-print.c   |    4 ++--
 tools/browser/data-manager/data-console.c     |    2 +-
 tools/browser/ldap-browser/ldap-search-page.c |    2 +-
 tools/browser/query-exec/query-console-page.c |    6 +++---
 10 files changed, 13 insertions(+), 13 deletions(-)
---
diff --git a/libgda-ui/data-entries/common-bin.c b/libgda-ui/data-entries/common-bin.c
index 4c58f5f..75b4286 100644
--- a/libgda-ui/data-entries/common-bin.c
+++ b/libgda-ui/data-entries/common-bin.c
@@ -210,7 +210,7 @@ common_bin_create_menu (BinMenu *binmenu, PopupContainerPositionFunc pos_func, G
 	gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0);
 	binmenu->props_label = label;
 
-	bbox = gtk_hbutton_box_new ();
+	bbox = gtk_button_box_new (GTK_ORIENTATION_HORIZONTAL);
 	gtk_box_pack_start (GTK_BOX (vbox), bbox, FALSE, FALSE, 0);
 
 	button = gtk_button_new_from_stock (GTK_STOCK_OPEN);
diff --git a/libgda-ui/demos/ddl_queries.c b/libgda-ui/demos/ddl_queries.c
index ee48419..fcd6c24 100644
--- a/libgda-ui/demos/ddl_queries.c
+++ b/libgda-ui/demos/ddl_queries.c
@@ -124,7 +124,7 @@ do_ddl_queries (GtkWidget *do_widget)
 		data->op_container = vp;
 		
 		/* bottom buttons */
-		bbox = gtk_hbutton_box_new ();
+		bbox = gtk_button_box_new (GTK_ORIENTATION_HORIZONTAL);
 		gtk_table_attach (GTK_TABLE (table), bbox, 0, 2, 5, 6, 0, 0, 0, 0);
 
 		wid = gtk_button_new_with_label ("Show named parameters");
diff --git a/libgda-ui/gdaui-data-filter.c b/libgda-ui/gdaui-data-filter.c
index 5e74906..b26eaf1 100644
--- a/libgda-ui/gdaui-data-filter.c
+++ b/libgda-ui/gdaui-data-filter.c
@@ -221,7 +221,7 @@ gdaui_data_filter_init (GdauiDataFilter * wid)
 	wid->priv->notice = label;
 	gtk_table_attach (GTK_TABLE (table), label, 0, 2, 1, 2, GTK_FILL, 0, GTK_SHRINK, 5);
 
-	bbox = gtk_hbutton_box_new ();
+	bbox = gtk_button_box_new (GTK_ORIENTATION_HORIZONTAL);
 	gtk_table_attach (GTK_TABLE (table), bbox, 0, 2, 2, 3, GTK_FILL | GTK_EXPAND, 0, GTK_SHRINK, 5);
 	button = gtk_button_new_with_label (_("Set filter"));
 	gtk_container_add (GTK_CONTAINER (bbox), button);
diff --git a/testing/gdaui-test-data-entries.c b/testing/gdaui-test-data-entries.c
index f67d937..c76e750 100644
--- a/testing/gdaui-test-data-entries.c
+++ b/testing/gdaui-test-data-entries.c
@@ -741,7 +741,7 @@ build_basic_test_for_gtype (GdaDataHandler *dh, GType type, const gchar *plugin_
 
 	entry_contents_modified (wid, GTK_LABEL (label));
 
-	bbox = gtk_hbutton_box_new ();
+	bbox = gtk_button_box_new (GTK_ORIENTATION_HORIZONTAL);
 	gtk_table_attach (GTK_TABLE (table), bbox, 0, 3, 4, 5, 0, 0, 0, 0);
 		
 	button = gtk_toggle_button_new_with_label (_("NULL ok"));
diff --git a/tools/browser/browser-connections-list.c b/tools/browser/browser-connections-list.c
index dc339d5..36bc828 100644
--- a/tools/browser/browser-connections-list.c
+++ b/tools/browser/browser-connections-list.c
@@ -385,7 +385,7 @@ browser_connections_list_show (BrowserConnection *current)
 
 		/* buttons at the bottom*/
 		GtkWidget *bbox, *button;
-		bbox = gtk_hbutton_box_new ();
+		bbox = gtk_button_box_new (GTK_ORIENTATION_HORIZONTAL);
 		gtk_table_attach (GTK_TABLE (table), bbox, 1, 2, 3, 4, GTK_EXPAND | GTK_FILL, 0, 0, 6);
 		gtk_button_box_set_layout (GTK_BUTTON_BOX (bbox), GTK_BUTTONBOX_END);
 		button = gtk_button_new_with_label (_("Close connection"));
diff --git a/tools/browser/canvas-example.c b/tools/browser/canvas-example.c
index 18c4a30..251d68f 100644
--- a/tools/browser/canvas-example.c
+++ b/tools/browser/canvas-example.c
@@ -93,7 +93,7 @@ main (int argc, char *argv[])
 				   0, 1, 0, 1);
 
 	GtkWidget *bbox, *button;
-	bbox = gtk_hbutton_box_new ();
+	bbox = gtk_button_box_new (GTK_ORIENTATION_HORIZONTAL);
 	gtk_table_attach (GTK_TABLE (table), bbox, 0, 1, 1, 2, 0, 0, 0, 0);
 	button = gtk_button_new_with_label ("Auto layout");
 	g_signal_connect (button, "clicked",
diff --git a/tools/browser/canvas/browser-canvas-print.c b/tools/browser/canvas/browser-canvas-print.c
index bec5f1d..290a732 100644
--- a/tools/browser/canvas/browser-canvas-print.c
+++ b/tools/browser/canvas/browser-canvas-print.c
@@ -230,7 +230,7 @@ print_create_custom_widget_cb (G_GNUC_UNUSED GtkPrintOperation *operation, Print
 	gtk_container_set_border_width (GTK_CONTAINER (vbox), 10);
 
 	/* page size's adjustments */
-	bbox = gtk_hbutton_box_new ();
+	bbox = gtk_button_box_new (GTK_ORIENTATION_HORIZONTAL);
 	gtk_box_pack_start (GTK_BOX (vbox), bbox, FALSE, FALSE, 0);
 	gtk_button_box_set_layout (GTK_BUTTON_BOX (bbox), GTK_BUTTONBOX_START);
 
@@ -300,7 +300,7 @@ print_create_custom_widget_cb (G_GNUC_UNUSED GtkPrintOperation *operation, Print
         label = gtk_label_new ("    ");
         gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0);
 
-	bbox = gtk_hbutton_box_new ();
+	bbox = gtk_button_box_new (GTK_ORIENTATION_HORIZONTAL);
 	gtk_box_pack_start (GTK_BOX (hbox), bbox, FALSE, FALSE, 0);
 	gtk_button_box_set_layout (GTK_BUTTON_BOX (bbox), GTK_BUTTONBOX_START);
 
diff --git a/tools/browser/data-manager/data-console.c b/tools/browser/data-manager/data-console.c
index 9587869..ab1680c 100644
--- a/tools/browser/data-manager/data-console.c
+++ b/tools/browser/data-manager/data-console.c
@@ -381,7 +381,7 @@ data_console_new (BrowserConnection *bcnc)
 
 	/* buttons */
 	GtkWidget *bbox, *button;
-	bbox = gtk_vbutton_box_new ();
+	bbox = gtk_button_box_new (GTK_ORIENTATION_VERTICAL);
 	gtk_button_box_set_layout (GTK_BUTTON_BOX (bbox), GTK_BUTTONBOX_END);
 	gtk_box_pack_start (GTK_BOX (hbox), bbox, FALSE, FALSE, 5);
 
diff --git a/tools/browser/ldap-browser/ldap-search-page.c b/tools/browser/ldap-browser/ldap-search-page.c
index 562df90..5301ecd 100644
--- a/tools/browser/ldap-browser/ldap-search-page.c
+++ b/tools/browser/ldap-browser/ldap-search-page.c
@@ -314,7 +314,7 @@ ldap_search_page_new (BrowserConnection *bcnc, const gchar *base_dn)
 	g_signal_connect (wid, "activate",
 			  G_CALLBACK (search_entry_activated_cb), epage);
 
-	bb = gtk_vbutton_box_new ();
+	bb = gtk_button_box_new (GTK_ORIENTATION_VERTICAL);
 	gtk_button_box_set_layout (GTK_BUTTON_BOX (bb), GTK_BUTTONBOX_END);
 	gtk_box_pack_start (GTK_BOX (hb), bb, FALSE, FALSE, 5);
 
diff --git a/tools/browser/query-exec/query-console-page.c b/tools/browser/query-exec/query-console-page.c
index 2dbbaf6..4300681 100644
--- a/tools/browser/query-exec/query-console-page.c
+++ b/tools/browser/query-exec/query-console-page.c
@@ -357,7 +357,7 @@ query_console_page_new (BrowserConnection *bcnc)
 	gtk_container_add (GTK_CONTAINER (tconsole->priv->params_form_box), wid);
 	tconsole->priv->params_form = wid;
 	
-	bbox = gtk_vbutton_box_new ();
+	bbox = gtk_button_box_new (GTK_ORIENTATION_VERTICAL);
 	gtk_button_box_set_layout (GTK_BUTTON_BOX (bbox), GTK_BUTTONBOX_END);
 	gtk_box_pack_start (GTK_BOX (hbox), bbox, FALSE, FALSE, 5);
 
@@ -418,7 +418,7 @@ query_console_page_new (BrowserConnection *bcnc)
 	g_signal_connect (wid, "changed",
 			  G_CALLBACK (history_changed_cb), tconsole);
 
-	bbox = gtk_hbutton_box_new ();
+	bbox = gtk_button_box_new (GTK_ORIENTATION_HORIZONTAL);
 	gtk_box_pack_start (GTK_BOX (vbox), bbox, FALSE, FALSE, 0);
 	gtk_button_box_set_layout (GTK_BUTTON_BOX (bbox), GTK_BUTTONBOX_END);
 
@@ -913,7 +913,7 @@ sql_execute_clicked_cb (G_GNUC_UNUSED GtkButton *button, QueryConsolePage *tcons
 				gtk_box_pack_start (GTK_BOX (vbox), cont, FALSE, FALSE, 10);
 				g_object_set_data (G_OBJECT (tconsole->priv->params_popup), "cont", cont);
 
-				bbox = gtk_hbutton_box_new ();
+				bbox = gtk_button_box_new (GTK_ORIENTATION_HORIZONTAL);
 				gtk_box_pack_start (GTK_BOX (vbox), bbox, FALSE, FALSE, 10);
 				gtk_button_box_set_layout (GTK_BUTTON_BOX (bbox), GTK_BUTTONBOX_END);
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]