Do not unset sensitivity mistakenly in gtk_widget_set_state_flags()

together with commit 8903615a34, this finally fixes bug #640282.
Insensitivity is handled separatedly in _gtk_widget_update_state_flags(),
but the insensitive flag is mistakenly unset afterwards if clear is TRUE
in gtk_widget_set_state_flags().
This commit is contained in:
Carlos Garnacho 2011-01-23 18:21:32 +01:00
parent a0e1fa9e77
commit 0c7772f0cf

View File

@ -6969,7 +6969,8 @@ _gtk_widget_update_state_flags (GtkWidget *widget,
gtk_widget_set_sensitive (widget,
operation != STATE_CHANGE_UNSET);
flags &= ~(GTK_STATE_FLAG_INSENSITIVE);
if (operation != STATE_CHANGE_REPLACE)
flags &= ~(GTK_STATE_FLAG_INSENSITIVE);
/* Focused state is meant to be set only on the widget
* being changed itself, not on the children */