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

gdk: Make query_state() vfunc a void vfunc

Browse Source 
... and make sure the backends implement it that way.

query_state() return value was ignored in all of GDK and caused crashes
when it failed.
This commit is contained in:
Benjamin Otte
2012-03-09 13:20:41 +01:00
parent 50e3f532b9
commit 114b45c7eb
8 changed files with 76 additions and 93 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
gdk/win32/gdkdevice-win32.c
View File

@ -238,7 +238,7 @@ get_current_mask (void)
return mask;
}
static gboolean
static void
gdk_device_win32_query_state (GdkDevice *device,
GdkWindow *window,
GdkWindow **root_window,
@ -303,8 +303,6 @@ gdk_device_win32_query_state (GdkDevice *device,
if (mask)
*mask = get_current_mask ();
return TRUE;
}
static GdkGrabStatus

22
gdk/win32/gdkdevice-wintab.c
View File

@ -52,15 +52,15 @@ static void gdk_device_wintab_warp (GdkDevice *device,
GdkScreen *screen,
gint x,
gint y);
static gboolean gdk_device_wintab_query_state (GdkDevice *device,
GdkWindow *window,
GdkWindow **root_window,
GdkWindow **child_window,
gint *root_x,
gint *root_y,
gint *win_x,
gint *win_y,
GdkModifierType *mask);
static void gdk_device_wintab_query_state (GdkDevice *device,
GdkWindow *window,
GdkWindow **root_window,
GdkWindow **child_window,
gint *root_x,
gint *root_y,
gint *win_x,
gint *win_y,
GdkModifierType *mask);
static GdkGrabStatus gdk_device_wintab_grab (GdkDevice *device,
GdkWindow *window,
gboolean owner_events,
@ -161,7 +161,7 @@ gdk_device_wintab_warp (GdkDevice *device,
{
}
static gboolean
static void
gdk_device_wintab_query_state (GdkDevice *device,
GdkWindow *window,
GdkWindow **root_window,
@ -172,7 +172,7 @@ gdk_device_wintab_query_state (GdkDevice *device,
gint *win_y,
GdkModifierType *mask)
{
return FALSE;
g_warning ("query_state unimplemented for wintab devices. Expect bad things.");
}
static GdkGrabStatus