diff options
| author | Carlos Garnacho <carlosg@gnome.org> | 2011-12-12 19:11:41 +0100 |
|---|---|---|
| committer | Matthias Clasen <mclasen@redhat.com> | 2012-03-01 16:25:24 -0500 |
| commit | 87f6bb32edb3c63f1fce405df3910db1c8588e8c (patch) | |
| tree | 0ebd8562275794c066b763c778bf3db032c404d0 /gtk/gtktogglebutton.c | |
| parent | 24e9a19abea77ea721baf356aef174cb11bfdb4f (diff) | |
| download | gtk+-87f6bb32edb3c63f1fce405df3910db1c8588e8c.tar.gz | |
togglebutton: Remove gtk-touchcreen-mode usage
Emulated crossing events with mode GDK_CROSSING_TOUCH_PRESS/RELEASE
already cater dynamically for the "don't prelight on touch devices"
usecase.
Diffstat (limited to 'gtk/gtktogglebutton.c')
| -rw-r--r-- | gtk/gtktogglebutton.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/gtk/gtktogglebutton.c b/gtk/gtktogglebutton.c index 61a58bb48a..d88ed22e08 100644 --- a/gtk/gtktogglebutton.c +++ b/gtk/gtktogglebutton.c @@ -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) |