Commit dc7d8dae authored by Benjamin Otte's avatar Benjamin Otte
Browse files

x11: Change GDK_WINDOW_SCREEN macro

on't look at GdkDrawableImplX11->screen, but call
gdk_window_get_screen() instead.
parent 5139eecc
......@@ -308,7 +308,7 @@ _gdk_x11_window_translate (GdkWindow *window,
item->u.translate.dy = dy;
gdk_window_queue (window, item);
XCopyArea (GDK_WINDOW_XDISPLAY (impl),
XCopyArea (GDK_WINDOW_XDISPLAY ((GdkWindow *) impl),
GDK_DRAWABLE_IMPL_X11 (private->impl)->xid,
GDK_DRAWABLE_IMPL_X11 (impl->impl)->xid,
xgc,
......
......@@ -153,7 +153,7 @@ extern gboolean _gdk_synchronize;
#define GDK_DRAWABLE_XROOTWIN(win) (GDK_WINDOW_XROOTWIN (win))
#define GDK_SCREEN_DISPLAY(screen) (GDK_SCREEN_X11 (screen)->display)
#define GDK_SCREEN_XROOTWIN(screen) (GDK_SCREEN_X11 (screen)->xroot_window)
#define GDK_WINDOW_SCREEN(win) (GDK_DRAWABLE_IMPL_X11 (((GdkWindowObject *)win)->impl)->screen)
#define GDK_WINDOW_SCREEN(win) (gdk_window_get_screen (win))
#define GDK_WINDOW_DISPLAY(win) (GDK_SCREEN_X11 (GDK_WINDOW_SCREEN (win))->display)
#define GDK_WINDOW_XROOTWIN(win) (GDK_SCREEN_X11 (GDK_WINDOW_SCREEN (win))->xroot_window)
#define GDK_GC_DISPLAY(gc) (GDK_SCREEN_DISPLAY (GDK_GC_X11(gc)->screen))
......
......@@ -194,7 +194,7 @@ gdk_window_impl_x11_finalize (GObject *object)
if (!GDK_WINDOW_DESTROYED (wrapper))
{
GdkDisplay *display = GDK_WINDOW_DISPLAY (wrapper);
GdkDisplay *display = GDK_WINDOW_DISPLAY ((GdkWindow *) wrapper);
_gdk_xid_table_remove (display, draw_impl->xid);
if (window_impl->toplevel && window_impl->toplevel->focus_window)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment