Deprecate widget flag: GTK_WIDGET_VISIBLE

[~andy/gtk] / demos / gtk-demo / panes.c

diff --git a/demos/gtk-demo/panes.c b/demos/gtk-demo/panes.c
index 20ca271abd9cb10be6d6d17cf1dc3ffa958c59cf..93f1aa1098abf7a65afe565b280f5eff857c6362 100644 (file)
--- a/demos/gtk-demo/panes.c
+++ b/demos/gtk-demo/panes.c
@@ -14,7 +14,8 @@
 #include <gtk/gtk.h>
 
 void
-toggle_resize (GtkWidget *widget, GtkWidget *child)
+toggle_resize (GtkWidget *widget,
+              GtkWidget *child)
 {
   GtkPaned *paned = GTK_PANED (child->parent);
   gboolean is_child1 = (child == paned->child1);
@@ -23,17 +24,18 @@ toggle_resize (GtkWidget *widget, GtkWidget *child)
   resize = is_child1 ? paned->child1_resize : paned->child2_resize;
   shrink = is_child1 ? paned->child1_shrink : paned->child2_shrink;
 
-  gtk_widget_ref (child);
+  g_object_ref (child);
   gtk_container_remove (GTK_CONTAINER (child->parent), child);
   if (is_child1)
     gtk_paned_pack1 (paned, child, !resize, shrink);
   else
     gtk_paned_pack2 (paned, child, !resize, shrink);
-  gtk_widget_unref (child);
+  g_object_unref (child);
 }
 
 void
-toggle_shrink (GtkWidget *widget, GtkWidget *child)
+toggle_shrink (GtkWidget *widget,
+              GtkWidget *child)
 {
   GtkPaned *paned = GTK_PANED (child->parent);
   gboolean is_child1 = (child == paned->child1);
@@ -42,17 +44,17 @@ toggle_shrink (GtkWidget *widget, GtkWidget *child)
   resize = is_child1 ? paned->child1_resize : paned->child2_resize;
   shrink = is_child1 ? paned->child1_shrink : paned->child2_shrink;
 
-  gtk_widget_ref (child);
+  g_object_ref (child);
   gtk_container_remove (GTK_CONTAINER (child->parent), child);
   if (is_child1)
     gtk_paned_pack1 (paned, child, resize, !shrink);
   else
     gtk_paned_pack2 (paned, child, resize, !shrink);
-  gtk_widget_unref (child);
+  g_object_unref (child);
 }
 
 GtkWidget *
-create_pane_options (GtkPaned *paned,
+create_pane_options (GtkPaned   *paned,
                     const gchar *frame_label,
                     const gchar *label1,
                     const gchar *label2)
@@ -72,49 +74,45 @@ create_pane_options (GtkPaned *paned,
   gtk_table_attach_defaults (GTK_TABLE (table), label,
                             0, 1, 0, 1);
   
-  check_button = gtk_check_button_new_with_label ("Resize");
+  check_button = gtk_check_button_new_with_mnemonic ("_Resize");
   gtk_table_attach_defaults (GTK_TABLE (table), check_button,
                             0, 1, 1, 2);
-  gtk_signal_connect (GTK_OBJECT (check_button), "toggled",
-                     GTK_SIGNAL_FUNC (toggle_resize),
-                     paned->child1);
+  g_signal_connect (check_button, "toggled",
+                   G_CALLBACK (toggle_resize), paned->child1);
   
-  check_button = gtk_check_button_new_with_label ("Shrink");
+  check_button = gtk_check_button_new_with_mnemonic ("_Shrink");
   gtk_table_attach_defaults (GTK_TABLE (table), check_button,
                             0, 1, 2, 3);
   gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (check_button),
                               TRUE);
-  gtk_signal_connect (GTK_OBJECT (check_button), "toggled",
-                     GTK_SIGNAL_FUNC (toggle_shrink),
-                     paned->child1);
+  g_signal_connect (check_button, "toggled",
+                   G_CALLBACK (toggle_shrink), paned->child1);
   
   label = gtk_label_new (label2);
   gtk_table_attach_defaults (GTK_TABLE (table), label,
                             1, 2, 0, 1);
   
-  check_button = gtk_check_button_new_with_label ("Resize");
+  check_button = gtk_check_button_new_with_mnemonic ("_Resize");
   gtk_table_attach_defaults (GTK_TABLE (table), check_button,
                             1, 2, 1, 2);
   gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (check_button),
                               TRUE);
-  gtk_signal_connect (GTK_OBJECT (check_button), "toggled",
-                     GTK_SIGNAL_FUNC (toggle_resize),
-                     paned->child2);
+  g_signal_connect (check_button, "toggled",
+                   G_CALLBACK (toggle_resize), paned->child2);
   
-  check_button = gtk_check_button_new_with_label ("Shrink");
+  check_button = gtk_check_button_new_with_mnemonic ("_Shrink");
   gtk_table_attach_defaults (GTK_TABLE (table), check_button,
                             1, 2, 2, 3);
   gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (check_button),
                               TRUE);
-  gtk_signal_connect (GTK_OBJECT (check_button), "toggled",
-                     GTK_SIGNAL_FUNC (toggle_shrink),
-                     paned->child2);
+  g_signal_connect (check_button, "toggled",
+                   G_CALLBACK (toggle_shrink), paned->child2);
 
   return frame;
 }
 
 GtkWidget *
-do_panes (void)
+do_panes (GtkWidget *do_widget)
 {
   static GtkWidget *window = NULL;
   GtkWidget *frame;
@@ -126,10 +124,11 @@ do_panes (void)
   if (!window)
     {
       window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+      gtk_window_set_screen (GTK_WINDOW (window),
+                            gtk_widget_get_screen (do_widget));
 
-      gtk_signal_connect (GTK_OBJECT (window), "destroy",
-                         GTK_SIGNAL_FUNC(gtk_widget_destroyed),
-                         &window);
+      g_signal_connect (window, "destroy",
+                       G_CALLBACK (gtk_widget_destroyed), &window);
 
       gtk_window_set_title (GTK_WINDOW (window), "Panes");
       gtk_container_set_border_width (GTK_CONTAINER (window), 0);
@@ -146,20 +145,20 @@ do_panes (void)
 
       frame = gtk_frame_new (NULL);
       gtk_frame_set_shadow_type (GTK_FRAME(frame), GTK_SHADOW_IN);
-      gtk_widget_set_usize (frame, 60, 60);
+      gtk_widget_set_size_request (frame, 60, 60);
       gtk_paned_add1 (GTK_PANED (hpaned), frame);
       
-      button = gtk_button_new_with_label ("Hi there");
+      button = gtk_button_new_with_mnemonic ("_Hi there");
       gtk_container_add (GTK_CONTAINER(frame), button);
 
       frame = gtk_frame_new (NULL);
       gtk_frame_set_shadow_type (GTK_FRAME(frame), GTK_SHADOW_IN);
-      gtk_widget_set_usize (frame, 80, 60);
+      gtk_widget_set_size_request (frame, 80, 60);
       gtk_paned_add2 (GTK_PANED (hpaned), frame);
 
       frame = gtk_frame_new (NULL);
       gtk_frame_set_shadow_type (GTK_FRAME(frame), GTK_SHADOW_IN);
-      gtk_widget_set_usize (frame, 60, 80);
+      gtk_widget_set_size_request (frame, 60, 80);
       gtk_paned_add2 (GTK_PANED (vpaned), frame);
 
       /* Now create toggle buttons to control sizing */
@@ -181,7 +180,7 @@ do_panes (void)
       gtk_widget_show_all (vbox);
     }
 
-  if (!GTK_WIDGET_VISIBLE (window))
+  if (!gtk_widget_get_visible (window))
     {
       gtk_widget_show (window);
     }