callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

gdk: Make GdkWindow->impl a GdkWindowImpl

Browse Source
This commit is contained in:
Benjamin Otte
2010-11-24 14:36:45 +01:00
parent e3013a5cf5
commit 98838df2db
3 changed files with 9 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
gdk/gdkinternals.h
View File

@ -32,6 +32,7 @@
#include <gio/gio.h> #include <gio/gio.h>
#include <gdk/gdktypes.h> #include <gdk/gdktypes.h>
#include <gdk/gdkwindow.h> #include <gdk/gdkwindow.h>
#include <gdk/gdkwindowimpl.h>
#include <gdk/gdkprivate.h> #include <gdk/gdkprivate.h>
G_BEGIN_DECLS G_BEGIN_DECLS
@ -186,7 +187,7 @@ struct _GdkWindow
{ {
GObject parent_instance; GObject parent_instance;
GdkDrawable *impl; /* window-system-specific delegate object */ GdkWindowImpl *impl; /* window-system-specific delegate object */
GdkWindow *parent; GdkWindow *parent;
GdkVisual *visual; GdkVisual *visual;

10
gdk/gdkwindow.c
View File

@ -1473,11 +1473,11 @@ is_parent_of (GdkWindow *parent,
static void static void
change_impl (GdkWindow *private, change_impl (GdkWindow *private,
GdkWindow *impl_window, GdkWindow *impl_window,
GdkDrawable *new) GdkWindowImpl *new)
{ {
GList *l; GList *l;
GdkWindow *child; GdkWindow *child;
GdkDrawable *old_impl; GdkWindowImpl *old_impl;
GdkWindow *old_impl_window; GdkWindow *old_impl_window;
old_impl = private->impl; old_impl = private->impl;
@ -1777,7 +1777,7 @@ gboolean
gdk_window_ensure_native (GdkWindow *window) gdk_window_ensure_native (GdkWindow *window)
{ {
GdkWindow *impl_window; GdkWindow *impl_window;
GdkDrawable *new_impl, *old_impl; GdkWindowImpl *new_impl, *old_impl;
GdkScreen *screen; GdkScreen *screen;
GdkWindow *above; GdkWindow *above;
GList listhead; GList listhead;
@ -3398,7 +3398,7 @@ gdk_window_flush_if_exposing (GdkWindow *window)
static void static void
gdk_window_flush_recursive_helper (GdkWindow *window, gdk_window_flush_recursive_helper (GdkWindow *window,
GdkDrawable *impl) GdkWindowImpl *impl)
{ {
GdkWindow *child; GdkWindow *child;
GList *l; GList *l;
@ -6054,7 +6054,7 @@ move_native_children (GdkWindow *private)
static gboolean static gboolean
collect_native_child_region_helper (GdkWindow *window, collect_native_child_region_helper (GdkWindow *window,
GdkDrawable *impl, GdkWindowImpl *impl,
cairo_region_t **region, cairo_region_t **region,
int x_offset, int x_offset,
int y_offset) int y_offset)

8
gdk/x11/gdkwindow-x11.c
View File

@ -702,7 +702,7 @@ _gdk_window_impl_new (GdkWindow *window,
display_x11 = GDK_DISPLAY_X11 (GDK_SCREEN_DISPLAY (screen)); display_x11 = GDK_DISPLAY_X11 (GDK_SCREEN_DISPLAY (screen));
impl = g_object_new (GDK_TYPE_WINDOW_IMPL_X11, NULL); impl = g_object_new (GDK_TYPE_WINDOW_IMPL_X11, NULL);
window->impl = (GdkDrawable *)impl; window->impl = GDK_WINDOW_IMPL (impl);
impl->wrapper = GDK_WINDOW (window); impl->wrapper = GDK_WINDOW (window);
xdisplay = screen_x11->xdisplay; xdisplay = screen_x11->xdisplay;
@ -5536,8 +5536,6 @@ gdk_x11_get_server_time (GdkWindow *window)
XID XID
gdk_x11_window_get_xid (GdkWindow *window) gdk_x11_window_get_xid (GdkWindow *window)
{ {
GdkDrawable *impl;
/* Try to ensure the window has a native window */ /* Try to ensure the window has a native window */
if (!_gdk_window_has_impl (window)) if (!_gdk_window_has_impl (window))
{ {
@ -5556,9 +5554,7 @@ gdk_x11_window_get_xid (GdkWindow *window)
return None; return None;
} }
impl = window->impl; return GDK_WINDOW_IMPL_X11 (window->impl)->xid;
return ((GdkWindowImplX11 *)impl)->xid;
} }
static void static void