GNOME.org
 

[libgda] Replace (deprecated) GtkHPaned and GtkVPaned.

commit 84b9b6bb4a5df76034c74e30919aebbe6ef84b65
Author: Murray Cumming <murrayc murrayc com>
Date:   Tue Jul 5 09:32:00 2011 +0200

    Replace (deprecated) GtkHPaned and GtkVPaned.
    
    Use GtkPaned, specifying the orientation.
    This (tedious) deprecation happened in GTK+ 3.1/3.2.

 libgda-ui/gdaui-basic-form.c                       |    4 ++--
 libgda-ui/gdaui-server-operation.c                 |    2 +-
 samples/LdapBrowser/ldap-browser.c                 |    2 +-
 tools/browser/common/gdaui-data-import.c           |    4 +++-
 tools/browser/common/gdaui-data-import.h           |    4 ++--
 tools/browser/data-manager/data-console.c          |    2 +-
 .../data-manager/data-manager-perspective.c        |    2 +-
 tools/browser/data-manager/data-source-editor.c    |    2 +-
 tools/browser/data-manager/data-widget.c           |    4 ++--
 tools/browser/data-manager/ui-spec-editor.c        |    2 +-
 .../ldap-browser/ldap-browser-perspective.c        |    2 +-
 tools/browser/ldap-browser/ldap-classes-page.c     |    2 +-
 tools/browser/ldap-browser/ldap-entries-page.c     |    2 +-
 tools/browser/query-exec/query-console-page.c      |    6 +++---
 tools/browser/query-exec/query-exec-perspective.c  |    2 +-
 .../schema-browser/schema-browser-perspective.c    |    2 +-
 tools/browser/schema-browser/table-columns.c       |    2 +-
 17 files changed, 24 insertions(+), 22 deletions(-)
---
diff --git a/libgda-ui/gdaui-basic-form.c b/libgda-ui/gdaui-basic-form.c
index 19772c8..7f89a67 100644
--- a/libgda-ui/gdaui-basic-form.c
+++ b/libgda-ui/gdaui-basic-form.c
@@ -1254,11 +1254,11 @@ load_xml_layout_children (GdauiBasicForm *form, xmlNodePtr parent_node)
 			ctype = TOP_BOX;
 		}
 		else if (xmlStrEqual (prop, BAD_CAST "hpaned")) {
-			top = gtk_hpaned_new ();
+			top = gtk_paned_new (GTK_ORIENTATION_HORIZONTAL);
 			ctype = TOP_PANED;
 		}
 		else if (xmlStrEqual (prop, BAD_CAST "vpaned")) {
-			top = gtk_vpaned_new ();
+			top = gtk_paned_new (GTK_ORIENTATION_VERTICAL);
 			ctype = TOP_PANED;
 		}
 		else 
diff --git a/libgda-ui/gdaui-server-operation.c b/libgda-ui/gdaui-server-operation.c
index c473455..80615a2 100644
--- a/libgda-ui/gdaui-server-operation.c
+++ b/libgda-ui/gdaui-server-operation.c
@@ -1164,7 +1164,7 @@ create_table_fields_array_create_widget (GdauiServerOperation *form, const gchar
 	info_node = gda_server_operation_get_node_info (form->priv->op, path);
 	g_assert (info_node->type == GDA_SERVER_OPERATION_NODE_DATA_MODEL);
 
-	hlayout = gtk_hpaned_new ();
+	hlayout = gtk_paned_new (GTK_ORIENTATION_HORIZONTAL);
 
 	/* form for field properties */
 	box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
diff --git a/samples/LdapBrowser/ldap-browser.c b/samples/LdapBrowser/ldap-browser.c
index 4f8ea0e..541664a 100644
--- a/samples/LdapBrowser/ldap-browser.c
+++ b/samples/LdapBrowser/ldap-browser.c
@@ -216,7 +216,7 @@ create_window (GdaConnection *cnc)
 	GtkWidget *vb, *hp;
 	vb = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
 	gtk_container_add (GTK_CONTAINER (win), vb);
-	hp = gtk_hpaned_new ();
+	hp = gtk_paned_new (GTK_ORIENTATION_HORIZONTAL);
         gtk_box_pack_start (GTK_BOX (vb), hp, TRUE, TRUE, 0);
 
 	GdaTree *tree;
diff --git a/tools/browser/common/gdaui-data-import.c b/tools/browser/common/gdaui-data-import.c
index dd17eb8..c90257e 100644
--- a/tools/browser/common/gdaui-data-import.c
+++ b/tools/browser/common/gdaui-data-import.c
@@ -80,7 +80,7 @@ gdaui_data_import_get_type (void)
 			0
 		};		
 		
-		type = g_type_register_static (GTK_TYPE_VPANED, "GdauiDataImport", &info, 0);
+		type = g_type_register_static (GTK_TYPE_PANED, "GdauiDataImport", &info, 0);
 	}
 
 	return type;
@@ -109,6 +109,8 @@ gdaui_data_import_init (GdauiDataImport * import)
 	import->priv = g_new0 (GdauiDataImportPriv, 1);
 	import->priv->model = NULL;
 
+	gtk_orientable_set_orientation (GTK_ORIENTABLE (import), GTK_ORIENTATION_VERTICAL);
+
 	/* 
 	 * top part: import specs. 
 	 */
diff --git a/tools/browser/common/gdaui-data-import.h b/tools/browser/common/gdaui-data-import.h
index 3580ecd..6ded0fc 100644
--- a/tools/browser/common/gdaui-data-import.h
+++ b/tools/browser/common/gdaui-data-import.h
@@ -37,7 +37,7 @@ typedef struct _GdauiDataImportPriv  GdauiDataImportPriv;
 /* struct for the object's data */
 struct _GdauiDataImport
 {
-	GtkVPaned              object;
+	GtkPaned              object;
 
 	GdauiDataImportPriv *priv;
 };
@@ -45,7 +45,7 @@ struct _GdauiDataImport
 /* struct for the object's class */
 struct _GdauiDataImportClass
 {
-	GtkVPanedClass         parent_class;
+	GtkPanedClass         parent_class;
 };
 
 /* 
diff --git a/tools/browser/data-manager/data-console.c b/tools/browser/data-manager/data-console.c
index 364e0a3..80f2080 100644
--- a/tools/browser/data-manager/data-console.c
+++ b/tools/browser/data-manager/data-console.c
@@ -318,7 +318,7 @@ data_console_new (BrowserConnection *bcnc)
 
 	/* main container */
 	GtkWidget *hpaned, *nb;
-	hpaned = gtk_hpaned_new ();
+	hpaned = gtk_paned_new (GTK_ORIENTATION_HORIZONTAL);
 	gtk_box_pack_start (GTK_BOX (dconsole), hpaned, TRUE, TRUE, 0);
 
 	/* variables */
diff --git a/tools/browser/data-manager/data-manager-perspective.c b/tools/browser/data-manager/data-manager-perspective.c
index 1e13df6..b92c021 100644
--- a/tools/browser/data-manager/data-manager-perspective.c
+++ b/tools/browser/data-manager/data-manager-perspective.c
@@ -156,7 +156,7 @@ data_manager_perspective_new (BrowserWindow *bwin)
 
 	/* contents */
         GtkWidget *paned, *nb, *wid;
-        paned = gtk_hpaned_new ();
+        paned = gtk_paned_new (GTK_ORIENTATION_HORIZONTAL);
 	if (fav_supported) {
 		wid = data_favorite_selector_new (bcnc);
 		g_signal_connect (wid, "selection-changed",
diff --git a/tools/browser/data-manager/data-source-editor.c b/tools/browser/data-manager/data-source-editor.c
index ace5e11..11977df 100644
--- a/tools/browser/data-manager/data-source-editor.c
+++ b/tools/browser/data-manager/data-source-editor.c
@@ -111,7 +111,7 @@ data_source_editor_init (DataSourceEditor *editor)
 	g_signal_connect (editor->priv->attributes, "holder-changed",
 			  G_CALLBACK (attribute_changed_cb), editor);
 
-	vpaned = gtk_vpaned_new ();
+	vpaned = gtk_paned_new (GTK_ORIENTATION_VERTICAL);
 	gtk_box_pack_start (GTK_BOX (editor), vpaned, TRUE, TRUE, 0);
 	gtk_widget_show (vpaned);
 
diff --git a/tools/browser/data-manager/data-widget.c b/tools/browser/data-manager/data-widget.c
index 6bba32d..1fdb181 100644
--- a/tools/browser/data-manager/data-widget.c
+++ b/tools/browser/data-manager/data-widget.c
@@ -280,12 +280,12 @@ make_paned_list (gint size, gboolean horiz)
 	GtkWidget *paned;
 
 	g_assert (size >= 2);
-	paned = horiz ? gtk_hpaned_new () : gtk_vpaned_new ();
+	paned = gtk_paned_new (horiz ? GTK_ORIENTATION_HORIZONTAL : GTK_ORIENTATION_VERTICAL);
 	list = g_slist_prepend (list, paned);
 
 	for (i = 2; i < size; i++) {
 		GtkWidget *paned2;
-		paned2 = horiz ? gtk_hpaned_new () : gtk_vpaned_new ();
+		paned2 = gtk_paned_new (horiz ? GTK_ORIENTATION_HORIZONTAL : GTK_ORIENTATION_VERTICAL);
 		gtk_paned_add2 (GTK_PANED (paned), paned2);
 		list = g_slist_prepend (list, paned2);
 		paned = paned2;
diff --git a/tools/browser/data-manager/ui-spec-editor.c b/tools/browser/data-manager/ui-spec-editor.c
index 43c7b80..8facef5 100644
--- a/tools/browser/data-manager/ui-spec-editor.c
+++ b/tools/browser/data-manager/ui-spec-editor.c
@@ -231,7 +231,7 @@ ui_spec_editor_init (UiSpecEditor *sped, G_GNUC_UNUSED UiSpecEditorClass *klass)
 	gtk_orientable_set_orientation (GTK_ORIENTABLE (sped), GTK_ORIENTATION_VERTICAL);
 	
 	GtkWidget *hpaned;
-	hpaned = gtk_hpaned_new ();
+	hpaned = gtk_paned_new (GTK_ORIENTATION_HORIZONTAL);
 	gtk_box_pack_start (GTK_BOX (sped), hpaned, TRUE, TRUE, 0);
 	
 	GtkWidget *vbox;
diff --git a/tools/browser/ldap-browser/ldap-browser-perspective.c b/tools/browser/ldap-browser/ldap-browser-perspective.c
index 2bb7eb9..ed0832c 100644
--- a/tools/browser/ldap-browser/ldap-browser-perspective.c
+++ b/tools/browser/ldap-browser/ldap-browser-perspective.c
@@ -149,7 +149,7 @@ ldap_browser_perspective_new (BrowserWindow *bwin)
 	/* contents */
 	GtkWidget *paned, *wid, *nb, *button, *tlabel;
 	bcnc = browser_window_get_connection (bwin);
-	paned = gtk_hpaned_new ();
+	paned = gtk_paned_new (GTK_ORIENTATION_HORIZONTAL);
 	wid = ldap_favorite_selector_new (bcnc);
 	g_signal_connect (wid, "selection-changed",
 			  G_CALLBACK (fav_selection_changed_cb), bpers);
diff --git a/tools/browser/ldap-browser/ldap-classes-page.c b/tools/browser/ldap-browser/ldap-classes-page.c
index 151e087..0d1060f 100644
--- a/tools/browser/ldap-browser/ldap-classes-page.c
+++ b/tools/browser/ldap-browser/ldap-classes-page.c
@@ -369,7 +369,7 @@ ldap_classes_page_new (BrowserConnection *bcnc, const gchar *classname)
 
 	/* VPaned widget */
 	GtkWidget *hp;
-	hp = gtk_hpaned_new ();
+	hp = gtk_paned_new (GTK_ORIENTATION_HORIZONTAL);
 	gtk_box_pack_start (GTK_BOX (ebrowser), hp, TRUE, TRUE, 0);
 
 	/* tree */
diff --git a/tools/browser/ldap-browser/ldap-entries-page.c b/tools/browser/ldap-browser/ldap-entries-page.c
index 39a15f6..2c7cf52 100644
--- a/tools/browser/ldap-browser/ldap-entries-page.c
+++ b/tools/browser/ldap-browser/ldap-entries-page.c
@@ -375,7 +375,7 @@ ldap_entries_page_new (BrowserConnection *bcnc, const gchar *dn)
 
 	/* VPaned widget */
 	GtkWidget *hp;
-	hp = gtk_hpaned_new ();
+	hp = gtk_paned_new (GTK_ORIENTATION_HORIZONTAL);
 	gtk_box_pack_start (GTK_BOX (ebrowser), hp, TRUE, TRUE, 0);
 
 	/* tree */
diff --git a/tools/browser/query-exec/query-console-page.c b/tools/browser/query-exec/query-console-page.c
index 17f2ea7..fda9088 100644
--- a/tools/browser/query-exec/query-console-page.c
+++ b/tools/browser/query-exec/query-console-page.c
@@ -296,7 +296,7 @@ query_console_page_new (BrowserConnection *bcnc)
 
 	/* main contents */
 	GtkWidget *vpaned;
-	vpaned = gtk_vpaned_new ();
+	vpaned = gtk_paned_new (GTK_ORIENTATION_VERTICAL);
 	tconsole->priv->vpaned = NULL;
 	gtk_box_pack_start (GTK_BOX (tconsole), vpaned, TRUE, TRUE, 6);	
 
@@ -306,7 +306,7 @@ query_console_page_new (BrowserConnection *bcnc)
 	hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
 	gtk_paned_add1 (GTK_PANED (vpaned), hbox);
 
-	hpaned = gtk_hpaned_new ();
+	hpaned = gtk_paned_new (GTK_ORIENTATION_HORIZONTAL);
 	gtk_box_pack_start (GTK_BOX (hbox), hpaned, TRUE, TRUE, 0);
 
 	vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
@@ -396,7 +396,7 @@ query_console_page_new (BrowserConnection *bcnc)
 			  G_CALLBACK (sql_favorite_clicked_cb), tconsole);
 
 	/* bottom paned for the results and history */
-	hpaned = gtk_hpaned_new ();
+	hpaned = gtk_paned_new (GTK_ORIENTATION_HORIZONTAL);
 	gtk_paned_add2 (GTK_PANED (vpaned), hpaned);
 
 	/* bottom left */
diff --git a/tools/browser/query-exec/query-exec-perspective.c b/tools/browser/query-exec/query-exec-perspective.c
index 7912441..74d9d45 100644
--- a/tools/browser/query-exec/query-exec-perspective.c
+++ b/tools/browser/query-exec/query-exec-perspective.c
@@ -160,7 +160,7 @@ query_exec_perspective_new (BrowserWindow *bwin)
 
 	/* contents */
 	GtkWidget *paned, *nb, *wid;
-	paned = gtk_hpaned_new ();
+	paned = gtk_paned_new (GTK_ORIENTATION_HORIZONTAL);
 	if (fav_supported) {
 		wid = query_favorite_selector_new (bcnc);
 		g_signal_connect (wid, "selection-changed",
diff --git a/tools/browser/schema-browser/schema-browser-perspective.c b/tools/browser/schema-browser/schema-browser-perspective.c
index e02a1a5..2d9a6d4 100644
--- a/tools/browser/schema-browser/schema-browser-perspective.c
+++ b/tools/browser/schema-browser/schema-browser-perspective.c
@@ -147,7 +147,7 @@ schema_browser_perspective_new (BrowserWindow *bwin)
 
 	/* contents */
 	GtkWidget *paned, *wid, *nb;
-	paned = gtk_hpaned_new ();
+	paned = gtk_paned_new (GTK_ORIENTATION_HORIZONTAL);
 	if (fav_supported) {
 		wid = favorite_selector_new (bcnc);
 		g_signal_connect (wid, "selection-changed",
diff --git a/tools/browser/schema-browser/table-columns.c b/tools/browser/schema-browser/table-columns.c
index 2cf3918..d341607 100644
--- a/tools/browser/schema-browser/table-columns.c
+++ b/tools/browser/schema-browser/table-columns.c
@@ -588,7 +588,7 @@ table_columns_new (TableInfo *tinfo)
 	
 	/* main container */
 	GtkWidget *paned;
-	paned = gtk_vpaned_new ();
+	paned = gtk_paned_new (GTK_ORIENTATION_VERTICAL);
 	gtk_box_pack_start (GTK_BOX (tcolumns), paned, TRUE, TRUE, 0);
 	gtk_widget_show (paned);
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]