[gtk+] Deprecate and ignore gtk-enable-tooltips setting
- From: William Jon McCann <mccann src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+] Deprecate and ignore gtk-enable-tooltips setting
- Date: Sun, 30 Jun 2013 18:31:52 +0000 (UTC)
commit a9e82cd46a4aa6613c460322aa022d326449110d
Author: William Jon McCann <william jon mccann gmail com>
Date: Sun Jun 30 14:28:02 2013 -0400
Deprecate and ignore gtk-enable-tooltips setting
It is enabled by default except on touch input devices.
gtk/gtksettings.c | 2 ++
gtk/gtktooltip.c | 13 +------------
tests/testgtk.c | 21 ---------------------
3 files changed, 3 insertions(+), 33 deletions(-)
---
diff --git a/gtk/gtksettings.c b/gtk/gtksettings.c
index 9bccd70..ab96154 100644
--- a/gtk/gtksettings.c
+++ b/gtk/gtksettings.c
@@ -1151,6 +1151,8 @@ gtk_settings_class_init (GtkSettingsClass *class)
* Whether tooltips should be shown on widgets.
*
* Since: 2.14
+ *
+ * Deprecated: 3.10: This setting is ignored.
*/
result = settings_install_property_parser (class,
g_param_spec_boolean ("gtk-enable-tooltips",
diff --git a/gtk/gtktooltip.c b/gtk/gtktooltip.c
index 9e67511..311dfbd 100644
--- a/gtk/gtktooltip.c
+++ b/gtk/gtktooltip.c
@@ -1582,26 +1582,15 @@ tooltips_enabled (GdkEvent *event)
{
GdkDevice *source_device;
GdkInputSource source;
- GdkWindow *window;
- gboolean enabled;
- GdkScreen *screen;
- GtkSettings *settings;
- window = event->any.window;
source_device = gdk_event_get_source_device (event);
if (!source_device)
return FALSE;
source = gdk_device_get_source (source_device);
- screen = gdk_window_get_screen (window);
- settings = gtk_settings_get_for_screen (screen);
-
- g_object_get (settings,
- "gtk-enable-tooltips", &enabled,
- NULL);
- if (enabled && source != GDK_SOURCE_TOUCHSCREEN)
+ if (source != GDK_SOURCE_TOUCHSCREEN)
return TRUE;
return FALSE;
diff --git a/tests/testgtk.c b/tests/testgtk.c
index 16b496a..f26b525 100644
--- a/tests/testgtk.c
+++ b/tests/testgtk.c
@@ -1200,22 +1200,6 @@ set_toolbar_both_horiz (GtkWidget *widget,
gtk_toolbar_set_style (GTK_TOOLBAR (data), GTK_TOOLBAR_BOTH_HORIZ);
}
-static void
-set_toolbar_enable (GtkWidget *widget,
- gpointer data)
-{
- GtkSettings *settings = gtk_widget_get_settings (widget);
- g_object_set (settings, "gtk-enable-tooltips", TRUE, NULL);
-}
-
-static void
-set_toolbar_disable (GtkWidget *widget,
- gpointer data)
-{
- GtkSettings *settings = gtk_widget_get_settings (widget);
- g_object_set (settings, "gtk-enable-tooltips", FALSE, NULL);
-}
-
G_GNUC_BEGIN_IGNORE_DEPRECATIONS;
static GtkActionEntry create_toolbar_items[] = {
{ NULL, GTK_STOCK_NEW, NULL, NULL, "Stock icon: New",
@@ -1240,11 +1224,6 @@ static GtkActionEntry create_toolbar_items[] = {
NULL },
{ NULL },
{ NULL },
- { NULL, NULL, "Enable", NULL, "Enable tooltips",
- G_CALLBACK (set_toolbar_enable) },
- { NULL, NULL, "Disable", NULL, "Disable tooltips",
- G_CALLBACK (set_toolbar_disable) },
- { NULL },
{ NULL, NULL, "Frobate", NULL, "Frobate tooltip",
NULL },
{ NULL, NULL, "Baz", NULL, "Baz tooltip",
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]