]> Pileus Git - ~andy/gtk/commitdiff
togglebutton: Remove gtk-touchcreen-mode usage
authorCarlos Garnacho <carlosg@gnome.org>
Mon, 12 Dec 2011 18:11:41 +0000 (19:11 +0100)
committerMatthias Clasen <mclasen@redhat.com>
Thu, 1 Mar 2012 21:25:24 +0000 (16:25 -0500)
Emulated crossing events with mode GDK_CROSSING_TOUCH_PRESS/RELEASE
already cater dynamically for the "don't prelight on touch devices"
usecase.

gtk/gtktogglebutton.c

index 61a58bb48aba30a9ab5d832b72f4db9d45e47821..d88ed22e08c278ca84364abf9f038c058c3ca89d 100644 (file)
@@ -656,13 +656,9 @@ gtk_toggle_button_update_state (GtkButton *button)
 {
   GtkToggleButton *toggle_button = GTK_TOGGLE_BUTTON (button);
   GtkToggleButtonPrivate *priv = toggle_button->priv;
-  gboolean depressed, touchscreen;
+  gboolean depressed;
   GtkStateFlags new_state = 0;
 
-  g_object_get (gtk_widget_get_settings (GTK_WIDGET (button)),
-                "gtk-touchscreen-mode", &touchscreen,
-                NULL);
-
   new_state = gtk_widget_get_state_flags (GTK_WIDGET (button)) &
     ~(GTK_STATE_FLAG_INCONSISTENT |
       GTK_STATE_FLAG_PRELIGHT |
@@ -678,7 +674,7 @@ gtk_toggle_button_update_state (GtkButton *button)
   else
     depressed = priv->active;
 
-  if (!touchscreen && button->priv->in_button && (!button->priv->button_down || priv->draw_indicator))
+  if (button->priv->in_button && (!button->priv->button_down || priv->draw_indicator))
     new_state |= GTK_STATE_FLAG_PRELIGHT;
 
   if (depressed)