diff options
| author | Benjamin Otte <otte@redhat.com> | 2010-10-06 02:01:51 +0200 |
|---|---|---|
| committer | Benjamin Otte <otte@redhat.com> | 2010-12-02 20:17:27 +0100 |
| commit | 094b0eeb98a7cadb354299e35e41ffd3aaec61e6 (patch) | |
| tree | 281498666bac31e2279cc2a340eaa64a2192cbb1 | |
| parent | 5f127305993289440043caf06db1ba0aa98846cb (diff) | |
| download | gtk+-094b0eeb98a7cadb354299e35e41ffd3aaec61e6.tar.gz | |
x11: Remove screen member from GdkDrawableImplX11
| -rw-r--r-- | gdk/x11/gdkdrawable-x11.h | 1 | ||||
| -rw-r--r-- | gdk/x11/gdkwindow-x11.c | 5 |
2 files changed, 1 insertions, 5 deletions
diff --git a/gdk/x11/gdkdrawable-x11.h b/gdk/x11/gdkdrawable-x11.h index 284bba7eaf..e4996a8548 100644 --- a/gdk/x11/gdkdrawable-x11.h +++ b/gdk/x11/gdkdrawable-x11.h @@ -52,7 +52,6 @@ struct _GdkDrawableImplX11 GdkDrawable *wrapper; Window xid; - GdkScreen *screen; cairo_surface_t *cairo_surface; }; diff --git a/gdk/x11/gdkwindow-x11.c b/gdk/x11/gdkwindow-x11.c index dc6ef6dcf2..c6304197a2 100644 --- a/gdk/x11/gdkwindow-x11.c +++ b/gdk/x11/gdkwindow-x11.c @@ -439,7 +439,6 @@ _gdk_windowing_window_init (GdkScreen * screen) draw_impl = GDK_DRAWABLE_IMPL_X11 (private->impl); - draw_impl->screen = screen; draw_impl->xid = screen_x11->xroot_window; draw_impl->wrapper = GDK_DRAWABLE (private); @@ -686,7 +685,6 @@ _gdk_window_impl_new (GdkWindow *window, draw_impl = GDK_DRAWABLE_IMPL_X11 (impl); draw_impl->wrapper = GDK_DRAWABLE (window); - draw_impl->screen = screen; xdisplay = screen_x11->xdisplay; xattributes_mask = 0; @@ -898,12 +896,11 @@ gdk_window_foreign_new_for_display (GdkDisplay *display, impl = GDK_WINDOW_IMPL_X11 (private->impl); draw_impl = GDK_DRAWABLE_IMPL_X11 (private->impl); draw_impl->wrapper = GDK_DRAWABLE (window); - draw_impl->screen = screen; private->parent = gdk_xid_table_lookup_for_display (display, parent); if (!private->parent || GDK_WINDOW_TYPE (private->parent) == GDK_WINDOW_FOREIGN) - private->parent = (GdkWindowObject *) gdk_screen_get_root_window (draw_impl->screen); + private->parent = (GdkWindowObject *) gdk_screen_get_root_window (screen); private->parent->children = g_list_prepend (private->parent->children, window); |