diff options
| author | Tor Lillqvist <tml@novell.com> | 2005-03-16 02:21:14 +0000 |
|---|---|---|
| committer | Tor Lillqvist <tml@src.gnome.org> | 2005-03-16 02:21:14 +0000 |
| commit | 34bfd7127948fd7608d53e90d2404caf21d9478e (patch) | |
| tree | f729e7553a15ef82582ad441fd313d12fa4ed2c0 /gdk/win32/gdkpixmap-win32.c | |
| parent | df9768cf3a88a82d04c91c32dc2285d69ad4b02b (diff) | |
| download | gtk+-34bfd7127948fd7608d53e90d2404caf21d9478e.tar.gz | |
gdk/win32/gdkprivate-win32.h Drop global variable _gdk_root_window, just
2005-03-16 Tor Lillqvist <tml@novell.com>
* gdk/win32/gdkprivate-win32.h
* gdk/win32/*.c: Drop global variable _gdk_root_window, just call
GetDesktopWindow(). Rename the GdkWindow* _gdk_parent_root to
_gdk_root.
* gdk/win32/gdkwindow-win32.h (GdkWindowImplWin32): Add
toplevel_window_type field.
* gdk/win32/gdkwindow-win32.c: As there is only one root
window in GDK on Win32, we can compare directly to _gdk_root
instead of checking the window type.
(gdk_window_reparent): When reparenting a child of the desktop
clear out the window decorations. Correspondingly, when
reparenting to the desktop, add decorations. As in the X11
backend, save the window type of a toplevel window when
reparenting, in case it is reparented back to toplevel.
Diffstat (limited to 'gdk/win32/gdkpixmap-win32.c')
| -rw-r--r-- | gdk/win32/gdkpixmap-win32.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/gdk/win32/gdkpixmap-win32.c b/gdk/win32/gdkpixmap-win32.c index 958edb8c11..136f5bebd1 100644 --- a/gdk/win32/gdkpixmap-win32.c +++ b/gdk/win32/gdkpixmap-win32.c @@ -158,7 +158,7 @@ gdk_pixmap_new (GdkDrawable *drawable, g_return_val_if_fail ((width != 0) && (height != 0), NULL); if (!drawable) - drawable = _gdk_parent_root; + drawable = _gdk_root; if (GDK_IS_WINDOW (drawable) && GDK_WINDOW_DESTROYED (drawable)) return NULL; @@ -190,7 +190,7 @@ gdk_pixmap_new (GdkDrawable *drawable, if (GDK_IS_WINDOW (drawable)) hwnd = GDK_WINDOW_HWND (drawable); else - hwnd = GDK_WINDOW_HWND (_gdk_parent_root); + hwnd = GetDesktopWindow (); if ((hdc = GetDC (hwnd)) == NULL) { WIN32_GDI_FAILED ("GetDC"); @@ -360,9 +360,8 @@ gdk_bitmap_create_from_data (GdkDrawable *drawable, g_return_val_if_fail (drawable == NULL || GDK_IS_DRAWABLE (drawable), NULL); if (!drawable) - drawable = _gdk_parent_root; - - if (GDK_IS_WINDOW (drawable) && GDK_WINDOW_DESTROYED (drawable)) + drawable = _gdk_root; + else if (GDK_IS_WINDOW (drawable) && GDK_WINDOW_DESTROYED (drawable)) return NULL; pixmap = gdk_pixmap_new (drawable, width, height, 1); |