diff options
Diffstat (limited to 'gdk/win32/gdkdevice-win32.c')
-rw-r--r-- | gdk/win32/gdkdevice-win32.c | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/gdk/win32/gdkdevice-win32.c b/gdk/win32/gdkdevice-win32.c index 110d73d4ce..580506a971 100644 --- a/gdk/win32/gdkdevice-win32.c +++ b/gdk/win32/gdkdevice-win32.c @@ -30,7 +30,7 @@ G_DEFINE_TYPE (GdkDeviceWin32, gdk_device_win32, GDK_TYPE_DEVICE) static gboolean gdk_device_win32_get_history (GdkDevice *device, - GdkWindow *window, + GdkSurface *window, guint32 start, guint32 stop, GdkTimeCoord ***events, @@ -41,13 +41,13 @@ gdk_device_win32_get_history (GdkDevice *device, static void gdk_device_win32_get_state (GdkDevice *device, - GdkWindow *window, + GdkSurface *window, gdouble *axes, GdkModifierType *mask) { gint x_int, y_int; - gdk_window_get_device_position (window, device, &x_int, &y_int, mask); + gdk_surface_get_device_position (window, device, &x_int, &y_int, mask); if (axes) { @@ -58,7 +58,7 @@ gdk_device_win32_get_state (GdkDevice *device, static void gdk_device_win32_set_window_cursor (GdkDevice *device, - GdkWindow *window, + GdkSurface *window, GdkCursor *cursor) { } @@ -98,8 +98,8 @@ get_current_mask (void) static void gdk_device_win32_query_state (GdkDevice *device, - GdkWindow *window, - GdkWindow **child_window, + GdkSurface *window, + GdkSurface **child_window, gdouble *root_x, gdouble *root_y, gdouble *win_x, @@ -112,8 +112,8 @@ gdk_device_win32_query_state (GdkDevice *device, if (window) { - scale = GDK_WINDOW_IMPL_WIN32 (window->impl)->window_scale; - hwnd = GDK_WINDOW_HWND (window); + scale = GDK_SURFACE_IMPL_WIN32 (window->impl)->window_scale; + hwnd = GDK_SURFACE_HWND (window); } else { @@ -171,10 +171,10 @@ gdk_device_win32_query_state (GdkDevice *device, static GdkGrabStatus gdk_device_win32_grab (GdkDevice *device, - GdkWindow *window, + GdkSurface *window, gboolean owner_events, GdkEventMask event_mask, - GdkWindow *confine_to, + GdkSurface *confine_to, GdkCursor *cursor, guint32 time_) { @@ -195,15 +195,15 @@ screen_to_client (HWND hwnd, POINT screen_pt, POINT *client_pt) ScreenToClient (hwnd, client_pt); } -GdkWindow * -_gdk_device_win32_window_at_position (GdkDevice *device, +GdkSurface * +_gdk_device_win32_surface_at_position (GdkDevice *device, gdouble *win_x, gdouble *win_y, GdkModifierType *mask, gboolean get_toplevel) { - GdkWindow *window = NULL; - GdkWindowImplWin32 *impl = NULL; + GdkSurface *window = NULL; + GdkSurfaceImplWin32 *impl = NULL; POINT screen_pt, client_pt; HWND hwnd, hwndc; RECT rect; @@ -223,7 +223,7 @@ _gdk_device_win32_window_at_position (GdkDevice *device, window = gdk_win32_handle_table_lookup (hwnd); if (window != NULL && - GDK_WINDOW_TYPE (window) != GDK_WINDOW_FOREIGN) + GDK_SURFACE_TYPE (window) != GDK_SURFACE_FOREIGN) break; screen_to_client (hwnd, screen_pt, &client_pt); @@ -268,7 +268,7 @@ _gdk_device_win32_window_at_position (GdkDevice *device, if (window && (win_x || win_y)) { - impl = GDK_WINDOW_IMPL_WIN32 (window->impl); + impl = GDK_SURFACE_IMPL_WIN32 (window->impl); if (win_x) *win_x = client_pt.x / impl->window_scale; @@ -281,7 +281,7 @@ _gdk_device_win32_window_at_position (GdkDevice *device, static void gdk_device_win32_select_window_events (GdkDevice *device, - GdkWindow *window, + GdkSurface *window, GdkEventMask event_mask) { } @@ -298,7 +298,7 @@ gdk_device_win32_class_init (GdkDeviceWin32Class *klass) device_class->query_state = gdk_device_win32_query_state; device_class->grab = gdk_device_win32_grab; device_class->ungrab = gdk_device_win32_ungrab; - device_class->window_at_position = _gdk_device_win32_window_at_position; + device_class->window_at_position = _gdk_device_win32_surface_at_position; device_class->select_window_events = gdk_device_win32_select_window_events; } |