diff options
| author | Tristan Van Berkom <tristan.van.berkom@gmail.com> | 2010-12-05 00:36:37 +0900 |
|---|---|---|
| committer | Tristan Van Berkom <tristan.van.berkom@gmail.com> | 2010-12-05 00:36:37 +0900 |
| commit | 0d786985a368d88e8ab4e45fc3607efc5e773732 (patch) | |
| tree | 5dfc8ec0e27ac3c23b9dc2eb097018971c28fd6b /gdk/x11/gdktestutils-x11.c | |
| parent | 1d3961b34258a7a8c97ca12993220554369fccb1 (diff) | |
| parent | cd76b057e9693b6919f4ccbe40ce205efc8d3caf (diff) | |
| download | gtk+-0d786985a368d88e8ab4e45fc3607efc5e773732.tar.gz | |
Merge branch 'master' into treeview-refactor
Conflicts:
gtk/gtkmarshalers.list
tests/Makefile.am
Diffstat (limited to 'gdk/x11/gdktestutils-x11.c')
| -rw-r--r-- | gdk/x11/gdktestutils-x11.c | 26 |
1 files changed, 11 insertions, 15 deletions
diff --git a/gdk/x11/gdktestutils-x11.c b/gdk/x11/gdktestutils-x11.c index d4d47fbad7..960301b1e3 100644 --- a/gdk/x11/gdktestutils-x11.c +++ b/gdk/x11/gdktestutils-x11.c @@ -41,7 +41,7 @@ void gdk_test_render_sync (GdkWindow *window) { - Display *display = gdk_x11_drawable_get_xdisplay (window); + Display *display = GDK_WINDOW_XDISPLAY (window); XImage *ximage; /* syncronize to X drawing queue, see: @@ -94,7 +94,6 @@ gdk_test_simulate_key (GdkWindow *window, { GdkScreen *screen; GdkKeymapKey *keys = NULL; - GdkWindowObject *priv; gboolean success; gint n_keys = 0; XKeyEvent xev = { @@ -108,20 +107,19 @@ gdk_test_simulate_key (GdkWindow *window, return FALSE; screen = gdk_window_get_screen (window); - priv = (GdkWindowObject *)window; if (x < 0 && y < 0) { - x = priv->width / 2; - y = priv->height / 2; + x = window->width / 2; + y = window->height / 2; } /* Convert to impl coordinates */ - x = x + priv->abs_x; - y = y + priv->abs_y; + x = x + window->abs_x; + y = y + window->abs_y; xev.type = key_pressrelease == GDK_KEY_PRESS ? KeyPress : KeyRelease; - xev.display = GDK_DRAWABLE_XDISPLAY (window); + xev.display = GDK_WINDOW_XDISPLAY (window); xev.window = GDK_WINDOW_XID (window); xev.root = RootWindow (xev.display, GDK_SCREEN_XNUMBER (screen)); xev.subwindow = 0; @@ -206,7 +204,6 @@ gdk_test_simulate_button (GdkWindow *window, 1, /* send_event */ }; gboolean success; - GdkWindowObject *priv; g_return_val_if_fail (button_pressrelease == GDK_BUTTON_PRESS || button_pressrelease == GDK_BUTTON_RELEASE, FALSE); g_return_val_if_fail (window != NULL, FALSE); @@ -215,20 +212,19 @@ gdk_test_simulate_button (GdkWindow *window, return FALSE; screen = gdk_window_get_screen (window); - priv = (GdkWindowObject *)window; if (x < 0 && y < 0) { - x = priv->width / 2; - y = priv->height / 2; + x = window->width / 2; + y = window->height / 2; } /* Convert to impl coordinates */ - x = x + priv->abs_x; - y = y + priv->abs_y; + x = x + window->abs_x; + y = y + window->abs_y; xev.type = button_pressrelease == GDK_BUTTON_PRESS ? ButtonPress : ButtonRelease; - xev.display = GDK_DRAWABLE_XDISPLAY (window); + xev.display = GDK_WINDOW_XDISPLAY (window); xev.window = GDK_WINDOW_XID (window); xev.root = RootWindow (xev.display, GDK_SCREEN_XNUMBER (screen)); xev.subwindow = 0; |