[gtk+] x11: Make wrapper member a GdkDrawable
- From: Benjamin Otte <otte src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+] x11: Make wrapper member a GdkDrawable
- Date: Thu, 2 Dec 2010 19:54:31 +0000 (UTC)
commit fe6f76a5a2f33f9873b482c397b22a9ae5cda300
Author: Benjamin Otte <otte redhat com>
Date: Thu Oct 7 00:17:33 2010 +0200
x11: Make wrapper member a GdkDrawable
This is in preparation for getting rid of GdkDrawable as a dependency of
GdkWindow.
gdk/x11/gdkwindow-x11.c | 6 +++---
gdk/x11/gdkwindow-x11.h | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
---
diff --git a/gdk/x11/gdkwindow-x11.c b/gdk/x11/gdkwindow-x11.c
index 1435fdf..2589fa6 100644
--- a/gdk/x11/gdkwindow-x11.c
+++ b/gdk/x11/gdkwindow-x11.c
@@ -514,7 +514,7 @@ _gdk_windowing_window_init (GdkScreen * screen)
impl = GDK_WINDOW_IMPL_X11 (private->impl);
impl->xid = screen_x11->xroot_window;
- impl->wrapper = GDK_DRAWABLE (private);
+ impl->wrapper = GDK_WINDOW (private);
private->window_type = GDK_WINDOW_ROOT;
private->depth = DefaultDepthOfScreen (screen_x11->xscreen);
@@ -754,7 +754,7 @@ _gdk_window_impl_new (GdkWindow *window,
impl = g_object_new (_gdk_window_impl_get_type (), NULL);
private->impl = (GdkDrawable *)impl;
- impl->wrapper = GDK_DRAWABLE (window);
+ impl->wrapper = GDK_WINDOW (window);
xdisplay = screen_x11->xdisplay;
@@ -964,7 +964,7 @@ gdk_window_foreign_new_for_display (GdkDisplay *display,
XVisualIDFromVisual (attrs.visual));
impl = GDK_WINDOW_IMPL_X11 (private->impl);
- impl->wrapper = GDK_DRAWABLE (window);
+ impl->wrapper = window;
private->parent = gdk_xid_table_lookup_for_display (display, parent);
diff --git a/gdk/x11/gdkwindow-x11.h b/gdk/x11/gdkwindow-x11.h
index 570a957..04dc8aa 100644
--- a/gdk/x11/gdkwindow-x11.h
+++ b/gdk/x11/gdkwindow-x11.h
@@ -58,7 +58,7 @@ struct _GdkWindowImplX11
{
GdkDrawable parent_instance;
- GdkDrawable *wrapper;
+ GdkWindow *wrapper;
Window xid;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]