summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthias Clasen <maclas@gmx.de>2003-03-29 00:48:28 +0000
committerMatthias Clasen <matthiasc@src.gnome.org>2003-03-29 00:48:28 +0000
commite042bc63dd2f3db2ef6835953da73e7e9d89dd90 (patch)
treef97c2b041985bb3dd78136fd8e32973b39bd3d77
parentb9c6a4fd2ab7c9251814779935c1fe3443ad0b32 (diff)
downloadgdk-pixbuf-e042bc63dd2f3db2ef6835953da73e7e9d89dd90.tar.gz
Set state of labels back to normal before reparenting back. (#102387)
2003-03-29 Matthias Clasen <maclas@gmx.de> * gtk/gtkoptionmenu.c (gtk_option_menu_remove_contents): Set state of labels back to normal before reparenting back. (#102387)
-rw-r--r--ChangeLog3
-rw-r--r--ChangeLog.pre-2-103
-rw-r--r--ChangeLog.pre-2-43
-rw-r--r--ChangeLog.pre-2-63
-rw-r--r--ChangeLog.pre-2-83
-rw-r--r--gtk/gtkoptionmenu.c1
6 files changed, 16 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index b5263f3a4..53723ec15 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
2003-03-29 Matthias Clasen <maclas@gmx.de>
+ * 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 b5263f3a4..53723ec15 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,5 +1,8 @@
2003-03-29 Matthias Clasen <maclas@gmx.de>
+ * 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 b5263f3a4..53723ec15 100644
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,5 +1,8 @@
2003-03-29 Matthias Clasen <maclas@gmx.de>
+ * 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 b5263f3a4..53723ec15 100644
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,5 +1,8 @@
2003-03-29 Matthias Clasen <maclas@gmx.de>
+ * 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 b5263f3a4..53723ec15 100644
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,5 +1,8 @@
2003-03-29 Matthias Clasen <maclas@gmx.de>
+ * 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 c4e80f7b1..afab0ab13 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);
}