diff options
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | ChangeLog.pre-2-10 | 4 | ||||
| -rw-r--r-- | ChangeLog.pre-2-6 | 4 | ||||
| -rw-r--r-- | ChangeLog.pre-2-8 | 4 | ||||
| -rw-r--r-- | gtk/gtkcombobox.c | 11 |
5 files changed, 25 insertions, 2 deletions
@@ -1,5 +1,9 @@ 2004-12-30 Matthias Clasen <mclasen@redhat.com> + * gtk/gtkcombobox.c (gtk_combo_box_button_state_changed): Fix + state propagation when making an insensitive combo box sensitive + again. (#162524, Carlos Garnacho Parro) + * gtk/gtkfilechooserdefault.c: Use secondary text for error dialogs. diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 65468608d6..39f7906561 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,5 +1,9 @@ 2004-12-30 Matthias Clasen <mclasen@redhat.com> + * gtk/gtkcombobox.c (gtk_combo_box_button_state_changed): Fix + state propagation when making an insensitive combo box sensitive + again. (#162524, Carlos Garnacho Parro) + * gtk/gtkfilechooserdefault.c: Use secondary text for error dialogs. diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 65468608d6..39f7906561 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,5 +1,9 @@ 2004-12-30 Matthias Clasen <mclasen@redhat.com> + * gtk/gtkcombobox.c (gtk_combo_box_button_state_changed): Fix + state propagation when making an insensitive combo box sensitive + again. (#162524, Carlos Garnacho Parro) + * gtk/gtkfilechooserdefault.c: Use secondary text for error dialogs. diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 65468608d6..39f7906561 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,5 +1,9 @@ 2004-12-30 Matthias Clasen <mclasen@redhat.com> + * gtk/gtkcombobox.c (gtk_combo_box_button_state_changed): Fix + state propagation when making an insensitive combo box sensitive + again. (#162524, Carlos Garnacho Parro) + * gtk/gtkfilechooserdefault.c: Use secondary text for error dialogs. diff --git a/gtk/gtkcombobox.c b/gtk/gtkcombobox.c index eb567fb5f2..8898c766d9 100644 --- a/gtk/gtkcombobox.c +++ b/gtk/gtkcombobox.c @@ -854,8 +854,15 @@ gtk_combo_box_button_state_changed (GtkWidget *widget, if (GTK_WIDGET_REALIZED (widget)) { if (!combo_box->priv->tree_view && combo_box->priv->cell_view) - gtk_widget_set_state (combo_box->priv->cell_view, - GTK_WIDGET_STATE (widget)); + { + if ((GTK_WIDGET_STATE (widget) == GTK_STATE_INSENSITIVE) != + (GTK_WIDGET_STATE (combo_box->priv->cell_view) == GTK_STATE_INSENSITIVE)) + gtk_widget_set_sensitive (combo_box->priv->cell_view, GTK_WIDGET_SENSITIVE (widget)); + + gtk_widget_set_state (combo_box->priv->cell_view, + GTK_WIDGET_STATE (widget)); + + } } gtk_widget_queue_draw (widget); |