From 7446ae9fd7e4303a6d7cb70cf76e1d01b1776c81 Mon Sep 17 00:00:00 2001 From: Michael Natterer Date: Wed, 24 Jan 2007 16:10:40 +0000 Subject: [PATCH] revert generic disabling of PRELIGHT state for the reasons given in bug 2007-01-24 Michael Natterer * 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 --- ChangeLog | 7 +++++++ gtk/gtkwidget.c | 9 --------- 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/ChangeLog b/ChangeLog index 96fbbc3a28..efb0acdc4c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2007-01-24 Michael Natterer + + * 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 * 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