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

Replace references to sealed GdkDevice private variables with accessor calls in quartz.

Browse Source
This commit is contained in:
John Ralls 2010-11-23 16:52:24 -08:00
parent 38b8ab3002
commit c0aae6644a
2 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gdk/quartz/gdkevents-quartz.c
View File

@ -571,7 +571,7 @@ find_toplevel_for_keyboard_event (NSEvent *nsevent)
GdkDeviceGrabInfo *grab; GdkDeviceGrabInfo *grab;
GdkDevice *device = l->data; GdkDevice *device = l->data;
if (device->source != GDK_SOURCE_KEYBOARD) if (gdk_device_get_source(device) != GDK_SOURCE_KEYBOARD)
continue; continue;
grab = _gdk_display_get_last_device_grab (display, device); grab = _gdk_display_get_last_device_grab (display, device);

10
gdk/quartz/gdkinput.c
View File

@ -228,7 +228,7 @@ _gdk_input_init (void)
{ {
GdkDevice *device = l->data; GdkDevice *device = l->data;
if (device->source == GDK_SOURCE_KEYBOARD) if (gdk_device_get_source(device) == GDK_SOURCE_KEYBOARD)
continue; continue;
_gdk_input_devices = g_list_prepend (_gdk_input_devices, l->data); _gdk_input_devices = g_list_prepend (_gdk_input_devices, l->data);
@ -245,7 +245,7 @@ _gdk_input_init (void)
{ {
GdkDevice *device = list->data; GdkDevice *device = list->data;
if (device->source != GDK_SOURCE_MOUSE) if (gdk_device_get_source(device) != GDK_SOURCE_MOUSE)
continue; continue;
_gdk_display->core_pointer = device; _gdk_display->core_pointer = device;
@ -273,11 +273,7 @@ _gdk_input_exit (void)
if (gdkdev != (GdkDevicePrivate *)_gdk_core_pointer) if (gdkdev != (GdkDevicePrivate *)_gdk_core_pointer)
{ {
gdk_device_set_mode ((GdkDevice *)gdkdev, GDK_MODE_DISABLED); gdk_device_set_mode ((GdkDevice *)gdkdev, GDK_MODE_DISABLED);
g_object_unref(gdkdev);
g_free (gdkdev->info.name);
g_free (gdkdev->info.axes);
g_free (gdkdev->info.keys);
g_free (gdkdev);
} }
} }