diff options
| author | Michael Natterer <mitch@imendio.com> | 2007-01-24 16:10:40 +0000 |
|---|---|---|
| committer | Michael Natterer <mitch@src.gnome.org> | 2007-01-24 16:10:40 +0000 |
| commit | 7446ae9fd7e4303a6d7cb70cf76e1d01b1776c81 (patch) | |
| tree | ad1a066812bb2617716a7586d8e141115ad7ac4e | |
| parent | 5a1ff3b59fb474bd702b4eb971e6347e1c8c3451 (diff) | |
| download | gtk+-7446ae9fd7e4303a6d7cb70cf76e1d01b1776c81.tar.gz | |
revert generic disabling of PRELIGHT state for the reasons given in bug
2007-01-24 Michael Natterer <mitch@imendio.com>
* gtk/gtkwidget.c (gtk_widget_set_state): revert generic disabling
of PRELIGHT state for the reasons given in bug #135666. Widget
states are sometimes abused or otherwise used wrongly for historic
reasons, causing this part of the patch to break e.g. menu items.
svn path=/trunk/; revision=17211
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | gtk/gtkwidget.c | 9 |
2 files changed, 7 insertions, 9 deletions
@@ -1,3 +1,10 @@ +2007-01-24 Michael Natterer <mitch@imendio.com> + + * gtk/gtkwidget.c (gtk_widget_set_state): revert generic disabling + of PRELIGHT state for the reasons given in bug #135666. Widget + states are sometimes abused or otherwise used wrongly for historic + reasons, causing this part of the patch to break e.g. menu items. + 2007-01-24 Roozbeh Pournader <roozbeh@farsiweb.info> * README: Remove mention of no-longer-existing PATCH diff --git a/gtk/gtkwidget.c b/gtk/gtkwidget.c index 7a727433d8..b92c234573 100644 --- a/gtk/gtkwidget.c +++ b/gtk/gtkwidget.c @@ -4531,20 +4531,11 @@ void gtk_widget_set_state (GtkWidget *widget, GtkStateType state) { - gboolean touchscreen; - g_return_if_fail (GTK_IS_WIDGET (widget)); if (state == GTK_WIDGET_STATE (widget)) return; - g_object_get (gtk_widget_get_settings (widget), - "gtk-touchscreen-mode", &touchscreen, - NULL); - - if (touchscreen && state == GTK_STATE_PRELIGHT) - state = GTK_STATE_NORMAL; - if (state == GTK_STATE_INSENSITIVE) gtk_widget_set_sensitive (widget, FALSE); else |