[gtk+] Remove *_set_extension_events() and old API to query devices.
- From: Carlos Garnacho <carlosg src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+] Remove *_set_extension_events() and old API to query devices.
- Date: Fri, 17 Dec 2010 15:28:13 +0000 (UTC)
commit 2c8c1c6df49b38b525b51a4773758b08a648f81e
Author: Carlos Garnacho <carlosg gnome org>
Date: Fri Dec 17 03:17:13 2010 +0100
Remove *_set_extension_events() and old API to query devices.
The old functions to get core pointer and devices list are gone as
well. This slice is entirely replaced internally by multidevice
handling and may just go.
docs/reference/gdk/gdk3-sections.txt | 10 --
docs/reference/gtk/gtk3-sections.txt | 2 -
gdk/Makefile.am | 2 -
gdk/gdk.h | 1 -
gdk/gdk.symbols | 5 -
gdk/gdkdevice.c | 5 -
gdk/gdkdeviceprivate.h | 2 -
gdk/gdkdisplay.c | 39 ------
gdk/gdkdisplay.h | 4 -
gdk/gdkinput.h | 60 ---------
gdk/gdkinternals.h | 6 -
gdk/gdkwindow.c | 153 -----------------------
gdk/x11/Makefile.am | 1 -
gdk/x11/gdkinput.c | 227 ----------------------------------
gtk/gtk.symbols | 2 -
gtk/gtkwidget.c | 125 +------------------
gtk/gtkwidget.h | 4 -
17 files changed, 2 insertions(+), 646 deletions(-)
---
diff --git a/docs/reference/gdk/gdk3-sections.txt b/docs/reference/gdk/gdk3-sections.txt
index a70c8bb..1a1db3b 100644
--- a/docs/reference/gdk/gdk3-sections.txt
+++ b/docs/reference/gdk/gdk3-sections.txt
@@ -122,7 +122,6 @@ gdk_display_sync
gdk_display_flush
gdk_display_close
gdk_display_is_closed
-gdk_display_list_devices
gdk_display_get_event
gdk_display_peek_event
gdk_display_put_event
@@ -173,7 +172,6 @@ gdk_display_manager_get
gdk_display_manager_get_default_display
gdk_display_manager_set_default_display
gdk_display_manager_list_displays
-gdk_display_get_core_pointer
<SUBSECTION Standard>
GDK_DISPLAY_MANAGER
GDK_DISPLAY_MANAGER_CLASS
@@ -738,14 +736,6 @@ gdk_device_get_axis
gdk_device_list_axes
gdk_device_get_axis_value
-<SUBSECTION>
-gdk_input_set_extension_events
-GdkExtensionMode
-
-<SUBSECTION>
-gdk_devices_list
-gdk_device_get_core_pointer
-
<SUBSECTION Standard>
GDK_TYPE_AXIS_USE
GDK_TYPE_EXTENSION_MODE
diff --git a/docs/reference/gtk/gtk3-sections.txt b/docs/reference/gtk/gtk3-sections.txt
index 6fefb96..e16eb06 100644
--- a/docs/reference/gtk/gtk3-sections.txt
+++ b/docs/reference/gtk/gtk3-sections.txt
@@ -4937,8 +4937,6 @@ gtk_widget_get_parent_window
gtk_widget_set_events
gtk_widget_get_events
gtk_widget_add_events
-gtk_widget_set_extension_events
-gtk_widget_get_extension_events
gtk_widget_set_device_events
gtk_widget_get_device_events
gtk_widget_add_device_events
diff --git a/gdk/Makefile.am b/gdk/Makefile.am
index c56c721..40aaaf7 100644
--- a/gdk/Makefile.am
+++ b/gdk/Makefile.am
@@ -72,7 +72,6 @@ gdk_public_h_sources = \
gdkdisplaymanager.h \
gdkdnd.h \
gdkevents.h \
- gdkinput.h \
gdkkeys.h \
gdkkeysyms.h \
gdkkeysyms-compat.h \
@@ -195,7 +194,6 @@ x11_introspection_files = \
x11/gdkgeometry-x11.c \
x11/gdkglobals-x11.c \
x11/gdkim-x11.c \
- x11/gdkinput.c \
x11/gdkkeys-x11.c \
x11/gdkmain-x11.c \
x11/gdkproperty-x11.c \
diff --git a/gdk/gdk.h b/gdk/gdk.h
index 851185a..529dc05 100644
--- a/gdk/gdk.h
+++ b/gdk/gdk.h
@@ -40,7 +40,6 @@
#include <gdk/gdkdnd.h>
#include <gdk/gdkenumtypes.h>
#include <gdk/gdkevents.h>
-#include <gdk/gdkinput.h>
#include <gdk/gdkkeys.h>
#include <gdk/gdkkeysyms.h>
#include <gdk/gdkmain.h>
diff --git a/gdk/gdk.symbols b/gdk/gdk.symbols
index 8d5cba8..f9a2f4d 100644
--- a/gdk/gdk.symbols
+++ b/gdk/gdk.symbols
@@ -50,7 +50,6 @@ gdk_device_get_associated_device
gdk_device_get_axis
gdk_device_get_axis_use
gdk_device_get_axis_value
-gdk_device_get_core_pointer
gdk_device_get_device_type
gdk_device_get_display
gdk_device_get_has_cursor
@@ -77,7 +76,6 @@ gdk_device_set_axis_use
gdk_device_set_key
gdk_device_set_mode
gdk_device_set_source
-gdk_devices_list
gdk_device_type_get_type G_GNUC_CONST
gdk_device_ungrab
gdk_disable_multidevice
@@ -86,7 +84,6 @@ gdk_display_beep
gdk_display_close
gdk_display_device_is_grabbed
gdk_display_flush
-gdk_display_get_core_pointer
gdk_display_get_default
gdk_display_get_default_cursor_size
gdk_display_get_default_group
@@ -104,7 +101,6 @@ gdk_display_get_window_at_device_position
gdk_display_get_window_at_pointer
gdk_display_is_closed
gdk_display_keyboard_ungrab
-gdk_display_list_devices
gdk_display_manager_get
gdk_display_manager_get_default_display
gdk_display_manager_get_type G_GNUC_CONST
@@ -208,7 +204,6 @@ gdk_gravity_get_type G_GNUC_CONST
gdk_init
gdk_init_check
gdk_input_mode_get_type G_GNUC_CONST
-gdk_input_set_extension_events
gdk_input_source_get_type G_GNUC_CONST
gdk_keyboard_grab
gdk_keyboard_ungrab
diff --git a/gdk/gdkdevice.c b/gdk/gdkdevice.c
index 57a1a83..755f78a 100644
--- a/gdk/gdkdevice.c
+++ b/gdk/gdkdevice.c
@@ -621,14 +621,9 @@ gdk_device_set_mode (GdkDevice *device,
gdk_device_get_device_type (device) == GDK_DEVICE_TYPE_MASTER)
return FALSE;
- /* FIXME: setting has_cursor when mode is window? */
-
device->priv->mode = mode;
g_object_notify (G_OBJECT (device), "input-mode");
- if (gdk_device_get_device_type (device) != GDK_DEVICE_TYPE_MASTER)
- _gdk_input_check_extension_events (device);
-
return TRUE;
}
diff --git a/gdk/gdkdeviceprivate.h b/gdk/gdkdeviceprivate.h
index f731862..5353651 100644
--- a/gdk/gdkdeviceprivate.h
+++ b/gdk/gdkdeviceprivate.h
@@ -123,8 +123,6 @@ gboolean _gdk_device_translate_axis (GdkDevice *device,
GdkTimeCoord ** _gdk_device_allocate_history (GdkDevice *device,
gint n_events);
-void _gdk_input_check_extension_events (GdkDevice *device);
-
void _gdk_device_add_slave (GdkDevice *device,
GdkDevice *slave);
void _gdk_device_remove_slave (GdkDevice *device,
diff --git a/gdk/gdkdisplay.c b/gdk/gdkdisplay.c
index 9a083e1..7ec0906 100644
--- a/gdk/gdkdisplay.c
+++ b/gdk/gdkdisplay.c
@@ -650,45 +650,6 @@ gdk_event_send_clientmessage_toall (GdkEvent *event)
}
/**
- * gdk_device_get_core_pointer:
- *
- * Returns the core pointer device for the default display.
- *
- * Return value: (transfer none): the core pointer device; this is owned
- * by the display and should not be freed.
- *
- * Deprecated: 3.0: Use gdk_device_manager_get_client_pointer() instead, or
- * gdk_event_get_device() if a #GdkEvent with pointer device
- * information is available.
- **/
-GdkDevice *
-gdk_device_get_core_pointer (void)
-{
- return gdk_display_get_core_pointer (gdk_display_get_default ());
-}
-
-/**
- * gdk_display_get_core_pointer:
- * @display: a #GdkDisplay
- *
- * Returns the core pointer device for the given display
- *
- * Return value: (transfer none): the core pointer device; this is owned by the
- * display and should not be freed.
- *
- * Since: 2.2
- *
- * Deprecated: 3.0: Use gdk_device_manager_get_client_pointer() instead, or
- * gdk_event_get_device() if a #GdkEvent with device
- * information is available.
- **/
-GdkDevice *
-gdk_display_get_core_pointer (GdkDisplay *display)
-{
- return display->core_pointer;
-}
-
-/**
* gdk_set_sm_client_id:
* @sm_client_id: the client id assigned by the session manager when the
* connection was opened, or %NULL to remove the property.
diff --git a/gdk/gdkdisplay.h b/gdk/gdkdisplay.h
index 17afa4b..381f45e 100644
--- a/gdk/gdkdisplay.h
+++ b/gdk/gdkdisplay.h
@@ -259,10 +259,6 @@ GdkDisplay *gdk_display_get_default (void);
#ifndef GDK_MULTIDEVICE_SAFE
-#ifndef GDK_DISABLE_DEPRECATED
-GdkDevice *gdk_display_get_core_pointer (GdkDisplay *display);
-#endif /* GDK_DISABLE_DEPRECATED */
-
void gdk_display_get_pointer (GdkDisplay *display,
GdkScreen **screen,
gint *x,
diff --git a/gdk/gdkinternals.h b/gdk/gdkinternals.h
index c98d218..c6173a7 100644
--- a/gdk/gdkinternals.h
+++ b/gdk/gdkinternals.h
@@ -176,7 +176,6 @@ typedef struct
guint implicit_ungrab : 1;
} GdkDeviceGrabInfo;
-typedef struct _GdkInputWindow GdkInputWindow;
typedef struct _GdkWindowPaint GdkWindowPaint;
typedef void (* GdkDisplayPointerInfoForeach) (GdkDisplay *display,
@@ -253,7 +252,6 @@ struct _GdkWindow
guint num_offscreen_children;
GdkWindowPaint *implicit_paint;
- GdkInputWindow *input_window; /* only set for impl windows */
GList *outstanding_moves;
@@ -527,10 +525,6 @@ cairo_region_t *_gdk_window_calculate_full_clip_region (GdkWindow *window
gint *base_y_offset);
gboolean _gdk_window_has_impl (GdkWindow *window);
GdkWindow * _gdk_window_get_impl_window (GdkWindow *window);
-GdkWindow *_gdk_window_get_input_window_for_event (GdkWindow *native_window,
- GdkEventType event_type,
- int x, int y,
- gulong serial);
/*****************************
* offscreen window routines *
diff --git a/gdk/gdkwindow.c b/gdk/gdkwindow.c
index 54f5d2f..d5e5e14 100644
--- a/gdk/gdkwindow.c
+++ b/gdk/gdkwindow.c
@@ -1699,67 +1699,6 @@ gdk_window_reparent (GdkWindow *window,
_gdk_synthesize_crossing_events_for_geometry_change (window);
}
-static gboolean
-temporary_disable_extension_events (GdkWindow*window)
-{
- GdkWindow*child;
- GList *l;
- gboolean res;
-
- if (window->extension_events != 0)
- {
- g_object_set_data (G_OBJECT (window),
- "gdk-window-extension-events",
- GINT_TO_POINTER (window->extension_events));
- gdk_input_set_extension_events ((GdkWindow *)window, 0,
- GDK_EXTENSION_EVENTS_NONE);
- }
- else
- res = FALSE;
-
- for (l = window->children; l != NULL; l = l->next)
- {
- child = l->data;
-
- if (window->impl_window == child->impl_window)
- res |= temporary_disable_extension_events (child);
- }
-
- return res;
-}
-
-static void
-reenable_extension_events (GdkWindow *window)
-{
- GdkWindow *child;
- GList *l;
- int mask;
-
- mask = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (window),
- "gdk-window-extension-events"));
-
- if (mask != 0)
- {
- /* We don't have the mode here, so we pass in cursor.
- This works with the current code since mode is not
- stored except as part of the mask, and cursor doesn't
- change the mask. */
- gdk_input_set_extension_events ((GdkWindow *)window, mask,
- GDK_EXTENSION_EVENTS_CURSOR);
- g_object_set_data (G_OBJECT (window),
- "gdk-window-extension-events",
- NULL);
- }
-
- for (l = window->children; l != NULL; l = l->next)
- {
- child = l->data;
-
- if (window->impl_window == child->impl_window)
- reenable_extension_events (window);
- }
-}
-
/**
* gdk_window_ensure_native:
* @window: a #GdkWindow
@@ -1784,7 +1723,6 @@ gdk_window_ensure_native (GdkWindow *window)
GdkWindow *above;
GList listhead;
GdkWindowImplClass *impl_class;
- gboolean disabled_extension_events;
g_return_val_if_fail (GDK_IS_WINDOW (window), FALSE);
@@ -1803,12 +1741,6 @@ gdk_window_ensure_native (GdkWindow *window)
/* Need to create a native window */
- /* First we disable any extension events on the window or its
- descendants to handle the native input window moving */
- disabled_extension_events = FALSE;
- if (impl_window->input_window)
- disabled_extension_events = temporary_disable_extension_events (window);
-
gdk_window_drop_cairo_surface (window);
screen = gdk_window_get_screen (window);
@@ -1859,9 +1791,6 @@ gdk_window_ensure_native (GdkWindow *window)
if (gdk_window_is_viewable (window))
impl_class->show (window, FALSE);
- if (disabled_extension_events)
- reenable_extension_events (window);
-
return TRUE;
}
@@ -9814,88 +9743,6 @@ _gdk_windowing_got_event (GdkDisplay *display,
}
}
-
-static GdkWindow *
-get_extension_event_window (GdkDisplay *display,
- GdkWindow *pointer_window,
- GdkEventType type,
- gulong serial)
-{
- guint evmask;
- GdkWindow *w, *grab_window;
- GdkDeviceGrabInfo *grab;
-
- /* FIXME: which device? */
- grab = _gdk_display_has_device_grab (display, display->core_pointer, serial);
-
- if (grab != NULL && !grab->owner_events)
- {
- evmask = grab->event_mask;
-
- grab_window = grab->window;
-
- if (evmask & type_masks[type])
- return grab_window;
- else
- return NULL;
- }
-
- w = pointer_window;
- while (w != NULL)
- {
- evmask = w->extension_events;
-
- if (evmask & type_masks[type])
- return w;
-
- w = get_event_parent (w);
- }
-
- if (grab != NULL &&
- grab->owner_events)
- {
- evmask = grab->event_mask;
-
- if (evmask & type_masks[type])
- return grab->window;
- else
- return NULL;
- }
-
- return NULL;
-}
-
-
-GdkWindow *
-_gdk_window_get_input_window_for_event (GdkWindow *native_window,
- GdkEventType event_type,
- int x, int y,
- gulong serial)
-{
- GdkDisplay *display;
- GdkWindow *toplevel_window;
- GdkWindow *pointer_window;
- GdkWindow *event_win;
- gdouble toplevel_x, toplevel_y;
-
- toplevel_x = x;
- toplevel_y = y;
-
- display = gdk_window_get_display (native_window);
- toplevel_window = convert_native_coords_to_toplevel (native_window,
- toplevel_x, toplevel_y,
- &toplevel_x, &toplevel_y);
- /* FIXME: which device? */
- pointer_window = get_pointer_window (display, toplevel_window, NULL,
- toplevel_x, toplevel_y, serial);
- event_win = get_extension_event_window (display,
- pointer_window,
- event_type,
- serial);
-
- return event_win;
-}
-
/**
* gdk_window_create_similar_surface:
* @window: window to make new surface similar to
diff --git a/gdk/x11/Makefile.am b/gdk/x11/Makefile.am
index b6a4751..30295b4 100644
--- a/gdk/x11/Makefile.am
+++ b/gdk/x11/Makefile.am
@@ -37,7 +37,6 @@ libgdk_x11_la_SOURCES = \
gdkgeometry-x11.c \
gdkglobals-x11.c \
gdkim-x11.c \
- gdkinput.c \
gdkkeys-x11.c \
gdkmain-x11.c \
gdkproperty-x11.c \
diff --git a/gtk/gtk.symbols b/gtk/gtk.symbols
index d121000..ad10d60 100644
--- a/gtk/gtk.symbols
+++ b/gtk/gtk.symbols
@@ -3408,7 +3408,6 @@ gtk_widget_get_direction
gtk_widget_get_display
gtk_widget_get_double_buffered
gtk_widget_get_events
-gtk_widget_get_extension_events
gtk_widget_get_halign
gtk_widget_get_has_tooltip
gtk_widget_get_has_window
@@ -3554,7 +3553,6 @@ gtk_widget_set_device_events
gtk_widget_set_direction
gtk_widget_set_double_buffered
gtk_widget_set_events
-gtk_widget_set_extension_events
gtk_widget_set_halign
gtk_widget_set_has_tooltip
gtk_widget_set_has_window
diff --git a/gtk/gtkwidget.c b/gtk/gtkwidget.c
index 5053b1f..3e3f7a0 100644
--- a/gtk/gtkwidget.c
+++ b/gtk/gtkwidget.c
@@ -24,8 +24,6 @@
* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
-#undef GDK_DISABLE_DEPRECATED /* gdk_input_set_extension_events() */
-
#include "config.h"
#include <stdarg.h>
#include <string.h>
@@ -467,7 +465,6 @@ enum {
PROP_COMPOSITE_CHILD,
PROP_STYLE,
PROP_EVENTS,
- PROP_EXTENSION_EVENTS,
PROP_NO_SHOW_ALL,
PROP_HAS_TOOLTIP,
PROP_TOOLTIP_MARKUP,
@@ -669,7 +666,6 @@ static GQuark quark_accel_path = 0;
static GQuark quark_accel_closures = 0;
static GQuark quark_event_mask = 0;
static GQuark quark_device_event_mask = 0;
-static GQuark quark_extension_event_mode = 0;
static GQuark quark_parent_window = 0;
static GQuark quark_pointer_window = 0;
static GQuark quark_shape_info = 0;
@@ -783,7 +779,6 @@ gtk_widget_class_init (GtkWidgetClass *klass)
quark_accel_closures = g_quark_from_static_string ("gtk-accel-closures");
quark_event_mask = g_quark_from_static_string ("gtk-event-mask");
quark_device_event_mask = g_quark_from_static_string ("gtk-device-event-mask");
- quark_extension_event_mode = g_quark_from_static_string ("gtk-extension-event-mode");
quark_parent_window = g_quark_from_static_string ("gtk-parent-window");
quark_pointer_window = g_quark_from_static_string ("gtk-pointer-window");
quark_shape_info = g_quark_from_static_string ("gtk-shape-info");
@@ -1001,14 +996,6 @@ gtk_widget_class_init (GtkWidgetClass *klass)
GDK_STRUCTURE_MASK,
GTK_PARAM_READWRITE));
g_object_class_install_property (gobject_class,
- PROP_EXTENSION_EVENTS,
- g_param_spec_enum ("extension-events",
- P_("Extension events"),
- P_("The mask that decides what kind of extension events this widget gets"),
- GDK_TYPE_EXTENSION_MODE,
- GDK_EXTENSION_EVENTS_NONE,
- GTK_PARAM_READWRITE));
- g_object_class_install_property (gobject_class,
PROP_NO_SHOW_ALL,
g_param_spec_boolean ("no-show-all",
P_("No show all"),
@@ -3231,9 +3218,6 @@ gtk_widget_set_property (GObject *object,
if (!gtk_widget_get_realized (widget) && gtk_widget_get_has_window (widget))
gtk_widget_set_events (widget, g_value_get_flags (value));
break;
- case PROP_EXTENSION_EVENTS:
- gtk_widget_set_extension_events (widget, g_value_get_enum (value));
- break;
case PROP_NO_SHOW_ALL:
gtk_widget_set_no_show_all (widget, g_value_get_boolean (value));
break;
@@ -3348,7 +3332,6 @@ gtk_widget_get_property (GObject *object,
switch (prop_id)
{
gpointer *eventp;
- gpointer *modep;
case PROP_NAME:
if (priv->name)
@@ -3410,10 +3393,6 @@ gtk_widget_get_property (GObject *object,
eventp = g_object_get_qdata (G_OBJECT (widget), quark_event_mask);
g_value_set_flags (value, GPOINTER_TO_INT (eventp));
break;
- case PROP_EXTENSION_EVENTS:
- modep = g_object_get_qdata (G_OBJECT (widget), quark_extension_event_mode);
- g_value_set_enum (value, GPOINTER_TO_INT (modep));
- break;
case PROP_NO_SHOW_ALL:
g_value_set_boolean (value, gtk_widget_get_no_show_all (widget));
break;
@@ -4182,52 +4161,6 @@ gtk_widget_unmap (GtkWidget *widget)
}
static void
-gtk_widget_set_extension_events_internal (GtkWidget *widget,
- GdkExtensionMode mode,
- GList *window_list)
-{
- GtkWidgetPrivate *priv = widget->priv;
- GList *free_list = NULL;
- GList *l;
-
- if (window_list == NULL)
- {
- if (gtk_widget_get_has_window (widget))
- window_list = g_list_prepend (NULL, priv->window);
- else
- window_list = gdk_window_get_children (priv->window);
-
- free_list = window_list;
- }
-
- for (l = window_list; l != NULL; l = l->next)
- {
- GdkWindow *window = l->data;
- gpointer user_data;
-
- gdk_window_get_user_data (window, &user_data);
- if (user_data == widget)
- {
- GList *children;
-
- gdk_input_set_extension_events (window,
- gdk_window_get_events (window),
- mode);
-
- children = gdk_window_get_children (window);
- if (children)
- {
- gtk_widget_set_extension_events_internal (widget, mode, children);
- g_list_free (children);
- }
- }
- }
-
- if (free_list)
- g_list_free (free_list);
-}
-
-static void
_gtk_widget_enable_device_events (GtkWidget *widget)
{
GHashTable *device_events;
@@ -4279,7 +4212,6 @@ void
gtk_widget_realize (GtkWidget *widget)
{
GtkWidgetPrivate *priv;
- GdkExtensionMode mode;
cairo_region_t *region;
g_return_if_fail (GTK_IS_WIDGET (widget));
@@ -4322,10 +4254,6 @@ gtk_widget_realize (GtkWidget *widget)
if (region)
gdk_window_input_shape_combine_region (priv->window, region, 0, 0);
- mode = gtk_widget_get_extension_events (widget);
- if (mode != GDK_EXTENSION_EVENTS_NONE)
- gtk_widget_set_extension_events_internal (widget, mode, NULL);
-
if (priv->multidevice)
gdk_window_set_support_multidevice (priv->window, TRUE);
@@ -9760,28 +9688,6 @@ gtk_widget_add_device_events (GtkWidget *widget,
}
/**
- * gtk_widget_set_extension_events:
- * @widget: a #GtkWidget
- * @mode: bitfield of extension events to receive
- *
- * Sets the extension events mask to @mode. See #GdkExtensionMode
- * and gdk_input_set_extension_events().
- **/
-void
-gtk_widget_set_extension_events (GtkWidget *widget,
- GdkExtensionMode mode)
-{
- g_return_if_fail (GTK_IS_WIDGET (widget));
-
- if (gtk_widget_get_realized (widget))
- gtk_widget_set_extension_events_internal (widget, mode, NULL);
-
- g_object_set_qdata (G_OBJECT (widget), quark_extension_event_mode,
- GINT_TO_POINTER (mode));
- g_object_notify (G_OBJECT (widget), "extension-events");
-}
-
-/**
* gtk_widget_get_toplevel:
* @widget: a #GtkWidget
*
@@ -9994,23 +9900,6 @@ gtk_widget_get_device_events (GtkWidget *widget,
}
/**
- * gtk_widget_get_extension_events:
- * @widget: a #GtkWidget
- *
- * Retrieves the extension events the widget will receive; see
- * gdk_input_set_extension_events().
- *
- * Return value: extension events for @widget
- **/
-GdkExtensionMode
-gtk_widget_get_extension_events (GtkWidget *widget)
-{
- g_return_val_if_fail (GTK_IS_WIDGET (widget), 0);
-
- return GPOINTER_TO_INT (g_object_get_qdata (G_OBJECT (widget), quark_extension_event_mode));
-}
-
-/**
* gtk_widget_get_pointer:
* @widget: a #GtkWidget
* @x: (out) (allow-none): return location for the X coordinate, or %NULL
@@ -13637,7 +13526,7 @@ gtk_widget_get_window (GtkWidget *widget)
* Returns %TRUE if @widget is multiple pointer aware. See
* gtk_widget_set_support_multidevice() for more information.
*
- * Returns: %TRUE is @widget is multidevice aware.
+ * Returns: %TRUE if @widget is multidevice aware.
**/
gboolean
gtk_widget_get_support_multidevice (GtkWidget *widget)
@@ -13668,17 +13557,7 @@ gtk_widget_set_support_multidevice (GtkWidget *widget,
g_return_if_fail (GTK_IS_WIDGET (widget));
priv = widget->priv;
-
- if (support_multidevice)
- {
- priv->multidevice = TRUE;
- gtk_widget_set_extension_events (widget, GDK_EXTENSION_EVENTS_ALL);
- }
- else
- {
- priv->multidevice = FALSE;
- gtk_widget_set_extension_events (widget, GDK_EXTENSION_EVENTS_NONE);
- }
+ priv->multidevice = (support_multidevice == TRUE);
if (gtk_widget_get_realized (widget))
gdk_window_set_support_multidevice (priv->window, support_multidevice);
diff --git a/gtk/gtkwidget.h b/gtk/gtkwidget.h
index 30fafe6..54acc3d 100644
--- a/gtk/gtkwidget.h
+++ b/gtk/gtkwidget.h
@@ -671,10 +671,6 @@ void gtk_widget_set_device_events (GtkWidget *widget,
void gtk_widget_add_device_events (GtkWidget *widget,
GdkDevice *device,
GdkEventMask events);
-void gtk_widget_set_extension_events (GtkWidget *widget,
- GdkExtensionMode mode);
-
-GdkExtensionMode gtk_widget_get_extension_events (GtkWidget *widget);
GtkWidget* gtk_widget_get_toplevel (GtkWidget *widget);
GtkWidget* gtk_widget_get_ancestor (GtkWidget *widget,
GType widget_type);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
