[gtk+/xi2] Grab, ungrab class methods on GdkDevice should be left unused in quartz
- From: Kristian Rietveld <kristian src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+/xi2] Grab, ungrab class methods on GdkDevice should be left unused in quartz
- Date: Mon, 10 May 2010 20:35:06 +0000 (UTC)
commit 52de2ec5f0d5242269cd33f86d4393ff7fd3d02c
Author: Kristian Rietveld <kris gtk org>
Date: Mon May 10 22:23:45 2010 +0200
Grab, ungrab class methods on GdkDevice should be left unused in quartz
gdk/quartz/gdkdevice-core.c | 53 +---------------------------------------
gdk/quartz/gdkevents-quartz.c | 3 --
2 files changed, 2 insertions(+), 54 deletions(-)
---
diff --git a/gdk/quartz/gdkdevice-core.c b/gdk/quartz/gdkdevice-core.c
index 1b10327..81cd6a3 100644
--- a/gdk/quartz/gdkdevice-core.c
+++ b/gdk/quartz/gdkdevice-core.c
@@ -297,37 +297,7 @@ gdk_device_core_grab (GdkDevice *device,
GdkCursor *cursor,
guint32 time_)
{
- GdkDisplay *display;
-
- display = gdk_device_get_display (device);
-
- if (device->source == GDK_SOURCE_KEYBOARD)
- {
- _gdk_display_add_device_grab (display,
- device,
- window,
- NULL,
- GDK_OWNERSHIP_NONE,
- owner_events,
- 0,
- 0,
- time_,
- FALSE);
- }
- else
- {
- _gdk_display_add_device_grab (display,
- device,
- window,
- NULL,
- GDK_OWNERSHIP_NONE,
- owner_events,
- event_mask,
- 0,
- time_,
- FALSE);
- }
-
+ /* Should remain empty */
return GDK_GRAB_SUCCESS;
}
@@ -335,26 +305,7 @@ static void
gdk_device_core_ungrab (GdkDevice *device,
guint32 time_)
{
- GdkDisplay *display;
-
- display = gdk_device_get_display (device);
-
- if (device->source == GDK_SOURCE_KEYBOARD)
- {
- _gdk_display_end_device_grab (display,
- device, 0,
- NULL, FALSE);
- }
- else
- {
- GdkDeviceGrabInfo *grab;
-
- grab = _gdk_display_get_last_device_grab (display, device);
- if (grab)
- grab->serial_end = 0;
-
- _gdk_display_device_grab_update (display, device, 0);
- }
+ /* Should remain empty */
}
static GdkWindow *
diff --git a/gdk/quartz/gdkevents-quartz.c b/gdk/quartz/gdkevents-quartz.c
index 9bd4e0e..5a7180d 100644
--- a/gdk/quartz/gdkevents-quartz.c
+++ b/gdk/quartz/gdkevents-quartz.c
@@ -105,9 +105,6 @@ _gdk_windowing_device_grab (GdkDevice *device,
if (!window || GDK_WINDOW_DESTROYED (window))
return GDK_GRAB_NOT_VIEWABLE;
- /* FIXME: Eventually, just call the grab class method on the device.
- * But that call is lacking a native parameter.
- */
_gdk_display_add_device_grab (_gdk_display,
device,
window,
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]