GNOME.org
 

[gtk+/treeview-refactor] Use gtk_paned_new() instead gtk_[v|h]paned_new()

commit cdf4b4bbd5bf6b4e7a82954bbecf467b6952bde5
Author: Javier Jardón <jjardon gnome org>
Date:   Sat Oct 30 01:47:13 2010 +0200

    Use gtk_paned_new() instead gtk_[v|h]paned_new()

 demos/gtk-demo/panes.c                |    4 ++--
 demos/gtk-demo/textview.c             |    2 +-
 docs/reference/gtk/tmpl/gtkpaned.sgml |    2 +-
 docs/tools/widgets.c                  |    4 ++--
 examples/paned/paned.c                |    2 +-
 gtk/gtkfilechooserdefault.c           |    2 +-
 modules/other/gail/tests/ferret.c     |    2 +-
 tests/flicker.c                       |    6 +++---
 tests/testcalendar.c                  |    2 +-
 tests/testgtk.c                       |   28 ++++++++++++++--------------
 tests/testiconview.c                  |    2 +-
 tests/testoffscreen.c                 |    2 +-
 12 files changed, 29 insertions(+), 29 deletions(-)
---
diff --git a/demos/gtk-demo/panes.c b/demos/gtk-demo/panes.c
index 3399653..fd0822f 100644
--- a/demos/gtk-demo/panes.c
+++ b/demos/gtk-demo/panes.c
@@ -156,11 +156,11 @@ do_panes (GtkWidget *do_widget)
       vbox = gtk_vbox_new (FALSE, 0);
       gtk_container_add (GTK_CONTAINER (window), vbox);
       
-      vpaned = gtk_vpaned_new ();
+      vpaned = gtk_paned_new (GTK_ORIENTATION_VERTICAL);
       gtk_box_pack_start (GTK_BOX (vbox), vpaned, TRUE, TRUE, 0);
       gtk_container_set_border_width (GTK_CONTAINER(vpaned), 5);
 
-      hpaned = gtk_hpaned_new ();
+      hpaned = gtk_paned_new (GTK_ORIENTATION_HORIZONTAL);
       gtk_paned_add1 (GTK_PANED (vpaned), hpaned);
 
       frame = gtk_frame_new (NULL);
diff --git a/demos/gtk-demo/textview.c b/demos/gtk-demo/textview.c
index fb339f1..235afa9 100644
--- a/demos/gtk-demo/textview.c
+++ b/demos/gtk-demo/textview.c
@@ -434,7 +434,7 @@ do_textview (GtkWidget *do_widget)
       gtk_window_set_title (GTK_WINDOW (window), "TextView");
       gtk_container_set_border_width (GTK_CONTAINER (window), 0);
 
-      vpaned = gtk_vpaned_new ();
+      vpaned = gtk_paned_new (GTK_ORIENTATION_VERTICAL);
       gtk_container_set_border_width (GTK_CONTAINER(vpaned), 5);
       gtk_container_add (GTK_CONTAINER (window), vpaned);
 
diff --git a/docs/reference/gtk/tmpl/gtkpaned.sgml b/docs/reference/gtk/tmpl/gtkpaned.sgml
index 8436cc5..a98c125 100644
--- a/docs/reference/gtk/tmpl/gtkpaned.sgml
+++ b/docs/reference/gtk/tmpl/gtkpaned.sgml
@@ -48,7 +48,7 @@ gtk_paned_set_position().
 <example>
 <title>Creating a paned widget with minimum sizes.</title>
 <programlisting>
-GtkWidget *hpaned = gtk_hpaned_new (<!-- -->);
+GtkWidget *hpaned = gtk_paned_new (GTK_ORIENTATION_HORIZONTAL);
 GtkWidget *frame1 = gtk_frame_new (NULL);
 GtkWidget *frame2 = gtk_frame_new (NULL);
 gtk_frame_set_shadow_type (GTK_FRAME (frame1), GTK_SHADOW_IN);
diff --git a/docs/tools/widgets.c b/docs/tools/widgets.c
index 1de95a4..4c049fd 100644
--- a/docs/tools/widgets.c
+++ b/docs/tools/widgets.c
@@ -557,7 +557,7 @@ create_panes (void)
 
   vbox = gtk_vbox_new (FALSE, 3);
   hbox = gtk_hbox_new (TRUE, 12);
-  pane = gtk_hpaned_new ();
+  pane = gtk_paned_new (GTK_ORIENTATION_HORIZONTAL);
   gtk_paned_pack1 (GTK_PANED (pane),
 		   g_object_new (GTK_TYPE_FRAME,
 				 "shadow", GTK_SHADOW_IN,
@@ -571,7 +571,7 @@ create_panes (void)
   gtk_box_pack_start (GTK_BOX (hbox),
 		      pane,
 		      TRUE, TRUE, 0);
-  pane = gtk_vpaned_new ();
+  pane = gtk_paned_new (GTK_ORIENTATION_VERTICAL);
   gtk_paned_pack1 (GTK_PANED (pane),
 		   g_object_new (GTK_TYPE_FRAME,
 				 "shadow", GTK_SHADOW_IN,
diff --git a/examples/paned/paned.c b/examples/paned/paned.c
index 1be4f10..e72b083 100644
--- a/examples/paned/paned.c
+++ b/examples/paned/paned.c
@@ -116,7 +116,7 @@ int main( int   argc,
 
     /* create a vpaned widget and add it to our toplevel window */
    
-    vpaned = gtk_vpaned_new ();
+    vpaned = gtk_paned_new (GTK_ORIENTATION_VERTICAL);
     gtk_container_add (GTK_CONTAINER (window), vpaned);
     gtk_widget_show (vpaned);
    
diff --git a/gtk/gtkfilechooserdefault.c b/gtk/gtkfilechooserdefault.c
index 1595601..5abcd27 100644
--- a/gtk/gtkfilechooserdefault.c
+++ b/gtk/gtkfilechooserdefault.c
@@ -5013,7 +5013,7 @@ browse_widgets_create (GtkFileChooserDefault *impl)
   gtk_box_pack_start (GTK_BOX (impl->location_entry_box), impl->location_label, FALSE, FALSE, 0);
 
   /* Paned widget */
-  hpaned = gtk_hpaned_new ();
+  hpaned = gtk_paned_new (GTK_ORIENTATION_HORIZONTAL);
   gtk_widget_show (hpaned);
   gtk_box_pack_start (GTK_BOX (vbox), hpaned, TRUE, TRUE, 0);
 
diff --git a/modules/other/gail/tests/ferret.c b/modules/other/gail/tests/ferret.c
index ad8dd3e..df93fd4 100644
--- a/modules/other/gail/tests/ferret.c
+++ b/modules/other/gail/tests/ferret.c
@@ -1558,7 +1558,7 @@ static void _add_notebook_page (GtkNotebook *nbook,
     }
   else
     {
-      *new_page = gtk_vpaned_new ();
+      *new_page = gtk_paned_new (GTK_ORIENTATION_VERTICAL);
     }
 
   label = gtk_label_new ("");
diff --git a/tests/flicker.c b/tests/flicker.c
index 4bbe0c4..1c0f81c 100644
--- a/tests/flicker.c
+++ b/tests/flicker.c
@@ -58,12 +58,12 @@ create_flicker (void)
   gtk_window_set_default_size (GTK_WINDOW (window1), 500, 400);
   gtk_window_set_title (GTK_WINDOW (window1), "window1");
 
-  hpaned1 = gtk_hpaned_new ();
+  hpaned1 = gtk_paned_new (GTK_ORIENTATION_HORIZONTAL);
   gtk_widget_show (hpaned1);
   gtk_container_add (GTK_CONTAINER (window1), hpaned1);
   gtk_paned_set_position (GTK_PANED (hpaned1), 100);
 
-  vpaned2 = gtk_vpaned_new ();
+  vpaned2 = gtk_paned_new (GTK_ORIENTATION_VERTICAL);
   gtk_widget_show (vpaned2);
   gtk_paned_pack1 (GTK_PANED (hpaned1), vpaned2, FALSE, TRUE);
   gtk_paned_set_position (GTK_PANED (vpaned2), 100);
@@ -126,7 +126,7 @@ create_flicker (void)
   gtk_widget_show (spinbutton16);
   gtk_box_pack_start (GTK_BOX (vbox1), spinbutton16, FALSE, FALSE, 0);
 
-  vpaned1 = gtk_vpaned_new ();
+  vpaned1 = gtk_paned_new (GTK_ORIENTATION_VERTICAL);
   gtk_widget_show (vpaned1);
   gtk_paned_pack2 (GTK_PANED (hpaned1), vpaned1, TRUE, TRUE);
   gtk_paned_set_position (GTK_PANED (vpaned1), 0);
diff --git a/tests/testcalendar.c b/tests/testcalendar.c
index b726b10..575ce51 100644
--- a/tests/testcalendar.c
+++ b/tests/testcalendar.c
@@ -433,7 +433,7 @@ create_calendar(void)
 		    G_CALLBACK (gtk_false),
 		    NULL);
 
-  hpaned = gtk_hpaned_new ();
+  hpaned = gtk_paned_new (GTK_ORIENTATION_HORIZONTAL);
 
   /* Calendar widget */
 
diff --git a/tests/testgtk.c b/tests/testgtk.c
index c880007..b621b9a 100644
--- a/tests/testgtk.c
+++ b/tests/testgtk.c
@@ -6507,11 +6507,11 @@ create_panes (GtkWidget *widget)
       vbox = gtk_vbox_new (FALSE, 0);
       gtk_container_add (GTK_CONTAINER (window), vbox);
       
-      vpaned = gtk_vpaned_new ();
+      vpaned = gtk_paned_new (GTK_ORIENTATION_VERTICAL);
       gtk_box_pack_start (GTK_BOX (vbox), vpaned, TRUE, TRUE, 0);
       gtk_container_set_border_width (GTK_CONTAINER(vpaned), 5);
 
-      hpaned = gtk_hpaned_new ();
+      hpaned = gtk_paned_new (GTK_ORIENTATION_HORIZONTAL);
       gtk_paned_add1 (GTK_PANED (vpaned), hpaned);
 
       frame = gtk_frame_new (NULL);
@@ -6590,7 +6590,7 @@ paned_keyboard_window1 (GtkWidget *widget)
   gtk_window_set_screen (GTK_WINDOW (window1), 
 			 gtk_widget_get_screen (widget));
 
-  hpaned1 = gtk_hpaned_new ();
+  hpaned1 = gtk_paned_new (GTK_ORIENTATION_HORIZONTAL);
   gtk_container_add (GTK_CONTAINER (window1), hpaned1);
 
   frame1 = gtk_frame_new (NULL);
@@ -6609,7 +6609,7 @@ paned_keyboard_window1 (GtkWidget *widget)
   button9 = gtk_button_new_with_label ("button9");
   gtk_box_pack_start (GTK_BOX (vbox1), button9, FALSE, FALSE, 0);
 
-  vpaned1 = gtk_vpaned_new ();
+  vpaned1 = gtk_paned_new (GTK_ORIENTATION_VERTICAL);
   gtk_paned_pack2 (GTK_PANED (hpaned1), vpaned1, TRUE, TRUE);
 
   frame2 = gtk_frame_new (NULL);
@@ -6684,7 +6684,7 @@ paned_keyboard_window2 (GtkWidget *widget)
   gtk_window_set_screen (GTK_WINDOW (window2), 
 			 gtk_widget_get_screen (widget));
 
-  hpaned2 = gtk_hpaned_new ();
+  hpaned2 = gtk_paned_new (GTK_ORIENTATION_HORIZONTAL);
   gtk_container_add (GTK_CONTAINER (window2), hpaned2);
 
   frame6 = gtk_frame_new (NULL);
@@ -6697,7 +6697,7 @@ paned_keyboard_window2 (GtkWidget *widget)
   hbox2 = gtk_hbox_new (FALSE, 0);
   gtk_paned_pack2 (GTK_PANED (hpaned2), hbox2, TRUE, TRUE);
 
-  vpaned2 = gtk_vpaned_new ();
+  vpaned2 = gtk_paned_new (GTK_ORIENTATION_VERTICAL);
   gtk_box_pack_start (GTK_BOX (hbox2), vpaned2, TRUE, TRUE, 0);
 
   frame7 = gtk_frame_new (NULL);
@@ -6752,7 +6752,7 @@ paned_keyboard_window3 (GtkWidget *widget)
   label1 = gtk_label_new ("Three panes nested inside each other");
   gtk_box_pack_start (GTK_BOX (vbox2), label1, FALSE, FALSE, 0);
 
-  hpaned3 = gtk_hpaned_new ();
+  hpaned3 = gtk_paned_new (GTK_ORIENTATION_HORIZONTAL);
   gtk_box_pack_start (GTK_BOX (vbox2), hpaned3, TRUE, TRUE, 0);
 
   frame9 = gtk_frame_new (NULL);
@@ -6762,7 +6762,7 @@ paned_keyboard_window3 (GtkWidget *widget)
   button14 = gtk_button_new_with_label ("button14");
   gtk_container_add (GTK_CONTAINER (frame9), button14);
 
-  hpaned4 = gtk_hpaned_new ();
+  hpaned4 = gtk_paned_new (GTK_ORIENTATION_HORIZONTAL);
   gtk_paned_pack2 (GTK_PANED (hpaned3), hpaned4, TRUE, TRUE);
 
   frame10 = gtk_frame_new (NULL);
@@ -6772,7 +6772,7 @@ paned_keyboard_window3 (GtkWidget *widget)
   button15 = gtk_button_new_with_label ("button15");
   gtk_container_add (GTK_CONTAINER (frame10), button15);
 
-  hpaned5 = gtk_hpaned_new ();
+  hpaned5 = gtk_paned_new (GTK_ORIENTATION_HORIZONTAL);
   gtk_paned_pack2 (GTK_PANED (hpaned4), hpaned5, TRUE, TRUE);
 
   frame11 = gtk_frame_new (NULL);
@@ -6827,10 +6827,10 @@ paned_keyboard_window4 (GtkWidget *widget)
   gtk_box_pack_start (GTK_BOX (vbox3), label2, FALSE, FALSE, 0);
   gtk_label_set_justify (GTK_LABEL (label2), GTK_JUSTIFY_LEFT);
 
-  hpaned6 = gtk_hpaned_new ();
+  hpaned6 = gtk_paned_new (GTK_ORIENTATION_HORIZONTAL);
   gtk_box_pack_start (GTK_BOX (vbox3), hpaned6, TRUE, TRUE, 0);
 
-  vpaned3 = gtk_vpaned_new ();
+  vpaned3 = gtk_paned_new (GTK_ORIENTATION_VERTICAL);
   gtk_paned_pack1 (GTK_PANED (hpaned6), vpaned3, FALSE, TRUE);
 
   button19 = gtk_button_new_with_label ("button19");
@@ -6842,7 +6842,7 @@ paned_keyboard_window4 (GtkWidget *widget)
   hbox3 = gtk_hbox_new (FALSE, 0);
   gtk_paned_pack2 (GTK_PANED (hpaned6), hbox3, TRUE, TRUE);
 
-  vpaned4 = gtk_vpaned_new ();
+  vpaned4 = gtk_paned_new (GTK_ORIENTATION_VERTICAL);
   gtk_box_pack_start (GTK_BOX (hbox3), vpaned4, TRUE, TRUE, 0);
 
   button21 = gtk_button_new_with_label ("button21");
@@ -6851,7 +6851,7 @@ paned_keyboard_window4 (GtkWidget *widget)
   button20 = gtk_button_new_with_label ("button20");
   gtk_paned_pack2 (GTK_PANED (vpaned4), button20, TRUE, TRUE);
 
-  vpaned5 = gtk_vpaned_new ();
+  vpaned5 = gtk_paned_new (GTK_ORIENTATION_VERTICAL);
   gtk_box_pack_start (GTK_BOX (hbox3), vpaned5, TRUE, TRUE, 0);
 
   button23 = gtk_button_new_with_label ("button23");
@@ -6860,7 +6860,7 @@ paned_keyboard_window4 (GtkWidget *widget)
   button22 = gtk_button_new_with_label ("button22");
   gtk_paned_pack2 (GTK_PANED (vpaned5), button22, TRUE, TRUE);
 
-  vpaned6 = gtk_vpaned_new ();
+  vpaned6 = gtk_paned_new (GTK_ORIENTATION_VERTICAL);
   gtk_box_pack_start (GTK_BOX (hbox3), vpaned6, TRUE, TRUE, 0);
 
   button25 = gtk_button_new_with_label ("button25");
diff --git a/tests/testiconview.c b/tests/testiconview.c
index 8220c91..6dd169b 100644
--- a/tests/testiconview.c
+++ b/tests/testiconview.c
@@ -436,7 +436,7 @@ main (gint argc, gchar **argv)
   vbox = gtk_vbox_new (FALSE, 0);
   gtk_container_add (GTK_CONTAINER (window), vbox);
 
-  paned = gtk_hpaned_new ();
+  paned = gtk_paned_new (GTK_ORIENTATION_HORIZONTAL);
   gtk_box_pack_start (GTK_BOX (vbox), paned, TRUE, TRUE, 0);
 
   icon_list = gtk_icon_view_new ();
diff --git a/tests/testoffscreen.c b/tests/testoffscreen.c
index 8b4e61f..cfb285b 100644
--- a/tests/testoffscreen.c
+++ b/tests/testoffscreen.c
@@ -328,7 +328,7 @@ main (int   argc,
     }
   else
     {
-      offscreen = gtk_vpaned_new ();
+      offscreen = gtk_paned_new (GTK_ORIENTATION_VERTICAL);
     }
 
   gtk_box_pack_start (GTK_BOX (vbox), offscreen, TRUE, TRUE, 0);
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]