From 33ac51ea721714a7235765cd40c9a0295cced8df Mon Sep 17 00:00:00 2001 From: Paolo Borelli Date: Mon, 29 Feb 2016 18:03:38 +0100 Subject: [PATCH] win32: init wintab when the device manager is constructed No need to call a method explicitely after creating the object --- gdk/win32/gdkdevicemanager-win32.c | 9 +++++---- gdk/win32/gdkdisplay-win32.c | 2 -- gdk/win32/gdkprivate-win32.h | 1 - 3 files changed, 5 insertions(+), 7 deletions(-) diff --git a/gdk/win32/gdkdevicemanager-win32.c b/gdk/win32/gdkdevicemanager-win32.c index d2d3b07eea..e64c02d5df 100644 --- a/gdk/win32/gdkdevicemanager-win32.c +++ b/gdk/win32/gdkdevicemanager-win32.c @@ -347,11 +347,10 @@ print_cursor (int index) } #endif -void -_gdk_input_wintab_init_check (GdkDeviceManager *_device_manager) +static void +wintab_init_check (GdkDeviceManagerWin32 *device_manager) { - GdkDeviceManagerWin32 *device_manager = (GdkDeviceManagerWin32 *)_device_manager; - GdkDisplay *display = gdk_device_manager_get_display (_device_manager); + GdkDisplay *display = gdk_device_manager_get_display (GDK_DEVICE_MANAGER (device_manager)); GdkWindow *root = gdk_screen_get_root_window (gdk_display_get_default_screen (display)); static gboolean wintab_initialized = FALSE; GdkDeviceWintab *device; @@ -727,6 +726,8 @@ gdk_device_manager_win32_constructed (GObject *object) gdk_seat_default_add_slave (GDK_SEAT_DEFAULT (seat), device_manager->system_pointer); gdk_seat_default_add_slave (GDK_SEAT_DEFAULT (seat), device_manager->system_keyboard); g_object_unref (seat); + + wintab_init_check (device_manager); } static GList * diff --git a/gdk/win32/gdkdisplay-win32.c b/gdk/win32/gdkdisplay-win32.c index f3f653af4b..322b009d50 100644 --- a/gdk/win32/gdkdisplay-win32.c +++ b/gdk/win32/gdkdisplay-win32.c @@ -54,8 +54,6 @@ _gdk_input_init (GdkDisplay *display) devices = g_list_prepend (devices, device_manager->core_pointer); GDK_WIN32_DISPLAY (display)->input_devices = devices; - - _gdk_input_wintab_init_check (GDK_DEVICE_MANAGER (device_manager)); } /** diff --git a/gdk/win32/gdkprivate-win32.h b/gdk/win32/gdkprivate-win32.h index c678236264..f590ff7324 100644 --- a/gdk/win32/gdkprivate-win32.h +++ b/gdk/win32/gdkprivate-win32.h @@ -527,6 +527,5 @@ guint32 _gdk_win32_keymap_get_decimal_mark (void); void _gdk_win32_windowing_init (void); void _gdk_dnd_init (void); void _gdk_events_init (void); -void _gdk_input_wintab_init_check (GdkDeviceManager *device_manager); #endif /* __GDK_PRIVATE_WIN32_H__ */