callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

win32: init wintab when the device manager is constructed

Browse Source 
No need to call a method explicitely after creating the object
This commit is contained in:
Paolo Borelli
2016-02-29 18:03:38 +01:00
parent e9d2a622e2
commit 33ac51ea72
3 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
gdk/win32/gdkdevicemanager-win32.c
View File

@ -347,11 +347,10 @@ print_cursor (int index)
} }
#endif #endif
void static void
_gdk_input_wintab_init_check (GdkDeviceManager *_device_manager) wintab_init_check (GdkDeviceManagerWin32 *device_manager)
{ {
GdkDeviceManagerWin32 *device_manager = (GdkDeviceManagerWin32 *)_device_manager; GdkDisplay *display = gdk_device_manager_get_display (GDK_DEVICE_MANAGER (device_manager));
GdkDisplay *display = gdk_device_manager_get_display (_device_manager);
GdkWindow *root = gdk_screen_get_root_window (gdk_display_get_default_screen (display)); GdkWindow *root = gdk_screen_get_root_window (gdk_display_get_default_screen (display));
static gboolean wintab_initialized = FALSE; static gboolean wintab_initialized = FALSE;
GdkDeviceWintab *device; 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_pointer);
gdk_seat_default_add_slave (GDK_SEAT_DEFAULT (seat), device_manager->system_keyboard); gdk_seat_default_add_slave (GDK_SEAT_DEFAULT (seat), device_manager->system_keyboard);
g_object_unref (seat); g_object_unref (seat);
wintab_init_check (device_manager);
} }
static GList * static GList *

2
gdk/win32/gdkdisplay-win32.c
View File

@ -54,8 +54,6 @@ _gdk_input_init (GdkDisplay *display)
devices = g_list_prepend (devices, device_manager->core_pointer); devices = g_list_prepend (devices, device_manager->core_pointer);
GDK_WIN32_DISPLAY (display)->input_devices = devices; GDK_WIN32_DISPLAY (display)->input_devices = devices;
_gdk_input_wintab_init_check (GDK_DEVICE_MANAGER (device_manager));
} }
/** /**

1
gdk/win32/gdkprivate-win32.h
View File

@ -527,6 +527,5 @@ guint32 _gdk_win32_keymap_get_decimal_mark (void);
void _gdk_win32_windowing_init (void); void _gdk_win32_windowing_init (void);
void _gdk_dnd_init (void); void _gdk_dnd_init (void);
void _gdk_events_init (void); void _gdk_events_init (void);
void _gdk_input_wintab_init_check (GdkDeviceManager *device_manager);
#endif /* __GDK_PRIVATE_WIN32_H__ */ #endif /* __GDK_PRIVATE_WIN32_H__ */