summaryrefslogtreecommitdiff
path: root/demos
diff options
context:
space:
mode:
Diffstat (limited to 'demos')
-rw-r--r--demos/gtk-demo/button_box.c13
-rwxr-xr-xdemos/gtk-demo/geninclude.pl6
-rwxr-xr-xdemos/gtk-demo/geninclude.pl.in6
-rw-r--r--demos/gtk-demo/item_factory.c9
-rw-r--r--demos/gtk-demo/main.c50
-rw-r--r--demos/gtk-demo/menus.c13
-rw-r--r--demos/gtk-demo/panes.c13
-rw-r--r--demos/gtk-demo/textview.c15
8 files changed, 103 insertions, 22 deletions
diff --git a/demos/gtk-demo/button_box.c b/demos/gtk-demo/button_box.c
index 432bfbbfc..6291375d2 100644
--- a/demos/gtk-demo/button_box.c
+++ b/demos/gtk-demo/button_box.c
@@ -43,7 +43,7 @@ create_bbox (gint horizontal,
return frame;
}
-void
+GtkWidget *
do_button_box (void)
{
static GtkWidget* window = NULL;
@@ -115,8 +115,15 @@ do_button_box (void)
}
if (!GTK_WIDGET_VISIBLE (window))
- gtk_widget_show_all (window);
+ {
+ gtk_widget_show_all (window);
+ }
else
- gtk_widget_destroy (window);
+ {
+ gtk_widget_destroy (window);
+ window = NULL;
+ }
+
+ return window;
}
diff --git a/demos/gtk-demo/geninclude.pl b/demos/gtk-demo/geninclude.pl
index 31036cc39..df534bc46 100755
--- a/demos/gtk-demo/geninclude.pl
+++ b/demos/gtk-demo/geninclude.pl
@@ -1,13 +1,15 @@
#!/usr/bin/perl -w
print <<EOT;
+typedef GtkWidget *(*GDoDemoFunc) (void);
+
typedef struct _Demo Demo;
struct _Demo
{
gchar *title;
gchar *filename;
- void (*func) (void);
+ GDoDemoFunc func;
};
EOT
@@ -31,7 +33,7 @@ for $file (@ARGV) {
close INFO_FILE;
- print "void do_$basename (void);\n";
+ print "GtkWidget *do_$basename (void);\n";
$array .= qq( { "$title", "$file", do_$basename });
}
diff --git a/demos/gtk-demo/geninclude.pl.in b/demos/gtk-demo/geninclude.pl.in
index 31036cc39..df534bc46 100755
--- a/demos/gtk-demo/geninclude.pl.in
+++ b/demos/gtk-demo/geninclude.pl.in
@@ -1,13 +1,15 @@
#!/usr/bin/perl -w
print <<EOT;
+typedef GtkWidget *(*GDoDemoFunc) (void);
+
typedef struct _Demo Demo;
struct _Demo
{
gchar *title;
gchar *filename;
- void (*func) (void);
+ GDoDemoFunc func;
};
EOT
@@ -31,7 +33,7 @@ for $file (@ARGV) {
close INFO_FILE;
- print "void do_$basename (void);\n";
+ print "GtkWidget *do_$basename (void);\n";
$array .= qq( { "$title", "$file", do_$basename });
}
diff --git a/demos/gtk-demo/item_factory.c b/demos/gtk-demo/item_factory.c
index 4e808f9da..32f13ea06 100644
--- a/demos/gtk-demo/item_factory.c
+++ b/demos/gtk-demo/item_factory.c
@@ -41,7 +41,7 @@ static GtkItemFactoryEntry menu_items[] =
static int nmenu_items = sizeof (menu_items) / sizeof (menu_items[0]);
-void
+GtkWidget *
do_item_factory (void)
{
static GtkWidget *window = NULL;
@@ -114,5 +114,10 @@ do_item_factory (void)
gtk_widget_show_all (window);
}
else
- gtk_widget_destroy (window);
+ {
+ gtk_widget_destroy (window);
+ window = NULL;
+ }
+
+ return window;
}
diff --git a/demos/gtk-demo/main.c b/demos/gtk-demo/main.c
index 227b2bfa7..f86cd122e 100644
--- a/demos/gtk-demo/main.c
+++ b/demos/gtk-demo/main.c
@@ -20,6 +20,33 @@ enum {
NUM_COLUMNS
};
+typedef struct _CallbackData CallbackData;
+struct _CallbackData
+{
+ GtkTreeModel *model;
+ GtkTreePath *path;
+};
+
+static void
+window_closed_cb (GtkWidget *window, gpointer data)
+{
+ CallbackData *cbdata = data;
+ GtkTreeIter iter;
+ gboolean italic;
+
+ gtk_tree_model_get_iter (cbdata->model, &iter, cbdata->path);
+ gtk_tree_store_get (GTK_TREE_STORE (cbdata->model), &iter,
+ ITALIC_COLUMN, &italic,
+ -1);
+ if (italic)
+ gtk_tree_store_set (GTK_TREE_STORE (cbdata->model), &iter,
+ ITALIC_COLUMN, !italic,
+ -1);
+
+ gtk_tree_path_free (cbdata->path);
+ g_free (cbdata);
+}
+
gboolean
read_line (FILE *stream, GString *str)
{
@@ -224,7 +251,8 @@ button_press_event_cb (GtkTreeView *tree_view,
{
GtkTreeIter iter;
gboolean italic;
- GVoidFunc func;
+ GDoDemoFunc func;
+ GtkWidget *window;
gtk_tree_model_get_iter (model, &iter, path);
gtk_tree_store_get (GTK_TREE_STORE (model),
@@ -232,12 +260,28 @@ button_press_event_cb (GtkTreeView *tree_view,
FUNC_COLUMN, &func,
ITALIC_COLUMN, &italic,
-1);
- (func) ();
gtk_tree_store_set (GTK_TREE_STORE (model),
&iter,
ITALIC_COLUMN, !italic,
-1);
- gtk_tree_path_free (path);
+ window = (func) ();
+ if (window != NULL)
+ {
+ CallbackData *cbdata;
+
+ cbdata = g_new (CallbackData, 1);
+ cbdata->model = model;
+ cbdata->path = path;
+
+ gtk_signal_connect (GTK_OBJECT (window),
+ "destroy",
+ window_closed_cb,
+ cbdata);
+ }
+ else
+ {
+ gtk_tree_path_free (path);
+ }
}
gtk_signal_emit_stop_by_name (GTK_OBJECT (tree_view),
diff --git a/demos/gtk-demo/menus.c b/demos/gtk-demo/menus.c
index 03ce18d1b..95ddb10e1 100644
--- a/demos/gtk-demo/menus.c
+++ b/demos/gtk-demo/menus.c
@@ -52,7 +52,7 @@ create_menu (gint depth, gboolean tearoff)
return menu;
}
-void
+GtkWidget *
do_menus (void)
{
static GtkWidget *window = NULL;
@@ -180,8 +180,15 @@ do_menus (void)
}
if (!GTK_WIDGET_VISIBLE (window))
- gtk_widget_show (window);
+ {
+ gtk_widget_show (window);
+ }
else
- gtk_widget_destroy (window);
+ {
+ gtk_widget_destroy (window);
+ window = NULL;
+ }
+
+ return window;
}
diff --git a/demos/gtk-demo/panes.c b/demos/gtk-demo/panes.c
index 718f8969b..0bb1bd5e5 100644
--- a/demos/gtk-demo/panes.c
+++ b/demos/gtk-demo/panes.c
@@ -113,7 +113,7 @@ create_pane_options (GtkPaned *paned,
return frame;
}
-void
+GtkWidget *
do_panes (void)
{
static GtkWidget *window = NULL;
@@ -182,7 +182,14 @@ do_panes (void)
}
if (!GTK_WIDGET_VISIBLE (window))
- gtk_widget_show (window);
+ {
+ gtk_widget_show (window);
+ }
else
- gtk_widget_destroy (window);
+ {
+ gtk_widget_destroy (window);
+ window = NULL;
+ }
+
+ return window;
}
diff --git a/demos/gtk-demo/textview.c b/demos/gtk-demo/textview.c
index dc6ad428d..a6f6b2206 100644
--- a/demos/gtk-demo/textview.c
+++ b/demos/gtk-demo/textview.c
@@ -163,7 +163,7 @@ insert_text (GtkTextBuffer *buffer)
GtkTextIter start, end;
GdkPixbuf *pixbuf;
- pixbuf = gdk_pixbuf_new_from_xpm_data (book_closed_xpm);
+ pixbuf = gdk_pixbuf_new_from_xpm_data ((const char **) book_closed_xpm);
/* get start of buffer; each insertion will revalidate the
* iterator to point to just after the inserted text.
@@ -282,7 +282,7 @@ insert_text (GtkTextBuffer *buffer)
g_object_unref (G_OBJECT (pixbuf));
}
-void
+GtkWidget *
do_textview (void)
{
static GtkWidget *window = NULL;
@@ -342,8 +342,15 @@ do_textview (void)
}
if (!GTK_WIDGET_VISIBLE (window))
- gtk_widget_show (window);
+ {
+ gtk_widget_show (window);
+ }
else
- gtk_widget_destroy (window);
+ {
+ gtk_widget_destroy (window);
+ window = NULL;
+ }
+
+ return window;
}
View Lorry Controller Status