diff options
author | Matthias Clasen <mclasen@redhat.com> | 2019-03-25 20:05:07 -0400 |
---|---|---|
committer | Matthias Clasen <mclasen@redhat.com> | 2019-03-25 20:06:08 -0400 |
commit | 4dfe2a8aa864444027548e2019448d26b50839e5 (patch) | |
tree | 5275865039473895883b0c4f001a8a889f597dfb | |
parent | ab7507150bd026a44b6eefe9d51125496bacd532 (diff) | |
download | gtk+-4dfe2a8aa864444027548e2019448d26b50839e5.tar.gz |
Fix the windows build
There was another warp implementation that needed to be removed.
This commit also addresses a number of compiler warnings
in passing.
-rw-r--r-- | gdk/win32/gdkdevice-win32.c | 8 | ||||
-rw-r--r-- | gdk/win32/gdkdevicemanager-win32.c | 3 | ||||
-rw-r--r-- | gdk/win32/gdkdrag-win32.c | 2 | ||||
-rw-r--r-- | gdk/win32/gdkdrop-win32.c | 7 | ||||
-rw-r--r-- | gdk/win32/gdkevents-win32.c | 1 |
5 files changed, 0 insertions, 21 deletions
diff --git a/gdk/win32/gdkdevice-win32.c b/gdk/win32/gdkdevice-win32.c index 49549e19ba..3fa381cae0 100644 --- a/gdk/win32/gdkdevice-win32.c +++ b/gdk/win32/gdkdevice-win32.c @@ -63,13 +63,6 @@ gdk_device_win32_set_surface_cursor (GdkDevice *device, { } -static void -gdk_device_win32_warp (GdkDevice *device, - gdouble x, - gdouble y) -{ -} - static GdkModifierType get_current_mask (void) { @@ -286,7 +279,6 @@ gdk_device_win32_class_init (GdkDeviceWin32Class *klass) device_class->get_history = gdk_device_win32_get_history; device_class->get_state = gdk_device_win32_get_state; device_class->set_surface_cursor = gdk_device_win32_set_surface_cursor; - device_class->warp = gdk_device_win32_warp; device_class->query_state = gdk_device_win32_query_state; device_class->grab = gdk_device_win32_grab; device_class->ungrab = gdk_device_win32_ungrab; diff --git a/gdk/win32/gdkdevicemanager-win32.c b/gdk/win32/gdkdevicemanager-win32.c index d5ebbbaacd..d40cc96b61 100644 --- a/gdk/win32/gdkdevicemanager-win32.c +++ b/gdk/win32/gdkdevicemanager-win32.c @@ -883,10 +883,7 @@ gdk_input_other_event (GdkDisplay *display, GdkDeviceManagerWin32 *device_manager; GdkDeviceWintab *source_device = NULL; GdkDeviceGrabInfo *last_grab; - GdkEventMask masktest; guint key_state; - POINT pt; - GdkSurfaceImplWin32 *impl; PACKET packet; gint root_x, root_y; diff --git a/gdk/win32/gdkdrag-win32.c b/gdk/win32/gdkdrag-win32.c index d0593a0863..6b9d115419 100644 --- a/gdk/win32/gdkdrag-win32.c +++ b/gdk/win32/gdkdrag-win32.c @@ -1840,7 +1840,6 @@ gdk_win32_drag_find_window (GdkDrag *drag, { GdkWin32Drag *drag_win32 = GDK_WIN32_DRAG (drag); find_window_enum_arg a; - HWND result; g_assert (_win32_main_thread == NULL || _win32_main_thread == g_thread_self ()); @@ -2439,7 +2438,6 @@ gdk_dnd_handle_key_event (GdkDrag *drag, { drag_win32->util_data.last_x += dx; drag_win32->util_data.last_y += dy; - gdk_device_warp (pointer, drag_win32->util_data.last_x, drag_win32->util_data.last_y); } if (drag_win32->drag_surface) diff --git a/gdk/win32/gdkdrop-win32.c b/gdk/win32/gdkdrop-win32.c index 1525590716..e457ce12a4 100644 --- a/gdk/win32/gdkdrop-win32.c +++ b/gdk/win32/gdkdrop-win32.c @@ -1090,7 +1090,6 @@ static void gdk_win32_drop_finish (GdkDrop *drop, GdkDragAction action) { - GdkDrag *drag; GdkWin32Drop *drop_win32 = GDK_WIN32_DROP (drop); g_return_if_fail (drop != NULL); @@ -1103,12 +1102,6 @@ gdk_win32_drop_finish (GdkDrop *drop, if (drop_win32->protocol == GDK_DRAG_PROTO_OLE2) return; -/* FIXME: remove? - drag = gdk_drop_get_drag (drop); - - if (drag != NULL) - _gdk_win32_local_drag_drop_response (drag, action); -*/ } #if 0 diff --git a/gdk/win32/gdkevents-win32.c b/gdk/win32/gdkevents-win32.c index 2ad57e0568..4e4b3aaef8 100644 --- a/gdk/win32/gdkevents-win32.c +++ b/gdk/win32/gdkevents-win32.c @@ -1331,7 +1331,6 @@ _gdk_win32_do_emit_configure_event (GdkSurface *window, RECT rect) { GdkSurfaceImplWin32 *impl = GDK_SURFACE_IMPL_WIN32 (window->impl); - GdkEvent *event; impl->unscaled_width = rect.right - rect.left; impl->unscaled_height = rect.bottom - rect.top; |