diff options
| author | Sven Neumann <sven@gimp.org> | 2002-02-19 19:47:16 +0000 |
|---|---|---|
| committer | Sven Neumann <neo@src.gnome.org> | 2002-02-19 19:47:16 +0000 |
| commit | 6dea3cae13ddf8a5e882fe8296678bb7be2a94d8 (patch) | |
| tree | a40a07c80c406c91894e38064e6ec1ea559ef178 /examples/menu | |
| parent | 601302c7a308664c09bc5ee2e23621b34747a252 (diff) | |
| download | gtk+-6dea3cae13ddf8a5e882fe8296678bb7be2a94d8.tar.gz | |
finish conversion to g_signal_* functions by using G_OBJECT and G_CALLBACK
2002-02-19 Sven Neumann <sven@gimp.org>
* examples/*/*.c: finish conversion to g_signal_* functions by
using G_OBJECT and G_CALLBACK and other assorted changes.
Diffstat (limited to 'examples/menu')
| -rw-r--r-- | examples/menu/.cvsignore | 1 | ||||
| -rw-r--r-- | examples/menu/itemfactory.c | 6 | ||||
| -rw-r--r-- | examples/menu/menu.c | 16 |
3 files changed, 12 insertions, 11 deletions
diff --git a/examples/menu/.cvsignore b/examples/menu/.cvsignore index c35a724b3f..c7db989837 100644 --- a/examples/menu/.cvsignore +++ b/examples/menu/.cvsignore @@ -1 +1,2 @@ menu +itemfactory diff --git a/examples/menu/itemfactory.c b/examples/menu/itemfactory.c index 19c84a903c..76f566e876 100644 --- a/examples/menu/itemfactory.c +++ b/examples/menu/itemfactory.c @@ -90,9 +90,9 @@ int main( int argc, gtk_init (&argc, &argv); window = gtk_window_new (GTK_WINDOW_TOPLEVEL); - g_signal_connect (GTK_OBJECT (window), "destroy", - GTK_SIGNAL_FUNC (gtk_main_quit), - "WM destroy"); + g_signal_connect (G_OBJECT (window), "destroy", + G_CALLBACK (gtk_main_quit), + NULL); gtk_window_set_title (GTK_WINDOW (window), "Item Factory"); gtk_widget_set_size_request (GTK_WIDGET (window), 300, 200); diff --git a/examples/menu/menu.c b/examples/menu/menu.c index 2511cde044..132602fae2 100644 --- a/examples/menu/menu.c +++ b/examples/menu/menu.c @@ -25,8 +25,8 @@ int main( int argc, window = gtk_window_new (GTK_WINDOW_TOPLEVEL); gtk_widget_set_size_request (GTK_WIDGET (window), 200, 100); gtk_window_set_title (GTK_WINDOW (window), "GTK Menu Test"); - g_signal_connect (GTK_OBJECT (window), "delete_event", - GTK_SIGNAL_FUNC (gtk_main_quit), NULL); + g_signal_connect (G_OBJECT (window), "delete_event", + G_CALLBACK (gtk_main_quit), NULL); /* Init the menu-widget, and remember -- never * gtk_show_widget() the menu widget!! @@ -52,9 +52,9 @@ int main( int argc, gtk_menu_shell_append (GTK_MENU_SHELL (menu), menu_items); /* Do something interesting when the menuitem is selected */ - g_signal_connect_swapped (GTK_OBJECT (menu_items), "activate", - GTK_SIGNAL_FUNC (menuitem_response), - (gpointer) g_strdup (buf)); + g_signal_connect_swapped (G_OBJECT (menu_items), "activate", + G_CALLBACK (menuitem_response), + g_strdup (buf)); /* Show the widget */ gtk_widget_show (menu_items); @@ -83,9 +83,9 @@ int main( int argc, /* Create a button to which to attach menu as a popup */ button = gtk_button_new_with_label ("press me"); - g_signal_connect_swapped (GTK_OBJECT (button), "event", - GTK_SIGNAL_FUNC (button_press), - GTK_OBJECT (menu)); + g_signal_connect_swapped (G_OBJECT (button), "event", + G_CALLBACK (button_press), + menu); gtk_box_pack_end (GTK_BOX (vbox), button, TRUE, TRUE, 2); gtk_widget_show (button); |