diff options
| author | Tim Janik <timj@gtk.org> | 2001-08-17 16:33:04 +0000 |
|---|---|---|
| committer | Tim Janik <timj@src.gnome.org> | 2001-08-17 16:33:04 +0000 |
| commit | ad9d2daf4a3156ed3a828e7547d383c0d7dbce75 (patch) | |
| tree | 5b57562e4b3e971ae64480071278874ee7311713 /gtk/gtkoptionmenu.c | |
| parent | aa9932da2704b070a18e13074746b56c4c3a4f9d (diff) | |
| download | gtk+-ad9d2daf4a3156ed3a828e7547d383c0d7dbce75.tar.gz | |
const correct string parameter.
Fri Aug 17 17:30:34 2001 Tim Janik <timj@gtk.org>
* gtk/gtktreemodel.c (gtk_tree_path_new_from_string): const correct
string parameter.
* gtk/gtkoptionmenu.c (gtk_option_menu_set_menu): connect to
GtkMenuShell::selection_done, now that we have it, instead of
::deactivate so we're not tearing the menu apart and notify
the user prematurely.
Thu Aug 16 05:22:01 2001 Tim Janik <timj@gtk.org>
* gtk/gtkwindow.c (gtk_window_move_resize): if we actually move our
window, clear window->need_default_position to avoid infinite loops.
some comment fixups and GTK_RESIZE_IMMEDIATE fixups.
Wed Aug 15 12:36:55 2001 Tim Janik <timj@gtk.org>
* gtk/gtktreeview.c (gtk_tree_view_set_model): move all model setup
code into this place. get rid of GTK_TREE_VIEW_MODEL_SETUP usage.
(gtk_tree_view_set_property): don't cast possible NULL objects.
(gtk_tree_view_destroy): reset the model to NULL.
* gtk/gtktreeselection.c (gtk_tree_selection_finalize): chain
parent_class handler.
Diffstat (limited to 'gtk/gtkoptionmenu.c')
| -rw-r--r-- | gtk/gtkoptionmenu.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/gtk/gtkoptionmenu.c b/gtk/gtkoptionmenu.c index fac72c9127..3af74664ad 100644 --- a/gtk/gtkoptionmenu.c +++ b/gtk/gtkoptionmenu.c @@ -67,7 +67,7 @@ static gint gtk_option_menu_button_press (GtkWidget *widget, GdkEventButton *event); static gint gtk_option_menu_key_press (GtkWidget *widget, GdkEventKey *event); -static void gtk_option_menu_deactivate (GtkMenuShell *menu_shell, +static void gtk_option_menu_selection_done (GtkMenuShell *menu_shell, GtkOptionMenu *option_menu); static void gtk_option_menu_update_contents (GtkOptionMenu *option_menu); static void gtk_option_menu_remove_contents (GtkOptionMenu *option_menu); @@ -234,9 +234,9 @@ gtk_option_menu_set_menu (GtkOptionMenu *option_menu, gtk_option_menu_calc_size (option_menu); - gtk_signal_connect (GTK_OBJECT (option_menu->menu), "deactivate", - (GtkSignalFunc) gtk_option_menu_deactivate, - option_menu); + gtk_signal_connect_after (GTK_OBJECT (option_menu->menu), "selection_done", + G_CALLBACK (gtk_option_menu_selection_done), + option_menu); gtk_signal_connect_object (GTK_OBJECT (option_menu->menu), "size_request", (GtkSignalFunc) gtk_option_menu_calc_size, GTK_OBJECT (option_menu)); @@ -611,8 +611,8 @@ gtk_option_menu_key_press (GtkWidget *widget, } static void -gtk_option_menu_deactivate (GtkMenuShell *menu_shell, - GtkOptionMenu *option_menu) +gtk_option_menu_selection_done (GtkMenuShell *menu_shell, + GtkOptionMenu *option_menu) { g_return_if_fail (menu_shell != NULL); g_return_if_fail (GTK_IS_OPTION_MENU (option_menu)); |