Deprecate widget flag: GTK_WIDGET_VISIBLE

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

diff --git a/demos/gtk-demo/dialog.c b/demos/gtk-demo/dialog.c
index 92358b973ac24c4907c6201436741f238f6afff0..301ee2f59200d5ca5b912fd2e6c5cd8ec29dbcd2 100644 (file)
--- a/demos/gtk-demo/dialog.c
+++ b/demos/gtk-demo/dialog.c
@@ -21,8 +21,9 @@ message_dialog_clicked (GtkButton *button,
                                   GTK_MESSAGE_INFO,
                                   GTK_BUTTONS_OK,
                                   "This message box has been popped up the following\n"
-                                  "number of times:\n\n"
-                                  "%d", i);
+                                  "number of times:");
+  gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog),
+                                            "%d", i);
   gtk_dialog_run (GTK_DIALOG (dialog));
   gtk_widget_destroy (dialog);
   i++;
@@ -46,6 +47,8 @@ interactive_dialog_clicked (GtkButton *button,
                                        GTK_DIALOG_MODAL| GTK_DIALOG_DESTROY_WITH_PARENT,
                                        GTK_STOCK_OK,
                                        GTK_RESPONSE_OK,
+                                        "_Non-stock Button",
+                                        GTK_RESPONSE_CANCEL,
                                        NULL);
 
   hbox = gtk_hbox_new (FALSE, 8);
@@ -91,7 +94,7 @@ interactive_dialog_clicked (GtkButton *button,
 }
 
 GtkWidget *
-do_dialog (void)
+do_dialog (GtkWidget *do_widget)
 {
   GtkWidget *frame;
   GtkWidget *vbox;
@@ -104,9 +107,11 @@ do_dialog (void)
   if (!window)
     {
       window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+      gtk_window_set_screen (GTK_WINDOW (window),
+                            gtk_widget_get_screen (do_widget));
       gtk_window_set_title (GTK_WINDOW (window), "Dialogs");
 
-      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_container_set_border_width (GTK_CONTAINER (window), 8);
 
       frame = gtk_frame_new ("Dialogs");
@@ -120,8 +125,8 @@ do_dialog (void)
       hbox = gtk_hbox_new (FALSE, 8);
       gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0);
       button = gtk_button_new_with_mnemonic ("_Message Dialog");
-      gtk_signal_connect (GTK_OBJECT (button), "clicked",
-                         GTK_SIGNAL_FUNC (message_dialog_clicked), NULL);
+      g_signal_connect (button, "clicked",
+                       G_CALLBACK (message_dialog_clicked), NULL);
       gtk_box_pack_start (GTK_BOX (hbox), button, FALSE, FALSE, 0);
 
       gtk_box_pack_start (GTK_BOX (vbox), gtk_hseparator_new (), FALSE, FALSE, 0);
@@ -132,8 +137,8 @@ do_dialog (void)
       vbox2 = gtk_vbox_new (FALSE, 0);
 
       button = gtk_button_new_with_mnemonic ("_Interactive Dialog");
-      gtk_signal_connect (GTK_OBJECT (button), "clicked",
-                         GTK_SIGNAL_FUNC (interactive_dialog_clicked), NULL);
+      g_signal_connect (button, "clicked",
+                       G_CALLBACK (interactive_dialog_clicked), NULL);
       gtk_box_pack_start (GTK_BOX (hbox), vbox2, FALSE, FALSE, 0);
       gtk_box_pack_start (GTK_BOX (vbox2), button, FALSE, FALSE, 0);
 
@@ -162,7 +167,7 @@ do_dialog (void)
       gtk_label_set_mnemonic_widget (GTK_LABEL (label), entry2);
     }
 
-  if (!GTK_WIDGET_VISIBLE (window))
+  if (!gtk_widget_get_visible (window))
     {
       gtk_widget_show_all (window);
     }