diff options
| author | Tor Lillqvist <tml@novell.com> | 2008-05-23 18:46:40 +0000 |
|---|---|---|
| committer | Tor Lillqvist <tml@src.gnome.org> | 2008-05-23 18:46:40 +0000 |
| commit | a8b5f3ee6b986ef8c8aceda9a8fe9d49ac7e2387 (patch) | |
| tree | 4a94323eeeb277bee4086bb2d292ed721afe0a77 /gdk | |
| parent | 5b8f0faa945c4dde6b89ad73a140949b5426c3df (diff) | |
| download | gtk+-a8b5f3ee6b986ef8c8aceda9a8fe9d49ac7e2387.tar.gz | |
Add gdk_window_redirect_to_drawable and gdk_window_remove_redirection.
2008-05-23 Tor Lillqvist <tml@novell.com>
* gdk/gdk.symbols: Add gdk_window_redirect_to_drawable and
gdk_window_remove_redirection.
* gdk/win32/gdkwindow-win32.c (_gdk_window_new)
(_gdk_window_reparent): Rename to adapt to the offscreen rendering
changes. Remove now unnecessary parameter checks as the caller
does that already.
* gtk/gtk.symbols: Add gtk_widget_get_snapshot.
svn path=/trunk/; revision=20130
Diffstat (limited to 'gdk')
| -rw-r--r-- | gdk/gdk.symbols | 2 | ||||
| -rw-r--r-- | gdk/win32/gdkwindow-win32.c | 28 |
2 files changed, 11 insertions, 19 deletions
diff --git a/gdk/gdk.symbols b/gdk/gdk.symbols index fd12d472a0..c4c5e7093f 100644 --- a/gdk/gdk.symbols +++ b/gdk/gdk.symbols @@ -687,6 +687,8 @@ gdk_window_set_user_data gdk_window_thaw_toplevel_updates_libgtk_only gdk_window_thaw_updates gdk_window_set_composited +gdk_window_redirect_to_drawable +gdk_window_remove_redirection #endif #endif diff --git a/gdk/win32/gdkwindow-win32.c b/gdk/win32/gdkwindow-win32.c index 2ead9ee946..09129d3f3f 100644 --- a/gdk/win32/gdkwindow-win32.c +++ b/gdk/win32/gdkwindow-win32.c @@ -508,7 +508,7 @@ gdk_window_new_internal (GdkWindow *parent, orig_parent = parent; GDK_NOTE (MISC, - g_print ("gdk_window_new: %s\n", + g_print ("gdk_window_new_internal: %s\n", (attributes->window_type == GDK_WINDOW_TOPLEVEL ? "TOPLEVEL" : (attributes->window_type == GDK_WINDOW_CHILD ? "CHILD" : (attributes->window_type == GDK_WINDOW_DIALOG ? "DIALOG" : @@ -757,9 +757,9 @@ gdk_window_new_internal (GdkWindow *parent, } GdkWindow* -gdk_window_new (GdkWindow *parent, - GdkWindowAttr *attributes, - gint attributes_mask) +_gdk_window_new (GdkWindow *parent, + GdkWindowAttr *attributes, + gint attributes_mask) { return gdk_window_new_internal (parent, attributes, attributes_mask, FALSE); } @@ -1350,10 +1350,10 @@ gdk_window_move_resize (GdkWindow *window, } void -gdk_window_reparent (GdkWindow *window, - GdkWindow *new_parent, - gint x, - gint y) +_gdk_window_reparent (GdkWindow *window, + GdkWindow *new_parent, + gint x, + gint y) { GdkWindowObject *window_private; GdkWindowObject *parent_private; @@ -1362,16 +1362,6 @@ gdk_window_reparent (GdkWindow *window, gboolean was_toplevel; LONG style; - g_return_if_fail (GDK_IS_WINDOW (window)); - g_return_if_fail (new_parent == NULL || GDK_IS_WINDOW (new_parent)); - g_return_if_fail (window != _gdk_root); - - if (GDK_WINDOW_DESTROYED (window) || - (new_parent && GDK_WINDOW_DESTROYED (new_parent))) - { - return; - } - if (!new_parent) new_parent = _gdk_root; @@ -1380,7 +1370,7 @@ gdk_window_reparent (GdkWindow *window, parent_private = (GdkWindowObject*) new_parent; impl = GDK_WINDOW_IMPL_WIN32 (window_private->impl); - GDK_NOTE (MISC, g_print ("gdk_window_reparent: %p: %p\n", + GDK_NOTE (MISC, g_print ("_gdk_window_reparent: %p: %p\n", GDK_WINDOW_HWND (window), GDK_WINDOW_HWND (new_parent))); |