AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

win32: Fix up initialization order of input subsystem

Browse Source 
We were getting warnings due to windows being created before input
subsystems were fully initialized.
This commit is contained in:
Alexander Larsson 2011-11-07 16:48:29 +01:00
parent 5406955f7c
commit ade6d093e2
3 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -360,9 +360,10 @@ print_cursor (int index)
}
#endif
static void
_gdk_input_wintab_init_check (GdkDeviceManagerWin32 *device_manager)
void
_gdk_input_wintab_init_check (GdkDeviceManager *_device_manager)
{
GdkDeviceManagerWin32 *device_manager = (GdkDeviceManagerWin32 *)_device_manager;
static gboolean wintab_initialized = FALSE;
GdkDeviceWintab *device;
GdkWindowAttr wa;
@ -690,8 +691,6 @@ gdk_device_manager_win32_constructed (GObject *object)
_gdk_device_set_associated_device (device_manager->core_pointer, device_manager->core_keyboard);
_gdk_device_set_associated_device (device_manager->core_keyboard, device_manager->core_pointer);
_gdk_input_wintab_init_check (device_manager);
}
static GList *

3
gdk/win32/gdkinput.c
View File

@ -121,4 +121,7 @@ _gdk_input_init (GdkDisplay *display)
_gdk_input_devices = g_list_append (NULL, display->core_pointer);
_gdk_input_devices = g_list_concat (_gdk_input_devices,
g_list_copy (device_manager->wintab_devices));
_gdk_input_wintab_init_check (device_manager);
}

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

@ -504,5 +504,6 @@ void _gdk_visual_init (void);
void _gdk_dnd_init (void);
void _gdk_events_init (void);
void _gdk_input_init (GdkDisplay *display);
void _gdk_input_wintab_init_check (GdkDeviceManager *device_manager);
#endif /* __GDK_PRIVATE_WIN32_H__ */