Deprecate widget flag: GTK_WIDGET_VISIBLE

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

diff --git a/demos/gtk-demo/builder.c b/demos/gtk-demo/builder.c
index 8ffa6c46030f616a21103191850e554abf8b21fa..9e795dece66a3f2cfb5cae9493a1afa2c31aaebd 100644 (file)
--- a/demos/gtk-demo/builder.c
+++ b/demos/gtk-demo/builder.c
@@ -6,28 +6,31 @@
 #include <gtk/gtk.h>
 #include "demo-common.h"
 
-void
+static GtkBuilder *builder;
+
+G_MODULE_EXPORT void
 quit_activate (GtkAction *action)
 {
+  GtkWidget *window;
+
+  window = GTK_WIDGET (gtk_builder_get_object (builder, "window1"));
+  gtk_widget_destroy (window);
 }
 
-void
+G_MODULE_EXPORT void
 about_activate (GtkAction *action)
 {
   GtkWidget *about_dlg;
 
-  about_dlg = gtk_about_dialog_new ();
-  gtk_about_dialog_set_program_name (GTK_ABOUT_DIALOG (about_dlg),
-                                     "GtkBuilder demo");
+  about_dlg = GTK_WIDGET (gtk_builder_get_object (builder, "aboutdialog1"));
   gtk_dialog_run (GTK_DIALOG (about_dlg));
-  gtk_widget_destroy (about_dlg);
+  gtk_widget_hide (about_dlg);
 }
 
 GtkWidget *
 do_builder (GtkWidget *do_widget)
 {
   static GtkWidget *window = NULL;
-  GtkBuilder *builder;
   GError *err = NULL;
   gchar *filename;
   
@@ -50,7 +53,7 @@ do_builder (GtkWidget *do_widget)
                        G_CALLBACK (gtk_widget_destroyed), &window);
     }
 
-  if (!GTK_WIDGET_VISIBLE (window))
+  if (!gtk_widget_get_visible (window))
     {
       gtk_widget_show_all (window);
     }