diff options
| author | Alexander Larsson <alexl@redhat.com> | 2009-07-01 10:23:29 +0200 |
|---|---|---|
| committer | Alexander Larsson <alexl@redhat.com> | 2009-07-01 10:28:05 +0200 |
| commit | 11a96ce2f6979d32159c57d6fd3194e6122e8177 (patch) | |
| tree | 571871acb629d528c70c4db3888d17a4ed0cade5 /gdk/gdkwindow.c | |
| parent | 0c6f64a76cc356582a4d2f76a07161c5fb5a8914 (diff) | |
| download | gdk-pixbuf-11a96ce2f6979d32159c57d6fd3194e6122e8177.tar.gz | |
Don't use GDK_WINDOW_SCREEN, as its an X11 specific macro
Diffstat (limited to 'gdk/gdkwindow.c')
| -rw-r--r-- | gdk/gdkwindow.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/gdk/gdkwindow.c b/gdk/gdkwindow.c index 326c9837d..0e4669132 100644 --- a/gdk/gdkwindow.c +++ b/gdk/gdkwindow.c @@ -1314,6 +1314,7 @@ gdk_window_reparent (GdkWindow *window, GdkWindowObject *private; GdkWindowObject *new_parent_private; GdkWindowObject *old_parent; + GdkScreen *screen; gboolean show, was_toplevel, was_mapped; gboolean do_reparent_to_impl; @@ -1325,8 +1326,9 @@ gdk_window_reparent (GdkWindow *window, (new_parent && GDK_WINDOW_DESTROYED (new_parent))) return; + screen = gdk_drawable_get_screen (GDK_DRAWABLE (window)); if (!new_parent) - new_parent = gdk_screen_get_root_window (GDK_WINDOW_SCREEN (window)); + new_parent = gdk_screen_get_root_window (screen); private = (GdkWindowObject *) window; new_parent_private = (GdkWindowObject *)new_parent; @@ -1392,7 +1394,7 @@ gdk_window_reparent (GdkWindow *window, */ if (GDK_WINDOW_TYPE (new_parent) == GDK_WINDOW_FOREIGN) { - new_parent = gdk_screen_get_root_window (GDK_WINDOW_SCREEN (window)); + new_parent = gdk_screen_get_root_window (screen); new_parent_private = (GdkWindowObject *)new_parent; } |