From e042bc63dd2f3db2ef6835953da73e7e9d89dd90 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Sat, 29 Mar 2003 00:48:28 +0000 Subject: [PATCH] Set state of labels back to normal before reparenting back. (#102387) 2003-03-29 Matthias Clasen * gtk/gtkoptionmenu.c (gtk_option_menu_remove_contents): Set state of labels back to normal before reparenting back. (#102387) --- ChangeLog | 3 +++ ChangeLog.pre-2-10 | 3 +++ ChangeLog.pre-2-4 | 3 +++ ChangeLog.pre-2-6 | 3 +++ ChangeLog.pre-2-8 | 3 +++ gtk/gtkoptionmenu.c | 1 + 6 files changed, 16 insertions(+) diff --git a/ChangeLog b/ChangeLog index b5263f3a44..53723ec157 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 2003-03-29 Matthias Clasen + * gtk/gtkoptionmenu.c (gtk_option_menu_remove_contents): Set state + of labels back to normal before reparenting back. (#102387) + * gtk/gtkcolorseldialog.c (gtk_color_selection_dialog_init): Set a default window title to match the GtkFontSelectionDialog behavior. diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index b5263f3a44..53723ec157 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,5 +1,8 @@ 2003-03-29 Matthias Clasen + * gtk/gtkoptionmenu.c (gtk_option_menu_remove_contents): Set state + of labels back to normal before reparenting back. (#102387) + * gtk/gtkcolorseldialog.c (gtk_color_selection_dialog_init): Set a default window title to match the GtkFontSelectionDialog behavior. diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index b5263f3a44..53723ec157 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,5 +1,8 @@ 2003-03-29 Matthias Clasen + * gtk/gtkoptionmenu.c (gtk_option_menu_remove_contents): Set state + of labels back to normal before reparenting back. (#102387) + * gtk/gtkcolorseldialog.c (gtk_color_selection_dialog_init): Set a default window title to match the GtkFontSelectionDialog behavior. diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index b5263f3a44..53723ec157 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,5 +1,8 @@ 2003-03-29 Matthias Clasen + * gtk/gtkoptionmenu.c (gtk_option_menu_remove_contents): Set state + of labels back to normal before reparenting back. (#102387) + * gtk/gtkcolorseldialog.c (gtk_color_selection_dialog_init): Set a default window title to match the GtkFontSelectionDialog behavior. diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index b5263f3a44..53723ec157 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,5 +1,8 @@ 2003-03-29 Matthias Clasen + * gtk/gtkoptionmenu.c (gtk_option_menu_remove_contents): Set state + of labels back to normal before reparenting back. (#102387) + * gtk/gtkcolorseldialog.c (gtk_color_selection_dialog_init): Set a default window title to match the GtkFontSelectionDialog behavior. diff --git a/gtk/gtkoptionmenu.c b/gtk/gtkoptionmenu.c index c4e80f7b19..afab0ab130 100644 --- a/gtk/gtkoptionmenu.c +++ b/gtk/gtkoptionmenu.c @@ -841,6 +841,7 @@ gtk_option_menu_remove_contents (GtkOptionMenu *option_menu) if (child) { gtk_widget_set_sensitive (child, TRUE); + gtk_widget_set_state (child, GTK_STATE_NORMAL); gtk_widget_reparent (child, option_menu->menu_item); }