gdk: Rename GdkWindowObject to GdkWindow

[~andy/gtk] / gdk / x11 / gdktestutils-x11.c

diff --git a/gdk/x11/gdktestutils-x11.c b/gdk/x11/gdktestutils-x11.c
index a66df584b6992867e64b7405ddcc4cd4169e107b..960301b1e3ab4b88577e1198540886b33bac10ab 100644 (file)
--- a/gdk/x11/gdktestutils-x11.c
+++ b/gdk/x11/gdktestutils-x11.c
@@ -17,9 +17,13 @@
  * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
  * Boston, MA 02111-1307, USA.
  */
-#include <gdk/gdktestutils.h>
-#include <gdk/gdkkeysyms.h>
-#include <x11/gdkx.h>
+
+#include "config.h"
+
+#include "gdktestutils.h"
+
+#include "gdkkeysyms.h"
+#include "gdkx.h"
 
 #include <X11/Xlib.h>
 
@@ -37,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:
@@ -90,7 +94,6 @@ gdk_test_simulate_key (GdkWindow      *window,
 {
   GdkScreen *screen;
   GdkKeymapKey *keys = NULL;
-  GdkWindowObject *priv;
   gboolean success;
   gint n_keys = 0;
   XKeyEvent xev = {
@@ -102,21 +105,21 @@ gdk_test_simulate_key (GdkWindow      *window,
   g_return_val_if_fail (window != NULL, FALSE);
   if (!GDK_WINDOW_IS_MAPPED (window))
     return FALSE;
+
   screen = gdk_window_get_screen (window);
+
   if (x < 0 && y < 0)
     {
-      gdk_drawable_get_size (window, &x, &y);
-      x /= 2;
-      y /= 2;
+      x = window->width / 2;
+      y = window->height / 2;
     }
 
-  priv = (GdkWindowObject *)window;
   /* 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;
@@ -201,28 +204,27 @@ 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);
 
   if (!GDK_WINDOW_IS_MAPPED (window))
     return FALSE;
+
   screen = gdk_window_get_screen (window);
+
   if (x < 0 && y < 0)
     {
-      gdk_drawable_get_size (window, &x, &y);
-      x /= 2;
-      y /= 2;
+      x = window->width / 2;
+      y = window->height / 2;
     }
 
-  priv = (GdkWindowObject *)window;
   /* 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;