diff options
| author | Benjamin Otte <otte@redhat.com> | 2011-01-03 16:56:20 +0100 |
|---|---|---|
| committer | Benjamin Otte <otte@redhat.com> | 2011-01-03 17:44:24 +0100 |
| commit | 8d2104fdc94fea4d4d32358058e6b8aecb4d86e7 (patch) | |
| tree | acafe273e6feda9e73a7ec06ef0806329a91d34c /gdk/gdkdisplay.c | |
| parent | c07f9c040fc429bd3460585558c17d7ce04fbb59 (diff) | |
| download | gtk+-8d2104fdc94fea4d4d32358058e6b8aecb4d86e7.tar.gz | |
gdk: Move window_get_device_position function out of the device hooks
Diffstat (limited to 'gdk/gdkdisplay.c')
| -rw-r--r-- | gdk/gdkdisplay.c | 39 |
1 files changed, 0 insertions, 39 deletions
diff --git a/gdk/gdkdisplay.c b/gdk/gdkdisplay.c index 71bc00e76a..16fc483148 100644 --- a/gdk/gdkdisplay.c +++ b/gdk/gdkdisplay.c @@ -72,12 +72,6 @@ static void gdk_display_dispose (GObject *object); static void gdk_display_finalize (GObject *object); -static GdkWindow *gdk_window_real_window_get_device_position (GdkDisplay *display, - GdkDevice *device, - GdkWindow *window, - gint *x, - gint *y, - GdkModifierType *mask); static GdkWindow *gdk_display_real_get_window_at_device_position (GdkDisplay *display, GdkDevice *device, gint *win_x, @@ -94,7 +88,6 @@ static guint signals[LAST_SIGNAL] = { 0 }; static const GdkDisplayDeviceHooks default_device_hooks = { gdk_display_real_get_device_state, - gdk_window_real_window_get_device_position, gdk_display_real_get_window_at_device_position }; @@ -694,38 +687,6 @@ gdk_display_real_get_window_at_device_position (GdkDisplay *display, return window; } -static GdkWindow * -gdk_window_real_window_get_device_position (GdkDisplay *display, - GdkDevice *device, - GdkWindow *window, - gint *x, - gint *y, - GdkModifierType *mask) -{ - gint tmpx, tmpy; - GdkModifierType tmp_mask; - gboolean normal_child; - - normal_child = GDK_WINDOW_IMPL_GET_CLASS (window->impl)->get_device_state (window, - device, - &tmpx, &tmpy, - &tmp_mask); - /* We got the coords on the impl, convert to the window */ - tmpx -= window->abs_x; - tmpy -= window->abs_y; - - if (x) - *x = tmpx; - if (y) - *y = tmpy; - if (mask) - *mask = tmp_mask; - - if (normal_child) - return _gdk_window_find_child_at (window, tmpx, tmpy); - return NULL; -} - /** * gdk_display_get_window_at_pointer: * @display: a #GdkDisplay |