[gtk+/client-side-windows] Don't use GDK_WINDOW_SCREEN, as its an X11 specific macro
- From: Alexander Larsson <alexl src gnome org>
- To: svn-commits-list gnome org
- Subject: [gtk+/client-side-windows] Don't use GDK_WINDOW_SCREEN, as its an X11 specific macro
- Date: Wed, 1 Jul 2009 11:46:35 +0000 (UTC)
commit 11a96ce2f6979d32159c57d6fd3194e6122e8177
Author: Alexander Larsson <alexl redhat com>
Date: Wed Jul 1 10:23:29 2009 +0200
Don't use GDK_WINDOW_SCREEN, as its an X11 specific macro
gdk/gdkwindow.c | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
---
diff --git a/gdk/gdkwindow.c b/gdk/gdkwindow.c
index 326c983..0e46691 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;
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]