diff options
| author | Matthias Clasen <matthiasc@src.gnome.org> | 2008-12-13 08:05:11 +0000 |
|---|---|---|
| committer | Matthias Clasen <matthiasc@src.gnome.org> | 2008-12-13 08:05:11 +0000 |
| commit | 856b37bb89f40cabefb729aebe95acee80fc18fb (patch) | |
| tree | 10381518dfb3602840b6d734a39bb86a5010bfae | |
| parent | 797f030cf619ecea77f3a6738932222a181fc6bf (diff) | |
| download | gtk+-856b37bb89f40cabefb729aebe95acee80fc18fb.tar.gz | |
Remove a C99ism. Pointed out by Eric Lamarque
* gdk/x11/gdktestutils-x11.c (gdk_test_simulate_button):
Remove a C99ism. Pointed out by Eric Lamarque
svn path=/trunk/; revision=21886
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | gdk/x11/gdktestutils-x11.c | 5 |
2 files changed, 11 insertions, 1 deletions
@@ -1,5 +1,12 @@ 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> + Bug 549251 – GTK icon view accessible issue. * gtk/gtkiconview.c (gtk_icon_view_accessible_model_row_changed): diff --git a/gdk/x11/gdktestutils-x11.c b/gdk/x11/gdktestutils-x11.c index c35b8a5ac4..2c9223cf3c 100644 --- a/gdk/x11/gdktestutils-x11.c +++ b/gdk/x11/gdktestutils-x11.c @@ -189,8 +189,11 @@ gdk_test_simulate_button (GdkWindow *window, 0, /* serial */ 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 (window != NULL, FALSE); + if (!GDK_WINDOW_IS_MAPPED (window)) return FALSE; screen = gdk_colormap_get_screen (gdk_drawable_get_colormap (window)); @@ -218,7 +221,7 @@ gdk_test_simulate_button (GdkWindow *window, &xev.subwindow); if (!xev.subwindow) 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 != XSendEvent (xev.display, xev.window, True, button_pressrelease == GDK_BUTTON_PRESS ? ButtonPressMask : ButtonReleaseMask, (XEvent*) &xev); XSync (xev.display, False); |