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

Remove a C99ism. Pointed out by Eric Lamarque

Browse Source 
* gdk/x11/gdktestutils-x11.c (gdk_test_simulate_button):
        Remove a C99ism. Pointed out by Eric Lamarque



svn path=/trunk/; revision=21886
This commit is contained in:
Matthias Clasen
2008-12-13 08:05:11 +00:00
parent 797f030cf6
commit 856b37bb89
2 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -1,3 +1,10 @@
2008-12-13 Matthias Clasen <mclasen@redhat.com>
Bug 558306 – Cannot build gdk (gtk+ 2.14.4) on Solaris 8
* gdk/x11/gdktestutils-x11.c (gdk_test_simulate_button):
Remove a C99ism. Pointed out by Eric Lamarque
2008-12-13 Matthias Clasen <mclasen@redhat.com> 2008-12-13 Matthias Clasen <mclasen@redhat.com>
Bug 549251 – GTK icon view accessible issue. Bug 549251 – GTK icon view accessible issue.

5
gdk/x11/gdktestutils-x11.c
View File

@ -189,8 +189,11 @@ gdk_test_simulate_button (GdkWindow *window,
0, /* serial */ 0, /* serial */
1, /* send_event */ 1, /* send_event */
}; };
gboolean success;
g_return_val_if_fail (button_pressrelease == GDK_BUTTON_PRESS || button_pressrelease == GDK_BUTTON_RELEASE, FALSE); g_return_val_if_fail (button_pressrelease == GDK_BUTTON_PRESS || button_pressrelease == GDK_BUTTON_RELEASE, FALSE);
g_return_val_if_fail (window != NULL, FALSE); g_return_val_if_fail (window != NULL, FALSE);
if (!GDK_WINDOW_IS_MAPPED (window)) if (!GDK_WINDOW_IS_MAPPED (window))
return FALSE; return FALSE;
screen = gdk_colormap_get_screen (gdk_drawable_get_colormap (window)); screen = gdk_colormap_get_screen (gdk_drawable_get_colormap (window));
@ -218,7 +221,7 @@ gdk_test_simulate_button (GdkWindow *window,
&xev.subwindow); &xev.subwindow);
if (!xev.subwindow) if (!xev.subwindow)
xev.subwindow = xev.window; xev.subwindow = xev.window;
gboolean success = xev.same_screen; success = xev.same_screen;
success &= 0 != XWarpPointer (xev.display, None, xev.window, 0, 0, 0, 0, xev.x, xev.y); success &= 0 != XWarpPointer (xev.display, None, xev.window, 0, 0, 0, 0, xev.x, xev.y);
success &= 0 != XSendEvent (xev.display, xev.window, True, button_pressrelease == GDK_BUTTON_PRESS ? ButtonPressMask : ButtonReleaseMask, (XEvent*) &xev); success &= 0 != XSendEvent (xev.display, xev.window, True, button_pressrelease == GDK_BUTTON_PRESS ? ButtonPressMask : ButtonReleaseMask, (XEvent*) &xev);
XSync (xev.display, False); XSync (xev.display, False);