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 d4d47fbad7bc7c2f6a29ae15665b6ce45cb970eb..960301b1e3ab4b88577e1198540886b33bac10ab 100644 (file)
--- 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;