]> Pileus Git - ~andy/gtk/blobdiff - gdk/win32/gdkwindow-win32.c
Bypass calls to the grab/ungrab functions in gdkinput-win32.c, as they
[~andy/gtk] / gdk / win32 / gdkwindow-win32.c
index 72e9570d173daa9dee066ecd67cdded2ac6e0ed8..da6b50d835542b6abcdc77c41176e5094e1f46b8 100644 (file)
 /* GDK - The GIMP Drawing Kit
  * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
- * Copyright (C) 1998-1999 Tor Lillqvist
+ * Copyright (C) 1998-2002 Tor Lillqvist
  *
  * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
+ * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation; either
  * version 2 of the License, or (at your option) any later version.
  *
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
+ * Lesser General Public License for more details.
  *
- * You should have received a copy of the GNU Library General Public
+ * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the
  * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
  * Boston, MA 02111-1307, USA.
  */
 
 /*
- * Modified by the GTK+ Team and others 1997-1999.  See the AUTHORS
+ * Modified by the GTK+ Team and others 1997-2000.  See the AUTHORS
  * file for a list of people on the GTK+ Team.  See the ChangeLog
  * files for a list of changes.  These files are distributed with
  * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
  */
 
-#include "config.h"
-
 #include <stdlib.h>
-#include <stdio.h>
 
+#include "gdk.h" /* gdk_rectangle_intersect */
 #include "gdkevents.h"
+#include "gdkpixmap.h"
 #include "gdkwindow.h"
-#include "gdkprivate.h"
-#include "gdkinputprivate.h"
+#include "gdkprivate-win32.h"
+#include "gdkinput-win32.h"
 
-/* The Win API function AdjustWindowRect may return negative values
- * resulting in obscured title bars. This helper function is coreccting it.
- */
-BOOL
-SafeAdjustWindowRectEx (RECT* lpRect, 
-                       DWORD dwStyle, 
-                       BOOL bMenu, 
-                       DWORD dwExStyle)
+static gboolean gdk_window_gravity_works (void);
+static void     gdk_window_set_static_win_gravity (GdkWindow *window, 
+                                                  gboolean   on);
+
+static GdkColormap* gdk_window_impl_win32_get_colormap (GdkDrawable *drawable);
+static void         gdk_window_impl_win32_set_colormap (GdkDrawable *drawable,
+                                                       GdkColormap *cmap);
+static void         gdk_window_impl_win32_get_size     (GdkDrawable *drawable,
+                                                       gint *width,
+                                                       gint *height);
+static GdkRegion*  gdk_window_impl_win32_get_visible_region (GdkDrawable *drawable);
+static void gdk_window_impl_win32_init       (GdkWindowImplWin32      *window);
+static void gdk_window_impl_win32_class_init (GdkWindowImplWin32Class *klass);
+static void gdk_window_impl_win32_finalize   (GObject                 *object);
+
+static gpointer parent_class = NULL;
+
+GType
+_gdk_window_impl_win32_get_type (void)
 {
-  if (!AdjustWindowRectEx(lpRect, dwStyle, bMenu, dwExStyle))
-    return FALSE;
-  if (lpRect->left < 0)
+  static GType object_type = 0;
+
+  if (!object_type)
     {
-      lpRect->right -= lpRect->left;
-      lpRect->left = 0;
+      static const GTypeInfo object_info =
+      {
+        sizeof (GdkWindowImplWin32Class),
+        (GBaseInitFunc) NULL,
+        (GBaseFinalizeFunc) NULL,
+        (GClassInitFunc) gdk_window_impl_win32_class_init,
+        NULL,           /* class_finalize */
+        NULL,           /* class_data */
+        sizeof (GdkWindowImplWin32),
+        0,              /* n_preallocs */
+        (GInstanceInitFunc) gdk_window_impl_win32_init,
+      };
+      
+      object_type = g_type_register_static (GDK_TYPE_DRAWABLE_IMPL_WIN32,
+                                            "GdkWindowImplWin32",
+                                            &object_info, 0);
     }
-  if (lpRect->top < 0)
+  
+  return object_type;
+}
+
+GType
+_gdk_window_impl_get_type (void)
+{
+  return _gdk_window_impl_win32_get_type ();
+}
+
+static void
+gdk_window_impl_win32_init (GdkWindowImplWin32 *impl)
+{
+  impl->width = 1;
+  impl->height = 1;
+
+  impl->hcursor = NULL;
+  impl->hint_flags = 0;
+  impl->extension_events_selected = FALSE;
+}
+
+static void
+gdk_window_impl_win32_class_init (GdkWindowImplWin32Class *klass)
+{
+  GObjectClass *object_class = G_OBJECT_CLASS (klass);
+  GdkDrawableClass *drawable_class = GDK_DRAWABLE_CLASS (klass);
+  
+  parent_class = g_type_class_peek_parent (klass);
+
+  object_class->finalize = gdk_window_impl_win32_finalize;
+
+  drawable_class->set_colormap = gdk_window_impl_win32_set_colormap;
+  drawable_class->get_colormap = gdk_window_impl_win32_get_colormap;
+  drawable_class->get_size = gdk_window_impl_win32_get_size;
+
+  /* Visible and clip regions are the same */
+  drawable_class->get_clip_region = gdk_window_impl_win32_get_visible_region;
+  drawable_class->get_visible_region = gdk_window_impl_win32_get_visible_region;
+}
+
+static void
+gdk_window_impl_win32_finalize (GObject *object)
+{
+  GdkWindowObject *wrapper;
+  GdkDrawableImplWin32 *draw_impl;
+  GdkWindowImplWin32 *window_impl;
+  
+  g_return_if_fail (GDK_IS_WINDOW_IMPL_WIN32 (object));
+
+  draw_impl = GDK_DRAWABLE_IMPL_WIN32 (object);
+  window_impl = GDK_WINDOW_IMPL_WIN32 (object);
+  
+  wrapper = (GdkWindowObject*) draw_impl->wrapper;
+
+  if (!GDK_WINDOW_DESTROYED (wrapper))
     {
-      lpRect->bottom -= lpRect->top;
-      lpRect->top = 0;
+      gdk_win32_handle_table_remove (draw_impl->handle);
     }
-  return TRUE;
+
+  if (window_impl->hcursor != NULL)
+    {
+      if (GetCursor () == window_impl->hcursor)
+       SetCursor (NULL);
+      if (!DestroyCursor (window_impl->hcursor))
+        WIN32_GDI_FAILED("DestroyCursor");
+      window_impl->hcursor = NULL;
+    }
+
+  G_OBJECT_CLASS (parent_class)->finalize (object);
 }
 
-/* Forward declarations */
-static gboolean gdk_window_gravity_works (void);
-static void     gdk_window_set_static_win_gravity (GdkWindow *window, 
-                                                  gboolean   on);
+static GdkColormap*
+gdk_window_impl_win32_get_colormap (GdkDrawable *drawable)
+{
+  GdkDrawableImplWin32 *drawable_impl;
+  
+  g_return_val_if_fail (GDK_IS_WINDOW_IMPL_WIN32 (drawable), NULL);
 
-/* 
- * The following fucntion by The Rasterman <raster@redhat.com>
- * This function returns the X Window ID in which the x y location is in 
- * (x and y being relative to the root window), excluding any windows listed
- * in the GList excludes (this is a list of X Window ID's - gpointer being
- * the Window ID).
- * 
- * This is primarily designed for internal gdk use - for DND for example
- * when using a shaped icon window as the drag object - you exclude the
- * X Window ID of the "icon" (perhaps more if excludes may be needed) and
- * You can get back an X Window ID as to what X Window ID is infact under
- * those X,Y co-ordinates.
- */
-HWND
-gdk_window_xid_at_coords (gint     x,
-                         gint     y,
-                         GList   *excludes,
-                         gboolean excl_child)
+  drawable_impl = GDK_DRAWABLE_IMPL_WIN32 (drawable);
+
+  if (!((GdkWindowObject *) drawable_impl->wrapper)->input_only && 
+      drawable_impl->colormap == NULL)
+    {
+      drawable_impl->colormap = gdk_colormap_get_system ();
+      gdk_colormap_ref (drawable_impl->colormap);
+    }
+  
+  return drawable_impl->colormap;
+}
+
+static void
+gdk_window_impl_win32_set_colormap (GdkDrawable *drawable,
+                                   GdkColormap *cmap)
 {
-  POINT pt;
-  gboolean warned = FALSE;
+  GdkWindowImplWin32 *impl;
+  GdkDrawableImplWin32 *draw_impl;
+  
+  g_return_if_fail (GDK_IS_WINDOW_IMPL_WIN32 (drawable));
 
-  pt.x = x;
-  pt.y = y;
-  /* This is probably not correct, just a quick hack */
+  impl = GDK_WINDOW_IMPL_WIN32 (drawable);
+  draw_impl = GDK_DRAWABLE_IMPL_WIN32 (drawable);
 
-  if (!warned)
+  /* chain up */
+  GDK_DRAWABLE_CLASS (parent_class)->set_colormap (drawable, cmap);
+  
+  if (cmap)
     {
-      g_warning ("gdk_window_xid_at_coords probably not implemented correctly");
-      warned = TRUE;
+      /* XXX */
+      g_print("gdk_window_impl_win32_set_colormap: XXX\n");
     }
+}
 
-  /* XXX */
-  return WindowFromPoint (pt);
+static void
+gdk_window_impl_win32_get_size (GdkDrawable *drawable,
+                               gint        *width,
+                               gint        *height)
+{
+  g_return_if_fail (GDK_IS_WINDOW_IMPL_WIN32 (drawable));
+
+  if (width)
+    *width = GDK_WINDOW_IMPL_WIN32 (drawable)->width;
+  if (height)
+    *height = GDK_WINDOW_IMPL_WIN32 (drawable)->height;
+}
+
+static GdkRegion*
+gdk_window_impl_win32_get_visible_region (GdkDrawable *drawable)
+{
+  GdkWindowImplWin32 *impl = GDK_WINDOW_IMPL_WIN32 (drawable);
+  GdkRectangle result_rect;
+
+  result_rect.x = 0;
+  result_rect.y = 0;
+  result_rect.width = impl->width;
+  result_rect.height = impl->height;
+
+  gdk_rectangle_intersect (&result_rect, &impl->position_info.clip_rect, &result_rect);
+
+  return gdk_region_rectangle (&result_rect);
 }
 
 void
-gdk_window_init (void)
+_gdk_windowing_window_init (void)
 {
-  unsigned int width;
-  unsigned int height;
-#if 0
-  width = GetSystemMetrics (SM_CXSCREEN);
-  height = GetSystemMetrics (SM_CYSCREEN);
-#else
-  { RECT r; /* //HB: don't obscure tray window (task bar) */
-    SystemParametersInfo(SPI_GETWORKAREA, 0, &r, 0);
-    width  = r.right - r.left;
-    height = r.bottom - r.top;
-  }
-#endif
+  GdkWindowObject *private;
+  GdkWindowImplWin32 *impl;
+  GdkDrawableImplWin32 *draw_impl;
+  RECT rect;
+  guint width;
+  guint height;
+
+  g_assert (_gdk_parent_root == NULL);
+  
+  SystemParametersInfo(SPI_GETWORKAREA, 0, &rect, 0);
+  width  = rect.right - rect.left;
+  height = rect.bottom - rect.top;
 
-  gdk_root_parent.xwindow = gdk_root_window;
-  gdk_root_parent.window_type = GDK_WINDOW_ROOT;
-  gdk_root_parent.window.user_data = NULL;
-  gdk_root_parent.width = width;
-  gdk_root_parent.height = height;
-  gdk_root_parent.children = NULL;
-  gdk_root_parent.colormap = NULL;
-  gdk_root_parent.ref_count = 1;
+  _gdk_parent_root = g_object_new (GDK_TYPE_WINDOW, NULL);
+  private = (GdkWindowObject *)_gdk_parent_root;
+  impl = GDK_WINDOW_IMPL_WIN32 (private->impl);
+  draw_impl = GDK_DRAWABLE_IMPL_WIN32 (private->impl);
+  
+  draw_impl->handle = gdk_root_window;
+  draw_impl->wrapper = GDK_DRAWABLE (private);
+  draw_impl->colormap = gdk_colormap_get_system ();
+  gdk_colormap_ref (draw_impl->colormap);
+  
+  private->window_type = GDK_WINDOW_ROOT;
+  private->depth = gdk_visual_get_system ()->depth;
+  impl->width = width;
+  impl->height = height;
+
+  gdk_win32_handle_table_insert (&gdk_root_window, _gdk_parent_root);
+}
 
-  gdk_xid_table_insert (&gdk_root_window, &gdk_root_parent);
+/* The Win API function AdjustWindowRect may return negative values
+ * resulting in obscured title bars. This helper function is coreccting it.
+ */
+static BOOL
+SafeAdjustWindowRectEx (RECT* lpRect,
+                       DWORD dwStyle, 
+                       BOOL  bMenu, 
+                       DWORD dwExStyle)
+{
+  if (!AdjustWindowRectEx(lpRect, dwStyle, bMenu, dwExStyle))
+    {
+      WIN32_API_FAILED ("AdjustWindowRectEx");
+      return FALSE;
+    }
+  if (lpRect->left < 0)
+    {
+      lpRect->right -= lpRect->left;
+      lpRect->left = 0;
+    }
+  if (lpRect->top < 0)
+    {
+      lpRect->bottom -= lpRect->top;
+      lpRect->top = 0;
+    }
+  return TRUE;
 }
 
 /* RegisterGdkClass
@@ -135,8 +284,8 @@ gdk_window_init (void)
  *   is ever needed (e.g Dialog specific), every such window should
  *   get its own class
  */
-ATOM
-RegisterGdkClass(GdkWindowType wtype)
+static ATOM
+RegisterGdkClass (GdkWindowType wtype)
 {
   static ATOM klassTOPLEVEL = 0;
   static ATOM klassDIALOG   = 0;
@@ -146,173 +295,199 @@ RegisterGdkClass(GdkWindowType wtype)
   static WNDCLASSEX wcl; 
   ATOM klass = 0;
 
-  wcl.cbSize = sizeof(WNDCLASSEX);     
+  wcl.cbSize = sizeof (WNDCLASSEX);
   wcl.style = 0; /* DON'T set CS_<H,V>REDRAW. It causes total redraw
                   * on WM_SIZE and WM_MOVE. Flicker, Performance!
                   */
-  wcl.lpfnWndProc = gdk_WindowProc;
+  wcl.lpfnWndProc = _gdk_win32_window_procedure;
   wcl.cbClsExtra = 0;
   wcl.cbWndExtra = 0;
-  wcl.hInstance = gdk_ProgInstance;
+  wcl.hInstance = gdk_app_hmodule;
   wcl.hIcon = 0;
   /* initialize once! */
   if (0 == hAppIcon)
     {
       gchar sLoc [_MAX_PATH+1];
-      HINSTANCE hInst = GetModuleHandle(NULL);
 
-      if (0 != GetModuleFileName(hInst, sLoc, _MAX_PATH))
+      if (0 != GetModuleFileName (gdk_app_hmodule, sLoc, _MAX_PATH))
        {
-         hAppIcon = ExtractIcon(hInst, sLoc, 0);
+         hAppIcon = ExtractIcon (gdk_app_hmodule, sLoc, 0);
          if (0 == hAppIcon)
            {
-             char *gdklibname = g_strdup_printf ("gdk-%s.dll", GDK_VERSION);
-
-             hAppIcon = ExtractIcon(hInst, gdklibname, 0);
-             g_free (gdklibname);
+             if (0 != GetModuleFileName (gdk_dll_hinstance, sLoc, _MAX_PATH))
+               hAppIcon = ExtractIcon (gdk_dll_hinstance, sLoc, 0);
            }
-         
-         if (0 == hAppIcon) 
-           hAppIcon = LoadIcon (NULL, IDI_APPLICATION);
        }
+      if (0 == hAppIcon) 
+       hAppIcon = LoadIcon (NULL, IDI_APPLICATION);
     }
 
   wcl.lpszMenuName = NULL;
   wcl.hIconSm = 0;
 
   /* initialize once per class */
+  /*
+   * HB: Setting the background brush leads to flicker, because we
+   * don't get asked how to clear the background. This is not what
+   * we want, at least not for input_only windows ...
+   */
 #define ONCE_PER_CLASS() \
   wcl.hIcon = CopyIcon (hAppIcon); \
   wcl.hIconSm = CopyIcon (hAppIcon); \
-  wcl.hbrBackground = CreateSolidBrush( RGB(0,0,0)); \
+  wcl.hbrBackground = NULL; \
   wcl.hCursor = LoadCursor (NULL, IDC_ARROW); 
   
   switch (wtype)
-  {
+    {
     case GDK_WINDOW_TOPLEVEL:
       if (0 == klassTOPLEVEL)
-      {
-       wcl.lpszClassName = "gdkWindowToplevel";
-
-       ONCE_PER_CLASS();
-       klassTOPLEVEL = RegisterClassEx(&wcl);
-      }
+       {
+         wcl.lpszClassName = "gdkWindowToplevel";
+         
+         ONCE_PER_CLASS();
+         klassTOPLEVEL = RegisterClassEx (&wcl);
+       }
       klass = klassTOPLEVEL;
       break;
+      
     case GDK_WINDOW_CHILD:
       if (0 == klassCHILD)
-      {
-       wcl.lpszClassName = "gdkWindowChild";
-
-        wcl.style |= CS_PARENTDC; /* MSDN: ... enhances system performance. */
-       ONCE_PER_CLASS();
-       klassCHILD = RegisterClassEx(&wcl);
-      }
+       {
+         wcl.lpszClassName = "gdkWindowChild";
+         
+         wcl.style |= CS_PARENTDC; /* MSDN: ... enhances system performance. */
+         ONCE_PER_CLASS();
+         klassCHILD = RegisterClassEx (&wcl);
+       }
       klass = klassCHILD;
       break;
+      
     case GDK_WINDOW_DIALOG:
       if (0 == klassDIALOG)
-      {
-       wcl.lpszClassName = "gdkWindowDialog";
-        wcl.style |= CS_SAVEBITS;
-       ONCE_PER_CLASS();
-       klassDIALOG = RegisterClassEx(&wcl);
-      }
+       {
+         wcl.lpszClassName = "gdkWindowDialog";
+         wcl.style |= CS_SAVEBITS;
+         ONCE_PER_CLASS();
+         klassDIALOG = RegisterClassEx (&wcl);
+       }
       klass = klassDIALOG;
       break;
+      
     case GDK_WINDOW_TEMP:
       if (0 == klassTEMP)
-      {
-       wcl.lpszClassName = "gdkWindowTemp";
-        wcl.style |= CS_SAVEBITS;
-       ONCE_PER_CLASS();
-       klassTEMP = RegisterClassEx(&wcl);
-      }
+       {
+         wcl.lpszClassName = "gdkWindowTemp";
+         wcl.style |= CS_SAVEBITS;
+         ONCE_PER_CLASS();
+         klassTEMP = RegisterClassEx (&wcl);
+       }
       klass = klassTEMP;
       break;
-    case GDK_WINDOW_ROOT:
-      g_error ("cannot make windows of type GDK_WINDOW_ROOT");
-      break;
-    case GDK_WINDOW_PIXMAP:
-      g_error ("cannot make windows of type GDK_WINDOW_PIXMAP (use gdk_pixmap_new)");
+      
+    default:
+      g_assert_not_reached ();
       break;
-  }
-
+    }
+  
+  if (klass == 0)
+    {
+      WIN32_API_FAILED ("RegisterClassEx");
+      g_error ("That is a fatal error");
+    }
   return klass;
-} /* RegisterGdkClass */
-
+}
 
 GdkWindow*
 gdk_window_new (GdkWindow     *parent,
                GdkWindowAttr *attributes,
                gint           attributes_mask)
 {
-  GdkWindow *window;
-  GdkWindowPrivate *private;
-  GdkWindowPrivate *parent_private;
-  GdkVisual *visual;
-  HANDLE xparent;
-  Visual *xvisual;
+  HANDLE hparent;
   ATOM klass = 0;
   DWORD dwStyle, dwExStyle;
   RECT rect;
+  GdkWindow *window;
+  GdkWindowObject *private;
+  GdkWindowImplWin32 *impl;
+  GdkDrawableImplWin32 *draw_impl;
+  GdkVisual *visual;
   int width, height;
   int x, y;
   char *title;
+  char *mbtitle;
 
   g_return_val_if_fail (attributes != NULL, NULL);
 
   if (!parent)
-    parent = (GdkWindow*) &gdk_root_parent;
+    parent = _gdk_parent_root;
 
-  parent_private = (GdkWindowPrivate*) parent;
-  if (parent_private->destroyed)
+  g_return_val_if_fail (GDK_IS_WINDOW (parent), NULL);
+  
+  GDK_NOTE (MISC,
+           g_print ("gdk_window_new: %s\n",
+                    (attributes->window_type == GDK_WINDOW_TOPLEVEL ? "TOPLEVEL" :
+                     (attributes->window_type == GDK_WINDOW_CHILD ? "CHILD" :
+                      (attributes->window_type == GDK_WINDOW_DIALOG ? "DIALOG" :
+                       (attributes->window_type == GDK_WINDOW_TEMP ? "TEMP" :
+                        "???"))))));
+
+  if (GDK_WINDOW_DESTROYED (parent))
     return NULL;
+  
+  hparent = GDK_WINDOW_HWND (parent);
 
-  xparent = parent_private->xwindow;
-
-  private = g_new (GdkWindowPrivate, 1);
-  window = (GdkWindow*) private;
-
-  private->parent = parent;
-
-  private->destroyed = FALSE;
-  private->mapped = FALSE;
-  private->guffaw_gravity = FALSE;
-  private->resize_count = 0;
-  private->ref_count = 1;
+  window = g_object_new (GDK_TYPE_WINDOW, NULL);
+  private = (GdkWindowObject *)window;
+  impl = GDK_WINDOW_IMPL_WIN32 (private->impl);
+  draw_impl = GDK_DRAWABLE_IMPL_WIN32 (private->impl);
+  draw_impl->wrapper = GDK_DRAWABLE (window);
 
-  private->x = (attributes_mask & GDK_WA_X) ? attributes->x : 0;
-  private->y = (attributes_mask & GDK_WA_Y) ? attributes->y : 0;
+  /* Windows with a foreign parent are treated as if they are children
+   * of the root window, except for actual creation.
+   */
+  if (GDK_WINDOW_TYPE (parent) == GDK_WINDOW_FOREIGN)
+    parent = _gdk_parent_root;
+  
+  private->parent = (GdkWindowObject *)parent;
 
-  private->width = (attributes->width > 1) ? (attributes->width) : (1);
-  private->height = (attributes->height > 1) ? (attributes->height) : (1);
+  if (attributes_mask & GDK_WA_X)
+    x = attributes->x;
+  else
+    x = CW_USEDEFAULT;
+  
+  if (attributes_mask & GDK_WA_Y)
+    y = attributes->y;
+  else if (attributes_mask & GDK_WA_X)
+    y = 100;                   /* ??? We must put it somewhere... */
+  else
+    y = 0;                     /* x is CW_USEDEFAULT, y doesn't matter then */
+  
+  private->x = x;
+  private->y = y;
+  impl->width = (attributes->width > 1) ? (attributes->width) : (1);
+  impl->height = (attributes->height > 1) ? (attributes->height) : (1);
+  impl->extension_events_selected = FALSE;
   private->window_type = attributes->window_type;
-  private->extension_events = 0;
-  private->extension_events_selected = FALSE;
-
-  private->filters = NULL;
-  private->children = NULL;
 
-  window->user_data = NULL;
+  _gdk_window_init_position (GDK_WINDOW (private));
+  if (impl->position_info.big)
+    private->guffaw_gravity = TRUE;
 
   if (attributes_mask & GDK_WA_VISUAL)
     visual = attributes->visual;
   else
     visual = gdk_visual_get_system ();
-  xvisual = ((GdkVisualPrivate*) visual)->xvisual;
 
   if (attributes_mask & GDK_WA_TITLE)
     title = attributes->title;
   else
     title = g_get_prgname ();
+  if (!title || !*title)
+    title = "GDK client window";
 
   private->event_mask = GDK_STRUCTURE_MASK | attributes->event_mask;
-  private->bg_type = GDK_WIN32_BG_NORMAL;
-  private->hint_flags = 0;
-  private->xcursor = NULL;
       
-  if (parent_private && parent_private->guffaw_gravity)
+  if (private->parent && private->parent->guffaw_gravity)
     {
       /* XXX ??? */
     }
@@ -320,63 +495,65 @@ gdk_window_new (GdkWindow     *parent,
   if (attributes->wclass == GDK_INPUT_OUTPUT)
     {
       dwExStyle = 0;
+
+      private->input_only = FALSE;
+      private->depth = visual->depth;
+      
       if (attributes_mask & GDK_WA_COLORMAP)
-       private->colormap = attributes->colormap;
+       {
+         draw_impl->colormap = attributes->colormap;
+          gdk_colormap_ref (attributes->colormap);
+        }
       else
-       private->colormap = gdk_colormap_get_system ();
+       {
+         draw_impl->colormap = gdk_colormap_get_system ();
+       }
     }
   else
     {
       dwExStyle = WS_EX_TRANSPARENT;
-      private->colormap = NULL;
-      private->bg_type = GDK_WIN32_BG_TRANSPARENT;
-      private->bg_pixmap = NULL;
+      private->depth = 0;
+      private->input_only = TRUE;
+      draw_impl->colormap = gdk_colormap_get_system ();
+      gdk_colormap_ref (draw_impl->colormap);
+      GDK_NOTE (MISC, g_print ("...GDK_INPUT_ONLY, system colormap\n"));
     }
 
-  if (attributes_mask & GDK_WA_X)
-    x = attributes->x;
-  else
-    x = CW_USEDEFAULT;
-
-  if (attributes_mask & GDK_WA_Y)
-    y = attributes->y;
-  else if (attributes_mask & GDK_WA_X)
-    y = 100;                   /* ??? We must put it somewhere... */
-  else
-    y = 500;                   /* x is CW_USEDEFAULT, y doesn't matter then */
-
-  if (parent_private)
-    parent_private->children = g_list_prepend (parent_private->children, window);
+  if (private->parent)
+    private->parent->children = g_list_prepend (private->parent->children, window);
 
   switch (private->window_type)
     {
     case GDK_WINDOW_TOPLEVEL:
       dwStyle = WS_OVERLAPPEDWINDOW | WS_CLIPCHILDREN;
-      xparent = gdk_root_window;
+      hparent = gdk_root_window;
       break;
+
     case GDK_WINDOW_CHILD:
       dwStyle = WS_CHILDWINDOW | WS_CLIPCHILDREN | WS_CLIPSIBLINGS;
       break;
+
     case GDK_WINDOW_DIALOG:
       dwStyle = WS_OVERLAPPED | WS_MINIMIZEBOX | WS_SYSMENU | WS_CAPTION | WS_THICKFRAME | WS_CLIPCHILDREN;
+#if 0
       dwExStyle |= WS_EX_TOPMOST; /* //HB: want this? */
-      xparent = gdk_root_window;
+#endif
+      hparent = gdk_root_window;
       break;
+
     case GDK_WINDOW_TEMP:
-      dwStyle = WS_POPUP | WS_CLIPCHILDREN | WS_CLIPSIBLINGS;
+      dwStyle = WS_CLIPCHILDREN | WS_CLIPSIBLINGS;
+      /* a temp window is not necessarily a top level window */
+      dwStyle |= (_gdk_parent_root == parent ? WS_POPUP : WS_CHILDWINDOW);
       dwExStyle |= WS_EX_TOOLWINDOW;
       break;
+
     case GDK_WINDOW_ROOT:
       g_error ("cannot make windows of type GDK_WINDOW_ROOT");
       break;
-    case GDK_WINDOW_PIXMAP:
-      g_error ("cannot make windows of type GDK_WINDOW_PIXMAP (use gdk_pixmap_new)");
-      break;
     }
 
   klass = RegisterGdkClass (private->window_type);
-  if (!klass)
-    g_error ("RegisterClassEx failed");
 
   if (private->window_type != GDK_WINDOW_CHILD)
     {
@@ -391,11 +568,10 @@ gdk_window_new (GdkWindow     *parent,
          rect.top = y;
        }
 
-      rect.right = rect.left + private->width;
-      rect.bottom = rect.top + private->height;
+      rect.right = rect.left + impl->width;
+      rect.bottom = rect.top + impl->height;
 
-      if (!SafeAdjustWindowRectEx (&rect, dwStyle, FALSE, dwExStyle))
-       g_warning ("gdk_window_new: AdjustWindowRectEx failed");
+      SafeAdjustWindowRectEx (&rect, dwStyle, FALSE, dwExStyle);
 
       if (x != CW_USEDEFAULT)
        {
@@ -407,40 +583,82 @@ gdk_window_new (GdkWindow     *parent,
     }
   else
     {
-      width = private->width;
-      height = private->height;
+      width = impl->width;
+      height = impl->height;
     }
 
-  private->xwindow =
+  mbtitle = g_locale_from_utf8 (title, -1, NULL, NULL, NULL);
+  
+#ifdef WITHOUT_WM_CREATE
+  draw_impl->handle = CreateWindowEx (dwExStyle,
+                                     MAKEINTRESOURCE(klass),
+                                     mbtitle,
+                                     dwStyle,
+                                     impl->position_info.x, impl->position_info.y, 
+                                     impl->position_info.width, impl->position_info.height,
+                                     hparent,
+                                     NULL,
+                                     gdk_app_hmodule,
+                                     NULL);
+#else
+  {
+  HWND hwndNew =
     CreateWindowEx (dwExStyle,
                    MAKEINTRESOURCE(klass),
-                   title,
+                   mbtitle,
                    dwStyle,
-                   x, y, 
-                   width, height,
-                   xparent,
+                   impl->position_info.x, impl->position_info.y, 
+                   impl->position_info.width, impl->position_info.height,
+                   hparent,
                    NULL,
-                   gdk_ProgInstance,
-                   NULL);
+                   gdk_app_hmodule,
+                   window);
+  if (GDK_WINDOW_HWND (window) != hwndNew)
+    {
+      g_warning("gdk_window_new: gdk_event_translate::WM_CREATE (%p, %p) HWND mismatch.",
+               GDK_WINDOW_HWND (window),
+               hwndNew);
+
+      /* HB: IHMO due to a race condition the handle was increased by
+       * one, which causes much trouble. Because I can't find the 
+       * real bug, try to workaround it ...
+       * To reproduce: compile with MSVC 5, DEBUG=1
+       */
+# if 0
+      gdk_win32_handle_table_remove (GDK_WINDOW_HWND (window));
+      GDK_WINDOW_HWND (window) = hwndNew;
+      gdk_win32_handle_table_insert (&GDK_WINDOW_HWND (window), window);
+# else
+      /* the old behaviour, but with warning */
+      GDK_WINDOW_HWND (window) = hwndNew;
+# endif
+
+    }
+  }
+  gdk_drawable_ref (window);
+  gdk_win32_handle_table_insert (&GDK_WINDOW_HWND (window), window);
+#endif
+
   GDK_NOTE (MISC,
-           g_print ("gdk_window_create: %s %s %#x %#x %dx%d@+%d+%d %#x = %#x\n",
-                    (private->window_type == GDK_WINDOW_TOPLEVEL ? "TOPLEVEL" :
-                     (private->window_type == GDK_WINDOW_CHILD ? "CHILD" :
-                      (private->window_type == GDK_WINDOW_DIALOG ? "DIALOG" :
-                       (private->window_type == GDK_WINDOW_TEMP ? "TEMP" :
-                        "???")))),
-                    title,
-                    dwStyle,
-                    private->event_mask,
+           g_print ("... \"%s\" %dx%d@+%d+%d %p = %p\n",
+                    mbtitle,
                     width, height, (x == CW_USEDEFAULT ? -9999 : x), y, 
-                    xparent,
-                    private->xwindow));
+                    hparent,
+                    GDK_WINDOW_HWND (window)));
+
+  g_free (mbtitle);
 
-  gdk_window_ref (window);
-  gdk_xid_table_insert (&private->xwindow, window);
+  if (draw_impl->handle == NULL)
+    {
+      WIN32_API_FAILED ("CreateWindowEx");
+      g_object_unref ((GObject *) window);
+      return NULL;
+    }
 
-  if (private->colormap)
-    gdk_colormap_ref (private->colormap);
+#ifdef WITHOUT_WM_CREATE
+  gdk_drawable_ref (window);
+  gdk_win32_handle_table_insert (&GDK_WINDOW_HWND (window), window);
+#endif
 
   gdk_window_set_cursor (window, ((attributes_mask & GDK_WA_CURSOR) ?
                                  (attributes->cursor) :
@@ -450,326 +668,248 @@ gdk_window_new (GdkWindow     *parent,
 }
 
 GdkWindow *
-gdk_window_foreign_new (guint32 anid)
+gdk_window_foreign_new (GdkNativeWindow anid)
 {
   GdkWindow *window;
-  GdkWindowPrivate *private;
-  GdkWindowPrivate *parent_private;
+  GdkWindowObject *private;
+  GdkWindowImplWin32 *impl;
+  GdkDrawableImplWin32 *draw_impl;
+
   HANDLE parent;
   RECT rect;
   POINT point;
 
-  private = g_new (GdkWindowPrivate, 1);
-  window = (GdkWindow*) private;
-
-  parent = GetParent ((HWND) anid);
-  private->parent = gdk_xid_table_lookup (parent);
-
-  parent_private = (GdkWindowPrivate *)private->parent;
+  window = g_object_new (GDK_TYPE_WINDOW, NULL);
+  private = (GdkWindowObject *)window;
+  impl = GDK_WINDOW_IMPL_WIN32 (private->impl);
+  draw_impl = GDK_DRAWABLE_IMPL_WIN32 (private->impl);
+  draw_impl->wrapper = GDK_DRAWABLE (window);
+  parent = GetParent ((HWND)anid);
+  
+  private->parent = gdk_win32_handle_table_lookup ((GdkNativeWindow) parent);
+  if (!private->parent || GDK_WINDOW_TYPE (private->parent) == GDK_WINDOW_FOREIGN)
+    private->parent = (GdkWindowObject *)_gdk_parent_root;
   
-  if (parent_private)
-    parent_private->children = g_list_prepend (parent_private->children, window);
+  private->parent->children = g_list_prepend (private->parent->children, window);
 
-  private->xwindow = (HWND) anid;
+  draw_impl->handle = (HWND) anid;
   GetClientRect ((HWND) anid, &rect);
   point.x = rect.left;
   point.y = rect.right;
   ClientToScreen ((HWND) anid, &point);
-  if (parent != HWND_DESKTOP)
+  if (parent != gdk_root_window)
     ScreenToClient (parent, &point);
   private->x = point.x;
   private->y = point.y;
-  private->width = rect.right - rect.left;
-  private->height = rect.bottom - rect.top;
-  private->resize_count = 0;
-  private->ref_count = 1;
+  impl->width = rect.right - rect.left;
+  impl->height = rect.bottom - rect.top;
   private->window_type = GDK_WINDOW_FOREIGN;
   private->destroyed = FALSE;
-  private->mapped = IsWindowVisible (private->xwindow);
-  private->guffaw_gravity = FALSE;
-  private->extension_events = 0;
-  private->extension_events_selected = FALSE;
-
-  private->colormap = NULL;
-
-  private->filters = NULL;
-  private->children = NULL;
-
-  window->user_data = NULL;
+  private->event_mask = GDK_ALL_EVENTS_MASK; /* XXX */
+  if (IsWindowVisible ((HWND) anid))
+    private->state &= (~GDK_WINDOW_STATE_WITHDRAWN);
+  else
+    private->state |= GDK_WINDOW_STATE_WITHDRAWN;
+  private->depth = gdk_visual_get_system ()->depth;
 
-  gdk_window_ref (window);
-  gdk_xid_table_insert (&private->xwindow, window);
+  gdk_drawable_ref (window);
+  gdk_win32_handle_table_insert (&GDK_WINDOW_HWND (window), window);
 
   return window;
 }
 
-/* Call this function when you want a window and all its children to
- * disappear.  When xdestroy is true, a request to destroy the XWindow
- * is sent out.  When it is false, it is assumed that the XWindow has
- * been or will be destroyed by destroying some ancestor of this
- * window.
- */
-static void
-gdk_window_internal_destroy (GdkWindow *window,
-                            gboolean   xdestroy,
-                            gboolean   our_destroy)
+GdkWindow*
+gdk_window_lookup (GdkNativeWindow hwnd)
 {
-  GdkWindowPrivate *private;
-  GdkWindowPrivate *temp_private;
-  GdkWindow *temp_window;
-  GList *children;
-  GList *tmp;
+  return (GdkWindow*) gdk_win32_handle_table_lookup (hwnd); 
+}
 
-  g_return_if_fail (window != NULL);
+void
+_gdk_windowing_window_destroy (GdkWindow *window,
+                              gboolean   recursing,
+                              gboolean   foreign_destroy)
+{
+  GdkWindowObject *private = (GdkWindowObject *)window;
 
-  private = (GdkWindowPrivate*) window;
+  g_return_if_fail (GDK_IS_WINDOW (window));
+  
+  GDK_NOTE (MISC, g_print ("_gdk_windowing_window_destroy %p\n",
+                          GDK_WINDOW_HWND (window)));
 
-  GDK_NOTE (MISC, g_print ("gdk_window_internal_destroy %#x\n",
-                          private->xwindow));
+  if (private->extension_events != 0)
+    gdk_input_window_destroy (window);
 
-  switch (private->window_type)
+  if (private->window_type == GDK_WINDOW_FOREIGN)
     {
-    case GDK_WINDOW_TOPLEVEL:
-    case GDK_WINDOW_CHILD:
-    case GDK_WINDOW_DIALOG:
-    case GDK_WINDOW_TEMP:
-    case GDK_WINDOW_FOREIGN:
-      if (!private->destroyed)
+      if (!foreign_destroy && (private->parent != NULL))
        {
-         if (private->parent)
-           {
-             GdkWindowPrivate *parent_private = (GdkWindowPrivate *)private->parent;
-             if (parent_private->children)
-               parent_private->children = g_list_remove (parent_private->children, window);
-           }
-
-         if (private->window_type != GDK_WINDOW_FOREIGN)
-           {
-             children = tmp = private->children;
-             private->children = NULL;
-
-             while (tmp)
-               {
-                 temp_window = tmp->data;
-                 tmp = tmp->next;
-                 
-                 temp_private = (GdkWindowPrivate*) temp_window;
-                 if (temp_private)
-                   gdk_window_internal_destroy (temp_window, FALSE,
-                                                our_destroy);
-               }
-
-             g_list_free (children);
-           }
-
-         if (private->extension_events != 0)
-           gdk_input_window_destroy (window);
-
-         if (private->filters)
-           {
-             tmp = private->filters;
-
-             while (tmp)
-               {
-                 g_free (tmp->data);
-                 tmp = tmp->next;
-               }
-
-             g_list_free (private->filters);
-             private->filters = NULL;
-           }
+         /* It's somebody else's window, but in our hierarchy,
+          * so reparent it to the root window, and then call
+          * DestroyWindow() on it.
+          */
+         gdk_window_hide (window);
+         gdk_window_reparent (window, NULL, 0, 0);
          
-         if (private->window_type == GDK_WINDOW_FOREIGN)
-           {
-             if (our_destroy && (private->parent != NULL))
-               {
-                 /* It's somebody elses window, but in our hierarchy,
-                  * so reparent it to the root window, and then send
-                  * it a delete event, as if we were a WM
-                  */
-                 gdk_window_hide (window);
-                 gdk_window_reparent (window, NULL, 0, 0);
-                 
-                 /* Is this too drastic? Many (most?) applications
-                  * quit if any window receives WM_QUIT I think.
-                  * OTOH, I don't think foreign windows are much
-                  * used, so the question is maybe academic.
-                  */
-                 PostMessage (private->xwindow, WM_QUIT, 0, 0);
-               }
-           }
-         else if (xdestroy)
-           DestroyWindow (private->xwindow);
-
-         if (private->colormap)
-           gdk_colormap_unref (private->colormap);
-
-         private->mapped = FALSE;
-         private->destroyed = TRUE;
+         /* Is this too drastic? Many (most?) applications
+          * quit if any window receives WM_QUIT I think.
+          * OTOH, I don't think foreign windows are much
+          * used, so the question is maybe academic.
+          */
+         PostMessage (GDK_WINDOW_HWND (window), WM_QUIT, 0, 0);
        }
-      break;
-
-    case GDK_WINDOW_ROOT:
-      g_error ("attempted to destroy root window");
-      break;
-
-    case GDK_WINDOW_PIXMAP:
-      g_error ("called gdk_window_destroy on a pixmap (use gdk_pixmap_unref)");
-      break;
     }
-}
-
-/* Like internal_destroy, but also destroys the reference created by
-   gdk_window_new. */
-
-void
-gdk_window_destroy (GdkWindow *window)
-{
-  gdk_window_internal_destroy (window, TRUE, TRUE);
-  gdk_window_unref (window);
-}
-
-/* This function is called when the XWindow is really gone.  */
-
-void
-gdk_window_destroy_notify (GdkWindow *window)
-{
-  GdkWindowPrivate *private;
-
-  g_return_if_fail (window != NULL);
-
-  private = (GdkWindowPrivate*) window;
-
-  GDK_NOTE (EVENTS, g_print ("gdk_window_destroy_notify: %#x  %d\n",
-                            private->xwindow, private->destroyed));
-
-  if (!private->destroyed)
+  else if (!recursing && !foreign_destroy)
     {
-      if (private->window_type == GDK_WINDOW_FOREIGN)
-       gdk_window_internal_destroy (window, FALSE, FALSE);
-      else
-       g_warning ("GdkWindow %#lx unexpectedly destroyed", private->xwindow);
+      private->destroyed = TRUE;
+      DestroyWindow (GDK_WINDOW_HWND (window));
     }
-  
-  gdk_xid_table_remove (private->xwindow);
-  gdk_window_unref (window);
-}
-
-GdkWindow*
-gdk_window_ref (GdkWindow *window)
-{
-  GdkWindowPrivate *private = (GdkWindowPrivate *)window;
-  g_return_val_if_fail (window != NULL, NULL);
-
-  private->ref_count += 1;
-
-  GDK_NOTE (MISC, g_print ("gdk_window_ref %#x %d\n",
-                          private->xwindow, private->ref_count));
-
-  return window;
 }
 
+/* This function is called when the window really gone.
+ */
 void
-gdk_window_unref (GdkWindow *window)
+gdk_window_destroy_notify (GdkWindow *window)
 {
-  GdkWindowPrivate *private = (GdkWindowPrivate *)window;
   g_return_if_fail (window != NULL);
+  g_return_if_fail (GDK_IS_WINDOW (window));
 
-  private->ref_count -= 1;
+  GDK_NOTE (EVENTS,
+           g_print ("gdk_window_destroy_notify: %p  %s\n",
+                    GDK_WINDOW_HWND (window),
+                    (GDK_WINDOW_DESTROYED (window) ? "(destroyed)" : "")));
 
-  GDK_NOTE (MISC, g_print ("gdk_window_unref %#x %d%s\n",
-                          private->xwindow, private->ref_count,
-                          (private->ref_count == 0 ? " freeing" : "")));
-
-  if (private->ref_count == 0)
+  if (!GDK_WINDOW_DESTROYED (window))
     {
-      if (private->bg_type == GDK_WIN32_BG_PIXMAP && private->bg_pixmap != NULL)
-       gdk_pixmap_unref (private->bg_pixmap);
+      if (GDK_WINDOW_TYPE(window) != GDK_WINDOW_FOREIGN)
+       g_warning ("window %p unexpectedly destroyed",
+                  GDK_WINDOW_HWND (window));
 
-      if (!private->destroyed)
-       {
-         if (private->window_type == GDK_WINDOW_FOREIGN)
-           gdk_xid_table_remove (private->xwindow);
-         else
-           g_warning ("losing last reference to undestroyed window");
-       }
-      g_dataset_destroy (window);
-      g_free (window);
+      _gdk_window_destroy (window, TRUE);
     }
+  
+  gdk_win32_handle_table_remove (GDK_WINDOW_HWND (window));
+  gdk_drawable_unref (window);
 }
 
-void
-gdk_window_show (GdkWindow *window)
+static void
+show_window_internal (GdkWindow *window,
+                      gboolean   raise)
 {
-  GdkWindowPrivate *private;
-
-  g_return_if_fail (window != NULL);
+  GdkWindowObject *private;
+  
+  private = GDK_WINDOW_OBJECT (window);
 
-  private = (GdkWindowPrivate*) window;
   if (!private->destroyed)
     {
-      GDK_NOTE (MISC, g_print ("gdk_window_show: %#x\n", private->xwindow));
+      GDK_NOTE (MISC, g_print ("gdk_window_show: %p\n",
+                              GDK_WINDOW_HWND (window)));
 
-      private->mapped = TRUE;
-      if (private->window_type == GDK_WINDOW_TEMP)
+      private->state &= (~GDK_WINDOW_STATE_WITHDRAWN);
+      if (GDK_WINDOW_TYPE (window) == GDK_WINDOW_TEMP)
        {
-         ShowWindow (private->xwindow, SW_SHOWNOACTIVATE);
-         SetWindowPos (private->xwindow, HWND_TOPMOST, 0, 0, 0, 0,
+         ShowWindow (GDK_WINDOW_HWND (window), SW_SHOWNOACTIVATE);
+         SetWindowPos (GDK_WINDOW_HWND (window), HWND_TOPMOST, 0, 0, 0, 0,
                        SWP_NOACTIVATE | SWP_NOMOVE | SWP_NOSIZE);
 #if 0
-         ShowWindow (private->xwindow, SW_HIDE); /* Don't put on toolbar */
+         /* Don't put on toolbar */
+         ShowWindow (GDK_WINDOW_HWND (window), SW_HIDE);
 #endif
        }
       else
        {
-         ShowWindow (private->xwindow, SW_SHOWNORMAL);
-         ShowWindow (private->xwindow, SW_RESTORE);
-         SetForegroundWindow (private->xwindow);
+          if (GetWindowLong (GDK_WINDOW_HWND (window), GWL_EXSTYLE) & WS_EX_TRANSPARENT)
+           {
+             SetWindowPos(GDK_WINDOW_HWND (window), HWND_TOP, 0, 0, 0, 0,
+                          SWP_SHOWWINDOW | SWP_NOREDRAW | SWP_NOMOVE | SWP_NOSIZE);
+           }
+          else
+            {
+             GdkWindow *parent = GDK_WINDOW (private->parent);
+
+             /* Todo: GDK_WINDOW_STATE_STICKY */
+             if (private->state & GDK_WINDOW_STATE_ICONIFIED)
+               ShowWindow (GDK_WINDOW_HWND (window), SW_SHOWMINIMIZED);
+             else if (private->state & GDK_WINDOW_STATE_MAXIMIZED)
+               ShowWindow (GDK_WINDOW_HWND (window), SW_SHOWMAXIMIZED);
+             else
+               {
+                 ShowWindow (GDK_WINDOW_HWND (window), SW_SHOWNORMAL);
+                 ShowWindow (GDK_WINDOW_HWND (window), SW_RESTORE);
+               }
+              if (parent == _gdk_parent_root)
+                SetForegroundWindow (GDK_WINDOW_HWND (window));
+             if (raise)
+               BringWindowToTop (GDK_WINDOW_HWND (window));
 #if 0
-         ShowOwnedPopups (private->xwindow, TRUE);
+             ShowOwnedPopups (GDK_WINDOW_HWND (window), TRUE);
 #endif
+           }
        }
     }
 }
 
 void
-gdk_window_hide (GdkWindow *window)
+gdk_window_show_unraised (GdkWindow *window)
 {
-  GdkWindowPrivate *private;
+  g_return_if_fail (GDK_IS_WINDOW (window));
+  
+  show_window_internal (window, FALSE);
+}
 
+void
+gdk_window_show (GdkWindow *window)
+{
+  g_return_if_fail (GDK_IS_WINDOW (window));
+
+  show_window_internal (window, TRUE);
+}
+
+void
+gdk_window_hide (GdkWindow *window)
+{
+  GdkWindowObject *private;
+  
   g_return_if_fail (window != NULL);
 
-  private = (GdkWindowPrivate*) window;
+  private = (GdkWindowObject*) window;
   if (!private->destroyed)
     {
-      GDK_NOTE (MISC, g_print ("gdk_window_hide: %#x\n", private->xwindow));
+      GDK_NOTE (MISC, g_print ("gdk_window_hide: %p\n",
+                              GDK_WINDOW_HWND (window)));
 
-      private->mapped = FALSE;
-      if (private->window_type == GDK_WINDOW_TOPLEVEL)
-       ShowOwnedPopups (private->xwindow, FALSE);
-#if 1
-      ShowWindow (private->xwindow, SW_HIDE);
-#elif 0
-      ShowWindow (private->xwindow, SW_MINIMIZE);
-#else
-      CloseWindow (private->xwindow);
-#endif
+      private->state |= GDK_WINDOW_STATE_WITHDRAWN;
+
+      _gdk_window_clear_update_area (window);
+
+      if (GDK_WINDOW_TYPE (window) == GDK_WINDOW_TOPLEVEL)
+       ShowOwnedPopups (GDK_WINDOW_HWND (window), FALSE);
+
+      if (GetWindowLong (GDK_WINDOW_HWND (window), GWL_EXSTYLE) & WS_EX_TRANSPARENT)
+       {
+         SetWindowPos(GDK_WINDOW_HWND (window), HWND_BOTTOM, 0, 0, 0, 0,
+                      SWP_HIDEWINDOW | SWP_NOREDRAW | SWP_NOZORDER | SWP_NOMOVE | SWP_NOSIZE);
+       }
+      else
+       {
+         ShowWindow (GDK_WINDOW_HWND (window), SW_HIDE);
+       }
     }
 }
 
 void
 gdk_window_withdraw (GdkWindow *window)
 {
-  GdkWindowPrivate *private;
-
+  GdkWindowObject *private;
+  
   g_return_if_fail (window != NULL);
-
-  private = (GdkWindowPrivate*) window;
+  
+  private = (GdkWindowObject*) window;
   if (!private->destroyed)
     {
-      GDK_NOTE (MISC, g_print ("gdk_window_withdraw: %#x\n", private->xwindow));
+      GDK_NOTE (MISC, g_print ("gdk_window_withdraw: %p\n",
+                              GDK_WINDOW_HWND (window)));
 
-      gdk_window_hide (window);        /* XXX */
+      gdk_window_hide (window);        /* ??? */
     }
 }
 
@@ -778,59 +918,26 @@ gdk_window_move (GdkWindow *window,
                 gint       x,
                 gint       y)
 {
-  GdkWindowPrivate *private;
+  GdkWindowObject *private = (GdkWindowObject *)window;
+  GdkWindowImplWin32 *impl;
 
   g_return_if_fail (window != NULL);
+  g_return_if_fail (GDK_IS_WINDOW (window));
 
-  private = (GdkWindowPrivate*) window;
-  if (!private->destroyed)
+  impl = GDK_WINDOW_IMPL_WIN32 (private->impl);
+  
+  if (!GDK_WINDOW_DESTROYED (window))
     {
-      RECT rect;
-
-      GDK_NOTE (MISC, g_print ("gdk_window_move: %#x +%d+%d\n",
-                              private->xwindow, x, y));
-
-      GetClientRect (private->xwindow, &rect);
-
-      if (private->window_type != GDK_WINDOW_CHILD)
-       {
-         POINT ptTL, ptBR;
-         DWORD dwStyle;
-         DWORD dwExStyle;
-
-         ptTL.x = 0;
-         ptTL.y = 0; 
-         ClientToScreen (private->xwindow, &ptTL);
-         rect.left = x;
-         rect.top = y;
-
-         ptBR.x = rect.right;
-         ptBR.y = rect.bottom;
-         ClientToScreen (private->xwindow, &ptBR);
-         rect.right = x + ptBR.x - ptTL.x;
-         rect.bottom = y + ptBR.y - ptTL.y;
-
-         dwStyle = GetWindowLong (private->xwindow, GWL_STYLE);
-         dwExStyle = GetWindowLong (private->xwindow, GWL_EXSTYLE);
-         if (!SafeAdjustWindowRectEx (&rect, dwStyle, FALSE, dwExStyle))
-           g_warning ("gdk_window_move: AdjustWindowRectEx failed");
-
-         x = rect.left;
-         y = rect.top;
-       }
+      if (GDK_WINDOW_TYPE (private) == GDK_WINDOW_CHILD)
+       _gdk_window_move_resize_child (window, x, y,
+                                      impl->width, impl->height);
       else
        {
-         private->x = x;
-         private->y = y;
+         if (!SetWindowPos (GDK_WINDOW_HWND (window), NULL,
+                            x, y, impl->width, impl->height,
+                            SWP_NOACTIVATE | SWP_NOSIZE | SWP_NOZORDER))
+           WIN32_API_FAILED ("SetWindowPos");
        }
-      GDK_NOTE (MISC, g_print ("...MoveWindow(%#x,%dx%d@+%d+%d)\n",
-                              private->xwindow,
-                              rect.right - rect.left, rect.bottom - rect.top,
-                              x, y));
-      if (!MoveWindow (private->xwindow,
-                      x, y, rect.right - rect.left, rect.bottom - rect.top,
-                      TRUE))
-       g_warning ("gdk_window_move: MoveWindow failed");
     }
 }
 
@@ -839,28 +946,26 @@ gdk_window_resize (GdkWindow *window,
                   gint       width,
                   gint       height)
 {
-  GdkWindowPrivate *private;
+  GdkWindowObject *private = (GdkWindowObject*) window;
+  GdkWindowImplWin32 *impl;
+  int x, y;
 
   g_return_if_fail (window != NULL);
+  g_return_if_fail (GDK_IS_WINDOW (window));
 
-  if ((gint16) width < 1)
+  if (width < 1)
     width = 1;
-  if ((gint16) height < 1)
+  if (height < 1)
     height = 1;
 
-  private = (GdkWindowPrivate*) window;
-
-  if (!private->destroyed &&
-      ((private->resize_count > 0) ||
-       (private->width != (guint16) width) ||
-       (private->height != (guint16) height)))
+  impl = GDK_WINDOW_IMPL_WIN32 (private->impl);
+  
+  if (!GDK_WINDOW_DESTROYED (window))
     {
-      int x, y;
-
-      GDK_NOTE (MISC, g_print ("gdk_window_resize: %#x %dx%d\n",
-                              private->xwindow, width, height));
-      
-      if (private->window_type != GDK_WINDOW_CHILD)
+      if (GDK_WINDOW_TYPE (private) == GDK_WINDOW_CHILD)
+       _gdk_window_move_resize_child (window, private->x, private->y,
+                                      width, height);
+      else
        {
          POINT pt;
          RECT rect;
@@ -869,38 +974,27 @@ gdk_window_resize (GdkWindow *window,
 
          pt.x = 0;
          pt.y = 0; 
-         ClientToScreen (private->xwindow, &pt);
+         ClientToScreen (GDK_WINDOW_HWND (window), &pt);
          rect.left = pt.x;
          rect.top = pt.y;
          rect.right = pt.x + width;
          rect.bottom = pt.y + height;
 
-         dwStyle = GetWindowLong (private->xwindow, GWL_STYLE);
-         dwExStyle = GetWindowLong (private->xwindow, GWL_EXSTYLE);
+         dwStyle = GetWindowLong (GDK_WINDOW_HWND (window), GWL_STYLE);
+         dwExStyle = GetWindowLong (GDK_WINDOW_HWND (window), GWL_EXSTYLE);
          if (!AdjustWindowRectEx (&rect, dwStyle, FALSE, dwExStyle))
-           g_warning ("gdk_window_resize: AdjustWindowRectEx failed");
+           WIN32_API_FAILED ("AdjustWindowRectEx");
 
          x = rect.left;
          y = rect.top;
          width = rect.right - rect.left;
          height = rect.bottom - rect.top;
+         if (!SetWindowPos (GDK_WINDOW_HWND (window), NULL,
+                            x, y, width, height,
+                            SWP_NOACTIVATE | SWP_NOMOVE | SWP_NOZORDER))
+           WIN32_API_FAILED ("SetWindowPos");
        }
-      else
-       {
-         x = private->x;
-         y = private->y;
-         private->width = width;
-         private->height = height;
-       }
-
       private->resize_count += 1;
-
-      GDK_NOTE (MISC, g_print ("...MoveWindow(%#x,%dx%d@+%d+%d)\n",
-                              private->xwindow, width, height, x, y));
-      if (!MoveWindow (private->xwindow,
-                      x, y, width, height,
-                      TRUE))
-       g_warning ("gdk_window_resize: MoveWindow failed");
     }
 }
 
@@ -911,66 +1005,53 @@ gdk_window_move_resize (GdkWindow *window,
                        gint       width,
                        gint       height)
 {
-  GdkWindowPrivate *private;
+  GdkWindowObject *private = (GdkWindowObject*) window;
+  GdkWindowImplWin32 *impl;
 
   g_return_if_fail (window != NULL);
+  g_return_if_fail (GDK_IS_WINDOW (window));
 
-  if ((gint16) width < 1)
+  if (width < 1)
     width = 1;
-  if ((gint16) height < 1)
+  if (height < 1)
     height = 1;
+  
+  impl = GDK_WINDOW_IMPL_WIN32 (private->impl);
 
-  private = (GdkWindowPrivate*) window;
   if (!private->destroyed)
     {
       RECT rect;
       DWORD dwStyle;
       DWORD dwExStyle;
 
-      GDK_NOTE (MISC, g_print ("gdk_window_move_resize: %#x %dx%d@+%d+%d\n",
-                              private->xwindow, width, height, x, y));
+      GDK_NOTE (MISC, g_print ("gdk_window_move_resize: %p %dx%d@+%d+%d\n",
+                              GDK_WINDOW_HWND (window),
+                              width, height, x, y));
       
-      rect.left = x;
-      rect.top = y;
-      rect.right = x + width;
-      rect.bottom = y + height;
-
-      dwStyle = GetWindowLong (private->xwindow, GWL_STYLE);
-      dwExStyle = GetWindowLong (private->xwindow, GWL_EXSTYLE);
-      if (!AdjustWindowRectEx (&rect, dwStyle, FALSE, dwExStyle))
-       g_warning ("gdk_window_move_resize: AdjustWindowRectEx failed");
-
-      if (private->window_type == GDK_WINDOW_CHILD)
-       {
-         private->x = x;
-         private->y = y;
-         private->width = width;
-         private->height = height;
-       }
-      GDK_NOTE (MISC, g_print ("...MoveWindow(%#x,%dx%d@+%d+%d)\n",
-                              private->xwindow,
-                              rect.right - rect.left, rect.bottom - rect.top,
-                              rect.left, rect.top));
-      if (!MoveWindow (private->xwindow,
-                      rect.left, rect.top,
-                      rect.right - rect.left, rect.bottom - rect.top,
-                      TRUE))
-       g_warning ("gdk_window_move_resize: MoveWindow failed");
-
-      if (private->guffaw_gravity)
+      if (GDK_WINDOW_TYPE (private) == GDK_WINDOW_CHILD)
+       _gdk_window_move_resize_child (window, x, y, width, height);
+      else
        {
-         GList *tmp_list = private->children;
-         while (tmp_list)
-           {
-             GdkWindowPrivate *child_private = tmp_list->data;
-             
-             child_private->x -= x - private->x;
-             child_private->y -= y - private->y;
-             
-             tmp_list = tmp_list->next;
-           }
+         rect.left = x;
+         rect.top = y;
+         rect.right = x + width;
+         rect.bottom = y + height;
+
+         dwStyle = GetWindowLong (GDK_WINDOW_HWND (window), GWL_STYLE);
+         dwExStyle = GetWindowLong (GDK_WINDOW_HWND (window), GWL_EXSTYLE);
+         if (!AdjustWindowRectEx (&rect, dwStyle, FALSE, dwExStyle))
+           WIN32_API_FAILED ("AdjustWindowRectEx");
+
+         GDK_NOTE (MISC, g_print ("...SetWindowPos(%p,%ldx%ld@+%ld+%ld)\n",
+                                  GDK_WINDOW_HWND (window),
+                                  rect.right - rect.left, rect.bottom - rect.top,
+                                  rect.left, rect.top));
+         if (!SetWindowPos (GDK_WINDOW_HWND (window), NULL,
+                            rect.left, rect.top,
+                            rect.right - rect.left, rect.bottom - rect.top,
+                            SWP_NOACTIVATE | SWP_NOZORDER))
+           WIN32_API_FAILED ("SetWindowPos");
        }
-      
     }
 }
 
@@ -980,38 +1061,49 @@ gdk_window_reparent (GdkWindow *window,
                     gint       x,
                     gint       y)
 {
-  GdkWindowPrivate *window_private;
-  GdkWindowPrivate *parent_private;
-  GdkWindowPrivate *old_parent_private;
+  GdkWindowObject *window_private;
+  GdkWindowObject *parent_private;
+  GdkWindowObject *old_parent_private;
+  GdkWindowImplWin32 *impl;
 
   g_return_if_fail (window != NULL);
+  g_return_if_fail (GDK_IS_WINDOW (window));
+  g_return_if_fail (new_parent == NULL || GDK_IS_WINDOW (new_parent));
+  g_return_if_fail (GDK_WINDOW_TYPE (window) != GDK_WINDOW_ROOT);
 
   if (!new_parent)
-    new_parent = (GdkWindow*) &gdk_root_parent;
+    new_parent = _gdk_parent_root;
 
-  window_private = (GdkWindowPrivate*) window;
-  old_parent_private = (GdkWindowPrivate*)window_private->parent;
-  parent_private = (GdkWindowPrivate*) new_parent;
+  window_private = (GdkWindowObject*) window;
+  old_parent_private = (GdkWindowObject *) window_private->parent;
+  parent_private = (GdkWindowObject*) new_parent;
+  impl = GDK_WINDOW_IMPL_WIN32 (window_private->impl);
 
-  if (!window_private->destroyed && !parent_private->destroyed)
+  if (!GDK_WINDOW_DESTROYED (window) && !GDK_WINDOW_DESTROYED (new_parent))
     {
-      GDK_NOTE (MISC, g_print ("gdk_window_reparent: %#x %#x\n",
-                              window_private->xwindow,
-                              parent_private->xwindow));
-      if (!SetParent (window_private->xwindow, parent_private->xwindow))
-       g_warning ("gdk_window_reparent: SetParent failed");
-
-      if (!MoveWindow (window_private->xwindow,
-                      x, y,
-                      window_private->width, window_private->height,
-                      TRUE))
-       g_warning ("gdk_window_reparent: MoveWindow failed");
+      GDK_NOTE (MISC, g_print ("gdk_window_reparent: %p %p\n",
+                              GDK_WINDOW_HWND (window),
+                              GDK_WINDOW_HWND (new_parent)));
+      if (!SetParent (GDK_WINDOW_HWND (window),
+                     GDK_WINDOW_HWND (new_parent)))
+       WIN32_API_FAILED ("SetParent");
+
+      if (!MoveWindow (GDK_WINDOW_HWND (window),
+                      x, y, impl->width, impl->height, TRUE))
+       WIN32_API_FAILED ("MoveWindow");
     }
+
+  /* From here on, we treat parents of type GDK_WINDOW_FOREIGN like
+   * the root window
+   */
+  if (GDK_WINDOW_TYPE (new_parent) == GDK_WINDOW_FOREIGN)
+    new_parent = _gdk_parent_root;
   
-  window_private->parent = new_parent;
+  window_private->parent = (GdkWindowObject *)new_parent;
 
   if (old_parent_private)
-    old_parent_private->children = g_list_remove (old_parent_private->children, window);
+    old_parent_private->children =
+      g_list_remove (old_parent_private->children, window);
 
   if ((old_parent_private &&
        (!old_parent_private->guffaw_gravity != !parent_private->guffaw_gravity)) ||
@@ -1019,173 +1111,105 @@ gdk_window_reparent (GdkWindow *window,
     gdk_window_set_static_win_gravity (window, parent_private->guffaw_gravity);
   
   parent_private->children = g_list_prepend (parent_private->children, window);
+  _gdk_window_init_position (GDK_WINDOW (window_private));
 }
 
 void
-gdk_window_clear (GdkWindow *window)
-{
-  GdkWindowPrivate *private;
-
-  g_return_if_fail (window != NULL);
-
-  private = (GdkWindowPrivate*) window;
-
-  if (!private->destroyed)
-    {
-      gdk_window_clear_area (window, 0, 0, private->width, private->height);
-    }
-}
-
-
-void
-gdk_window_clear_area (GdkWindow *window,
-                      gint       x,
-                      gint       y,
-                      gint       width,
-                      gint       height)
+_gdk_windowing_window_clear_area (GdkWindow *window,
+                                 gint       x,
+                                 gint       y,
+                                 gint       width,
+                                 gint       height)
 {
-  GdkWindowPrivate *private;
-  
+  GdkWindowImplWin32 *impl;
+
   g_return_if_fail (window != NULL);
+  g_return_if_fail (GDK_IS_WINDOW (window));
   
-  private = (GdkWindowPrivate*) window;
-  
-  if (!private->destroyed)
+  impl = GDK_WINDOW_IMPL_WIN32 (GDK_WINDOW_OBJECT (window)->impl);
+
+  if (!GDK_WINDOW_DESTROYED (window))
     {
       HDC hdc;
 
-      if (width == -1)
-       width = G_MAXSHORT/2;           /* Yeah, right */
-      if (height == -1)
-       height = G_MAXSHORT/2;
-      GDK_NOTE (MISC, g_print ("gdk_window_clear_area: %#x %dx%d@+%d+%d\n",
-                              private->xwindow, width, height, x, y));
-      hdc = GetDC (private->xwindow);
-      IntersectClipRect (hdc, x, y, x + width, y + height);
-      SendMessage (private->xwindow, WM_ERASEBKGND, (WPARAM) hdc, 0);
-      ReleaseDC (private->xwindow, hdc);
+      if (width == 0)
+       width = impl->width - x;
+      if (height == 0)
+       height = impl->height - y;
+      GDK_NOTE (MISC, g_print ("_gdk_windowing_window_clear_area: "
+                              "%p %dx%d@+%d+%d\n",
+                              GDK_WINDOW_HWND (window),
+                              width, height, x, y));
+      hdc = GetDC (GDK_WINDOW_HWND (window));
+      IntersectClipRect (hdc, x, y, x + width + 1, y + height + 1);
+      SendMessage (GDK_WINDOW_HWND (window), WM_ERASEBKGND, (WPARAM) hdc, 0);
+      if (!ReleaseDC (GDK_WINDOW_HWND (window), hdc))
+       WIN32_GDI_FAILED ("ReleaseDC");
     }
 }
 
 void
-gdk_window_clear_area_e (GdkWindow *window,
-                        gint       x,
-                        gint       y,
-                        gint       width,
-                        gint       height)
+_gdk_windowing_window_clear_area_e (GdkWindow *window,
+                                   gint       x,
+                                   gint       y,
+                                   gint       width,
+                                   gint       height)
 {
-  GdkWindowPrivate *private;
-  
   g_return_if_fail (window != NULL);
+  g_return_if_fail (GDK_IS_WINDOW (window));
   
-  private = (GdkWindowPrivate*) window;
-  
-  if (!private->destroyed)
+  if (!GDK_WINDOW_DESTROYED (window))
     {
       RECT rect;
 
-      GDK_NOTE (MISC, g_print ("gdk_window_clear_area_e: %#x %dx%d@+%d+%d\n",
-                              private->xwindow, width, height, x, y));
+      GDK_NOTE (MISC, g_print ("_gdk_windowing_window_clear_area_e: "
+                              "%p %dx%d@+%d+%d\n",
+                              GDK_WINDOW_HWND (window),
+                              width, height, x, y));
 
       rect.left = x;
-      rect.right = x + width;
+      rect.right = x + width + 1;
       rect.top = y;
-      rect.bottom = y + height;
-      if (!InvalidateRect (private->xwindow, &rect, TRUE))
-       g_warning ("gdk_window_clear_area_e: InvalidateRect failed");
-      UpdateWindow (private->xwindow);
-    }
-}
-
-void
-gdk_window_copy_area (GdkWindow    *window,
-                     GdkGC        *gc,
-                     gint          x,
-                     gint          y,
-                     GdkWindow    *source_window,
-                     gint          source_x,
-                     gint          source_y,
-                     gint          width,
-                     gint          height)
-{
-  GdkWindowPrivate *src_private;
-  GdkWindowPrivate *dest_private;
-  GdkGCPrivate *gc_private;
-  
-  g_return_if_fail (window != NULL);
-  g_return_if_fail (gc != NULL);
-  
-  if (source_window == NULL)
-    source_window = window;
-  
-  src_private = (GdkWindowPrivate*) source_window;
-  dest_private = (GdkWindowPrivate*) window;
-  gc_private = (GdkGCPrivate*) gc;
-  
-  if (!src_private->destroyed && !dest_private->destroyed)
-    {
-      HDC hdcDest, hdcSrc;
-
-      if ((hdcDest = GetDC (dest_private->xwindow)) == NULL)
-       g_warning ("gdk_window_copy_area: GetDC failed");
-
-      if ((hdcSrc = GetDC (src_private->xwindow)) == NULL)
-       g_warning ("gdk_window_copy_area: GetDC failed");
-
-      if (!BitBlt (hdcDest, x, y, width, height, hdcSrc, source_x, source_y, SRCCOPY))
-       g_warning ("gdk_window_copy_area: BitBlt failed");
-
-      ReleaseDC (dest_private->xwindow, hdcDest);
-      ReleaseDC (src_private->xwindow, hdcSrc);
+      rect.bottom = y + height + 1;
+      if (!InvalidateRect (GDK_WINDOW_HWND (window), &rect, TRUE))
+       WIN32_GDI_FAILED ("InvalidateRect");
+      UpdateWindow (GDK_WINDOW_HWND (window));
     }
 }
 
 void
 gdk_window_raise (GdkWindow *window)
 {
-  GdkWindowPrivate *private;
-  
   g_return_if_fail (window != NULL);
+  g_return_if_fail (GDK_IS_WINDOW (window));
   
-  private = (GdkWindowPrivate*) window;
-  
-  if (!private->destroyed)
+  if (!GDK_WINDOW_DESTROYED (window))
     {
-      GDK_NOTE (MISC, g_print ("gdk_window_raise: %#x\n", private->xwindow));
+      GDK_NOTE (MISC, g_print ("gdk_window_raise: %p\n",
+                              GDK_WINDOW_HWND (window)));
 
-      if (!BringWindowToTop (private->xwindow))
-       g_warning ("gdk_window_raise: BringWindowToTop failed");
+      if (!BringWindowToTop (GDK_WINDOW_HWND (window)))
+       WIN32_API_FAILED ("BringWindowToTop");
     }
 }
 
 void
 gdk_window_lower (GdkWindow *window)
 {
-  GdkWindowPrivate *private;
-  
   g_return_if_fail (window != NULL);
+  g_return_if_fail (GDK_IS_WINDOW (window));
   
-  private = (GdkWindowPrivate*) window;
-  
-  if (!private->destroyed)
+  if (!GDK_WINDOW_DESTROYED (window))
     {
-      GDK_NOTE (MISC, g_print ("gdk_window_lower: %#x\n", private->xwindow));
+      GDK_NOTE (MISC, g_print ("gdk_window_lower: %p\n",
+                              GDK_WINDOW_HWND (window)));
 
-      if (!SetWindowPos (private->xwindow, HWND_BOTTOM, 0, 0, 0, 0,
+      if (!SetWindowPos (GDK_WINDOW_HWND (window), HWND_BOTTOM, 0, 0, 0, 0,
                         SWP_NOACTIVATE | SWP_NOMOVE | SWP_NOSIZE))
-       g_warning ("gdk_window_lower: SetWindowPos failed");
+       WIN32_API_FAILED ("SetWindowPos");
     }
 }
 
-void
-gdk_window_set_user_data (GdkWindow *window,
-                         gpointer   user_data)
-{
-  g_return_if_fail (window != NULL);
-  
-  window->user_data = user_data;
-}
-
 void
 gdk_window_set_hints (GdkWindow *window,
                      gint       x,
@@ -1196,7 +1220,7 @@ gdk_window_set_hints (GdkWindow *window,
                      gint       max_height,
                      gint       flags)
 {
-  GdkWindowPrivate *private;
+  GdkWindowImplWin32 *impl;
   WINDOWPLACEMENT size_hints;
   RECT rect;
   DWORD dwStyle;
@@ -1204,106 +1228,84 @@ gdk_window_set_hints (GdkWindow *window,
   int diff;
   
   g_return_if_fail (window != NULL);
+  g_return_if_fail (GDK_IS_WINDOW (window));
   
-  private = (GdkWindowPrivate*) window;
-  if (private->destroyed)
+  if (GDK_WINDOW_DESTROYED (window))
     return;
   
-  GDK_NOTE (MISC, g_print ("gdk_window_set_hints: %#x %dx%d..%dx%d @+%d+%d\n",
-                          private->xwindow,
+  impl = GDK_WINDOW_IMPL_WIN32 (GDK_WINDOW_OBJECT (window)->impl);
+
+  GDK_NOTE (MISC, g_print ("gdk_window_set_hints: %p %dx%d..%dx%d @+%d+%d\n",
+                          GDK_WINDOW_HWND (window),
                           min_width, min_height, max_width, max_height,
                           x, y));
 
-  private->hint_flags = flags;
+  impl->hint_flags = flags;
   size_hints.length = sizeof (size_hints);
 
   if (flags)
     {
-      if (flags & GDK_HINT_POS)
-       if (!GetWindowPlacement (private->xwindow, &size_hints))
-         g_warning ("gdk_window_set_hints: GetWindowPlacement failed");
-       else
-         {
-           GDK_NOTE (MISC, g_print ("...rcNormalPosition:"
-                                    " (%d,%d)--(%d,%d)\n",
-                                    size_hints.rcNormalPosition.left,
-                                    size_hints.rcNormalPosition.top,
-                                    size_hints.rcNormalPosition.right,
-                                    size_hints.rcNormalPosition.bottom));
-           /* What are the corresponding window coordinates for client
-            * area coordinates x, y
-            */
-           rect.left = x;
-           rect.top = y;
-           rect.right = rect.left + 200;       /* dummy */
-           rect.bottom = rect.top + 200;
-           dwStyle = GetWindowLong (private->xwindow, GWL_STYLE);
-           dwExStyle = GetWindowLong (private->xwindow, GWL_EXSTYLE);
-           AdjustWindowRectEx (&rect, dwStyle, FALSE, dwExStyle);
-           size_hints.flags = 0;
-           size_hints.showCmd = SW_SHOWNA;
-
-           /* Set the normal position hint to that location, with unchanged
-            * width and height.
-            */
-           diff = size_hints.rcNormalPosition.left - rect.left;
-           size_hints.rcNormalPosition.left = rect.left;
-           size_hints.rcNormalPosition.right -= diff;
-           diff = size_hints.rcNormalPosition.top - rect.top;
-           size_hints.rcNormalPosition.top = rect.top;
-           size_hints.rcNormalPosition.bottom -= diff;
-           GDK_NOTE (MISC, g_print ("...setting: (%d,%d)--(%d,%d)\n",
-                                    size_hints.rcNormalPosition.left,
-                                    size_hints.rcNormalPosition.top,
-                                    size_hints.rcNormalPosition.right,
-                                    size_hints.rcNormalPosition.bottom));
-           if (!SetWindowPlacement (private->xwindow, &size_hints))
-             g_warning ("gdk_window_set_hints: SetWindowPlacement failed");
-           private->hint_x = rect.left;
-           private->hint_y = rect.top;
-         }
+      GdkGeometry geom;
+      gint        geom_mask = 0;
 
-      if (flags & GDK_HINT_MIN_SIZE)
+      geom.min_width  = min_width;
+      geom.min_height = min_height;
+      geom.max_width  = max_width;
+      geom.max_height = max_height;
+
+      if (flags & GDK_HINT_POS)
        {
-         rect.left = 0;
-         rect.top = 0;
-         rect.right = min_width;
-         rect.bottom = min_height;
-         dwStyle = GetWindowLong (private->xwindow, GWL_STYLE);
-         dwExStyle = GetWindowLong (private->xwindow, GWL_EXSTYLE);
-         AdjustWindowRectEx (&rect, dwStyle, FALSE, dwExStyle);
-         private->hint_min_width = rect.right - rect.left;
-         private->hint_min_height = rect.bottom - rect.top;
-
-         /* Also chek if he current size of the window is in bounds. */
-         GetClientRect (private->xwindow, &rect);
-         if (rect.right < min_width && rect.bottom < min_height)
-           gdk_window_resize (window, min_width, min_height);
-         else if (rect.right < min_width)
-           gdk_window_resize (window, min_width, rect.bottom);
-         else if (rect.bottom < min_height)
-           gdk_window_resize (window, rect.right, min_height);
+         if (!GetWindowPlacement (GDK_WINDOW_HWND (window), &size_hints))
+           WIN32_API_FAILED ("GetWindowPlacement");
+         else
+           {
+             GDK_NOTE (MISC, g_print ("...rcNormalPosition:"
+                                      " (%ld,%ld)--(%ld,%ld)\n",
+                                      size_hints.rcNormalPosition.left,
+                                      size_hints.rcNormalPosition.top,
+                                      size_hints.rcNormalPosition.right,
+                                      size_hints.rcNormalPosition.bottom));
+             /* What are the corresponding window coordinates for client
+              * area coordinates x, y
+              */
+             rect.left = x;
+             rect.top = y;
+             rect.right = rect.left + 200;     /* dummy */
+             rect.bottom = rect.top + 200;
+             dwStyle = GetWindowLong (GDK_WINDOW_HWND (window), GWL_STYLE);
+             dwExStyle = GetWindowLong (GDK_WINDOW_HWND (window), GWL_EXSTYLE);
+             AdjustWindowRectEx (&rect, dwStyle, FALSE, dwExStyle);
+             size_hints.flags = 0;
+             size_hints.showCmd = SW_SHOWNA;
+             
+             /* Set the normal position hint to that location, with unchanged
+              * width and height.
+              */
+             diff = size_hints.rcNormalPosition.left - rect.left;
+             size_hints.rcNormalPosition.left = rect.left;
+             size_hints.rcNormalPosition.right -= diff;
+             diff = size_hints.rcNormalPosition.top - rect.top;
+             size_hints.rcNormalPosition.top = rect.top;
+             size_hints.rcNormalPosition.bottom -= diff;
+             GDK_NOTE (MISC, g_print ("...setting: (%ld,%ld)--(%ld,%ld)\n",
+                                      size_hints.rcNormalPosition.left,
+                                      size_hints.rcNormalPosition.top,
+                                      size_hints.rcNormalPosition.right,
+                                      size_hints.rcNormalPosition.bottom));
+             if (!SetWindowPlacement (GDK_WINDOW_HWND (window), &size_hints))
+               WIN32_API_FAILED ("SetWindowPlacement");
+             impl->hint_x = rect.left;
+             impl->hint_y = rect.top;
+           }
        }
+
+      if (flags & GDK_HINT_MIN_SIZE)
+        geom_mask |= GDK_HINT_MIN_SIZE;
+
       if (flags & GDK_HINT_MAX_SIZE)
-       {
-         rect.left = 0;
-         rect.top = 0;
-         rect.right = max_width;
-         rect.bottom = max_height;
-         dwStyle = GetWindowLong (private->xwindow, GWL_STYLE);
-         dwExStyle = GetWindowLong (private->xwindow, GWL_EXSTYLE);
-         AdjustWindowRectEx (&rect, dwStyle, FALSE, dwExStyle);
-         private->hint_max_width = rect.right - rect.left;
-         private->hint_max_height = rect.bottom - rect.top;
-         /* Again, check if the window is too large currently. */
-         GetClientRect (private->xwindow, &rect);
-         if (rect.right > max_width && rect.bottom > max_height)
-           gdk_window_resize (window, max_width, max_height);
-         else if (rect.right > max_width)
-           gdk_window_resize (window, max_width, rect.bottom);
-         else if (rect.bottom > max_height)
-           gdk_window_resize (window, rect.right, max_height);
-       }
+        geom_mask |= GDK_HINT_MAX_SIZE;
+
+      gdk_window_set_geometry_hints (window, &geom, geom_mask);
     }
 }
 
@@ -1312,25 +1314,26 @@ gdk_window_set_geometry_hints (GdkWindow      *window,
                               GdkGeometry    *geometry,
                               GdkWindowHints  geom_mask)
 {
-  GdkWindowPrivate *private;
+  GdkWindowImplWin32 *impl;
   WINDOWPLACEMENT size_hints;
   RECT rect;
   DWORD dwStyle;
   DWORD dwExStyle;
-  int diff;
+  gint new_width = 0, new_height = 0;
   
   g_return_if_fail (window != NULL);
+  g_return_if_fail (GDK_IS_WINDOW (window));
   
-  private = (GdkWindowPrivate*) window;
-  if (private->destroyed)
+  if (GDK_WINDOW_DESTROYED (window))
     return;
-  
+
+  impl = GDK_WINDOW_IMPL_WIN32 (GDK_WINDOW_OBJECT (window)->impl);
   size_hints.length = sizeof (size_hints);
 
-  private->hint_flags = geom_mask;
+  impl->hint_flags = geom_mask;
 
   if (geom_mask & GDK_HINT_POS)
-    ; /* XXX */
+    ; /* even the X11 mplementation doesn't care */
 
   if (geom_mask & GDK_HINT_MIN_SIZE)
     {
@@ -1338,21 +1341,28 @@ gdk_window_set_geometry_hints (GdkWindow      *window,
       rect.top = 0;
       rect.right = geometry->min_width;
       rect.bottom = geometry->min_height;
-      dwStyle = GetWindowLong (private->xwindow, GWL_STYLE);
-      dwExStyle = GetWindowLong (private->xwindow, GWL_EXSTYLE);
+      dwStyle = GetWindowLong (GDK_WINDOW_HWND (window), GWL_STYLE);
+      dwExStyle = GetWindowLong (GDK_WINDOW_HWND (window), GWL_EXSTYLE);
       AdjustWindowRectEx (&rect, dwStyle, FALSE, dwExStyle);
-      private->hint_min_width = rect.right - rect.left;
-      private->hint_min_height = rect.bottom - rect.top;
+      impl->hint_min_width = rect.right - rect.left;
+      impl->hint_min_height = rect.bottom - rect.top;
 
       /* Also check if he current size of the window is in bounds */
-      GetClientRect (private->xwindow, &rect);
+      GetClientRect (GDK_WINDOW_HWND (window), &rect);
+
       if (rect.right < geometry->min_width
          && rect.bottom < geometry->min_height)
-       gdk_window_resize (window, geometry->min_width, geometry->min_height);
+       {
+         new_width = geometry->min_width; new_height = geometry->min_height;
+       }
       else if (rect.right < geometry->min_width)
-       gdk_window_resize (window, geometry->min_width, rect.bottom);
+       {
+         new_width = geometry->min_width; new_height = rect.bottom;
+       }
       else if (rect.bottom < geometry->min_height)
-       gdk_window_resize (window, rect.right, geometry->min_height);
+       {
+         new_width = rect.right; new_height = geometry->min_height;
+       }
     }
   
   if (geom_mask & GDK_HINT_MAX_SIZE)
@@ -1361,49 +1371,65 @@ gdk_window_set_geometry_hints (GdkWindow      *window,
       rect.top = 0;
       rect.right = geometry->max_width;
       rect.bottom = geometry->max_height;
-      dwStyle = GetWindowLong (private->xwindow, GWL_STYLE);
-      dwExStyle = GetWindowLong (private->xwindow, GWL_EXSTYLE);
-      AdjustWindowRectEx (&rect, dwStyle, FALSE, dwExStyle);
-      private->hint_max_width = rect.right - rect.left;
-      private->hint_max_height = rect.bottom - rect.top;
+      dwStyle = GetWindowLong (GDK_WINDOW_HWND (window), GWL_STYLE);
+      dwExStyle = GetWindowLong (GDK_WINDOW_HWND (window), GWL_EXSTYLE);
+      /* HB: dont' know why AdjustWindowRectEx is called here, ... */
+      SafeAdjustWindowRectEx (&rect, dwStyle, FALSE, dwExStyle);
+      impl->hint_max_width = rect.right - rect.left;
+      impl->hint_max_height = rect.bottom - rect.top;
+      /* ... but negative sizes are always wrong */
+      if (impl->hint_max_width < 0) impl->hint_max_width = G_MAXSHORT;
+      if (impl->hint_max_height < 0) impl->hint_max_height = G_MAXSHORT;
 
       /* Again, check if the window is too large currently. */
-      GetClientRect (private->xwindow, &rect);
+      GetClientRect (GDK_WINDOW_HWND (window), &rect);
       if (rect.right > geometry->max_width
          && rect.bottom > geometry->max_height)
-       gdk_window_resize (window, geometry->max_width, geometry->max_height);
+       {
+         new_width = geometry->max_width; new_height = geometry->max_height;
+       }
       else if (rect.right > geometry->max_width)
-       gdk_window_resize (window, geometry->max_width, rect.bottom);
+       {
+         new_width = geometry->max_width; new_height = rect.bottom;
+       }
       else if (rect.bottom > geometry->max_height)
-       gdk_window_resize (window, rect.right, geometry->max_height);
+       {
+         new_width = rect.right; new_height = geometry->max_height;
+       }
     }
+
+  /* finally apply new size constraints */
+  if (new_width != 0 && new_height != 0)
+    gdk_window_resize (window, new_width, new_height);
   
   /* I don't know what to do when called with zero base_width and height. */
   if (geom_mask & GDK_HINT_BASE_SIZE
       && geometry->base_width > 0
       && geometry->base_height > 0)
-    if (!GetWindowPlacement (private->xwindow, &size_hints))
-      g_warning ("gdk_window_set_hints: GetWindowPlacement failed");
-    else
-      {
-       GDK_NOTE (MISC, g_print ("gdk_window_set_geometry_hints:"
-                                " rcNormalPosition: (%d,%d)--(%d,%d)\n",
-                                size_hints.rcNormalPosition.left,
-                                size_hints.rcNormalPosition.top,
-                                size_hints.rcNormalPosition.right,
-                                size_hints.rcNormalPosition.bottom));
-       size_hints.rcNormalPosition.right =
-         size_hints.rcNormalPosition.left + geometry->base_width;
-       size_hints.rcNormalPosition.bottom =
-         size_hints.rcNormalPosition.top + geometry->base_height;
-       GDK_NOTE (MISC, g_print ("...setting: rcNormal: (%d,%d)--(%d,%d)\n",
-                                size_hints.rcNormalPosition.left,
-                                size_hints.rcNormalPosition.top,
-                                size_hints.rcNormalPosition.right,
-                                size_hints.rcNormalPosition.bottom));
-       if (!SetWindowPlacement (private->xwindow, &size_hints))
-         g_warning ("gdk_window_set_hints: SetWindowPlacement failed");
-      }
+    {
+      if (!GetWindowPlacement (GDK_WINDOW_HWND (window), &size_hints))
+       WIN32_API_FAILED ("GetWindowPlacement");
+      else
+       {
+         GDK_NOTE (MISC, g_print ("gdk_window_set_geometry_hints:"
+                                  " rcNormalPosition: (%ld,%ld)--(%ld,%ld)\n",
+                                  size_hints.rcNormalPosition.left,
+                                  size_hints.rcNormalPosition.top,
+                                  size_hints.rcNormalPosition.right,
+                                  size_hints.rcNormalPosition.bottom));
+         size_hints.rcNormalPosition.right =
+           size_hints.rcNormalPosition.left + geometry->base_width;
+         size_hints.rcNormalPosition.bottom =
+           size_hints.rcNormalPosition.top + geometry->base_height;
+         GDK_NOTE (MISC, g_print ("...setting: rcNormal: (%ld,%ld)--(%ld,%ld)\n",
+                                  size_hints.rcNormalPosition.left,
+                                  size_hints.rcNormalPosition.top,
+                                  size_hints.rcNormalPosition.right,
+                                  size_hints.rcNormalPosition.bottom));
+         if (!SetWindowPlacement (GDK_WINDOW_HWND (window), &size_hints))
+           WIN32_API_FAILED ("SetWindowPlacement");
+       }
+    }
   
   if (geom_mask & GDK_HINT_RESIZE_INC)
     {
@@ -1420,17 +1446,29 @@ void
 gdk_window_set_title (GdkWindow   *window,
                      const gchar *title)
 {
-  GdkWindowPrivate *private;
-  
+  char *mbtitle;
+
   g_return_if_fail (window != NULL);
+  g_return_if_fail (GDK_IS_WINDOW (window));
+  g_return_if_fail (title != NULL);
+
+  /* Empty window titles not allowed, so set it to just a period. */
+  if (!title[0])
+    title = ".";
   
-  private = (GdkWindowPrivate*) window;
-  GDK_NOTE (MISC, g_print ("gdk_window_set_title: %#x %s\n",
-                          private->xwindow, title));
-  if (!private->destroyed)
+  GDK_NOTE (MISC, g_print ("gdk_window_set_title: %p %s\n",
+                          GDK_WINDOW_HWND (window), title));
+  
+  if (!GDK_WINDOW_DESTROYED (window))
     {
-      if (!SetWindowText (private->xwindow, title))
-       g_warning ("gdk_window_set_title: SetWindowText failed");
+      /* As the title is in UTF-8 we must translate it
+       * to the system codepage.
+       */
+      mbtitle = g_locale_from_utf8 (title, -1, NULL, NULL, NULL);
+      if (!SetWindowText (GDK_WINDOW_HWND (window), mbtitle))
+       WIN32_API_FAILED ("SetWindowText");
+
+      g_free (mbtitle);
     }
 }
 
@@ -1438,14 +1476,12 @@ void
 gdk_window_set_role (GdkWindow   *window,
                     const gchar *role)
 {
-  GdkWindowPrivate *private;
-  
   g_return_if_fail (window != NULL);
+  g_return_if_fail (GDK_IS_WINDOW (window));
   
-  private = (GdkWindowPrivate*) window;
-
-  GDK_NOTE (MISC, g_print ("gdk_window_set_role: %#x %s\n",
-                          private->xwindow, (role ? role : "NULL")));
+  GDK_NOTE (MISC, g_print ("gdk_window_set_role: %p %s\n",
+                          GDK_WINDOW_HWND (window),
+                          (role ? role : "NULL")));
   /* XXX */
 }
 
@@ -1453,48 +1489,67 @@ void
 gdk_window_set_transient_for (GdkWindow *window, 
                              GdkWindow *parent)
 {
-  GdkWindowPrivate *private;
-  GdkWindowPrivate *parent_private;
-  
+  HWND window_id, parent_id;
+  LONG style;
+
   g_return_if_fail (window != NULL);
+  g_return_if_fail (GDK_IS_WINDOW (window));
   
-  private = (GdkWindowPrivate*) window;
-  parent_private = (GdkWindowPrivate*) parent;
+  GDK_NOTE (MISC, g_print ("gdk_window_set_transient_for: %p %p\n",
+                          GDK_WINDOW_HWND (window),
+                          GDK_WINDOW_HWND (parent)));
 
-  GDK_NOTE (MISC, g_print ("gdk_window_set_transient_for: %#x %#x\n",
-                          private->xwindow, parent_private->xwindow));
-  /* XXX */
+  if (GDK_WINDOW_DESTROYED (window) || GDK_WINDOW_DESTROYED (parent))
+    return;
+
+  window_id = GDK_WINDOW_HWND (window);
+  parent_id = GDK_WINDOW_HWND (parent);
+
+  if ((style = GetWindowLong (window_id, GWL_STYLE)) == 0)
+    WIN32_API_FAILED ("GetWindowLong");
+
+  style |= WS_POPUP;
+#if 0 /* not sure if we want to do this */
+  style &= ~(WS_SYSMENU | WS_MAXIMIZEBOX | WS_MINIMIZEBOX);
+#endif
+
+  if (!SetWindowLong (window_id, GWL_STYLE, style))
+    WIN32_API_FAILED ("SetWindowLong");
+#if 0 /* not sure if we want to do this, clipping to parent size! */
+  if (!SetParent (window_id, parent_id))
+       WIN32_API_FAILED ("SetParent");
+#else /* make the modal window topmost instead */
+  if (!SetWindowPos (window_id, HWND_TOPMOST, 0, 0, 0, 0,
+                     SWP_NOMOVE | SWP_NOSIZE))
+    WIN32_API_FAILED ("SetWindowPos");
+#endif
+
+  if (!RedrawWindow (window_id, NULL, NULL, 
+                     RDW_FRAME | RDW_INVALIDATE | RDW_UPDATENOW))
+    WIN32_API_FAILED ("RedrawWindow");
 }
 
 void
 gdk_window_set_background (GdkWindow *window,
                           GdkColor  *color)
 {
-  GdkWindowPrivate *private;
+  GdkWindowObject *private = (GdkWindowObject *)window;
   
   g_return_if_fail (window != NULL);
+  g_return_if_fail (GDK_IS_WINDOW (window));
   
-  private = (GdkWindowPrivate*) window;
-  if (!private->destroyed)
-    {
-      GdkColormapPrivate *colormap_private =
-       (GdkColormapPrivate *) private->colormap;
+  GDK_NOTE (MISC, g_print ("gdk_window_set_background: %p %s\n",
+                          GDK_WINDOW_HWND (window), 
+                          gdk_win32_color_to_string (color)));
 
-      GDK_NOTE (MISC, g_print ("gdk_window_set_background: %#x %s\n",
-                              private->xwindow, 
-                              gdk_color_to_string (color)));
+  private->bg_color = *color;
 
-      if (private->bg_type == GDK_WIN32_BG_PIXMAP)
-       {
-         if (private->bg_pixmap != NULL)
-           {
-             gdk_pixmap_unref (private->bg_pixmap);
-             private->bg_pixmap = NULL;
-           }
-         private->bg_type = GDK_WIN32_BG_NORMAL;
-       }
-      private->bg_type = GDK_WIN32_BG_PIXEL;
-      private->bg_pixel = *color;
+  if (private->bg_pixmap &&
+      private->bg_pixmap != GDK_PARENT_RELATIVE_BG &&
+      private->bg_pixmap != GDK_NO_BG)
+    {
+      gdk_drawable_unref (private->bg_pixmap);
+      private->bg_pixmap = NULL;
     }
 }
 
@@ -1503,41 +1558,32 @@ gdk_window_set_back_pixmap (GdkWindow *window,
                            GdkPixmap *pixmap,
                            gint       parent_relative)
 {
-  GdkWindowPrivate *window_private;
+  GdkWindowObject *private = (GdkWindowObject *)window;
 
   g_return_if_fail (window != NULL);
+  g_return_if_fail (GDK_IS_WINDOW (window));
+  g_return_if_fail (pixmap == NULL || !parent_relative);
   
-  window_private = (GdkWindowPrivate*) window;
+  if (private->bg_pixmap &&
+      private->bg_pixmap != GDK_PARENT_RELATIVE_BG &&
+      private->bg_pixmap != GDK_NO_BG)
+    gdk_drawable_unref (private->bg_pixmap);
 
-  if (!window_private->destroyed)
+  if (parent_relative)
     {
-      GdkColormapPrivate *colormap_private =
-       (GdkColormapPrivate *) window_private->colormap;
-      if (window_private->bg_type == GDK_WIN32_BG_PIXMAP)
-       {
-         if (window_private->bg_pixmap != NULL)
-           {
-             gdk_pixmap_unref (window_private->bg_pixmap);
-             window_private->bg_pixmap = NULL;
-           }
-         window_private->bg_type = GDK_WIN32_BG_NORMAL;
-       }
-      if (parent_relative)
-       {
-         window_private->bg_type = GDK_WIN32_BG_PARENT_RELATIVE;
-       }
-      else if (!pixmap)
+      private->bg_pixmap = GDK_PARENT_RELATIVE_BG;
+      GDK_NOTE (MISC, g_print (G_STRLOC ": setting background pixmap to parent_relative\n"));
+    }
+  else
+    {
+      if (pixmap)
        {
-         
+         gdk_drawable_ref (pixmap);
+         private->bg_pixmap = pixmap;
        }
       else
        {
-         /* We must cache the pixmap in the WindowPrivate and
-          * paint it each time we get WM_ERASEBKGND
-          */
-         window_private->bg_type = GDK_WIN32_BG_PIXMAP;
-         window_private->bg_pixmap = pixmap;
-         gdk_pixmap_ref (pixmap);
+         private->bg_pixmap = GDK_NO_BG;
        }
     }
 }
@@ -1546,67 +1592,72 @@ void
 gdk_window_set_cursor (GdkWindow *window,
                       GdkCursor *cursor)
 {
-  GdkWindowPrivate *window_private;
+  GdkWindowImplWin32 *impl;
   GdkCursorPrivate *cursor_private;
-  HCURSOR xcursor;
+  HCURSOR hcursor;
+  HCURSOR hprevcursor;
   
   g_return_if_fail (window != NULL);
+  g_return_if_fail (GDK_IS_WINDOW (window));
   
-  window_private = (GdkWindowPrivate*) window;
+  impl = GDK_WINDOW_IMPL_WIN32 (GDK_WINDOW_OBJECT (window)->impl);
   cursor_private = (GdkCursorPrivate*) cursor;
   
-  if (!window_private->destroyed)
-    {
-      if (!cursor)
-       xcursor = LoadCursor (NULL, IDC_ARROW);
-      else
-       xcursor = cursor_private->xcursor;
+  if (GDK_WINDOW_DESTROYED (window))
+    return;
+
+  if (!cursor)
+    hcursor = NULL;
+  else
+    hcursor = cursor_private->hcursor;
+  
+  GDK_NOTE (MISC, g_print ("gdk_window_set_cursor: %p %p\n",
+                          GDK_WINDOW_HWND (window),
+                          hcursor));
+
+  /* First get the old cursor, if any (we wait to free the old one
+   * since it may be the current cursor set in the Win32 API right
+   * now).
+   */
+  hprevcursor = impl->hcursor;
 
-      GDK_NOTE (MISC, g_print ("gdk_window_set_cursor: %#x %#x\n",
-                              window_private->xwindow, xcursor));
-      window_private->xcursor = xcursor;
-      SetCursor (xcursor);
+  if (hcursor == NULL)
+    impl->hcursor = NULL;
+  else
+    {
+      /* We must copy the cursor as it is OK to destroy the GdkCursor
+       * while still in use for some window. See for instance
+       * gimp_change_win_cursor() which calls gdk_window_set_cursor
+       * (win, cursor), and immediately afterwards gdk_cursor_destroy
+       * (cursor).
+       */
+      if ((impl->hcursor = CopyCursor (hcursor)) == NULL)
+       WIN32_API_FAILED ("CopyCursor");
+      GDK_NOTE (MISC, g_print ("...CopyCursor (%p) = %p\n",
+                              hcursor, impl->hcursor));
     }
-}
 
-void
-gdk_window_set_colormap (GdkWindow   *window,
-                        GdkColormap *colormap)
-{
-  GdkWindowPrivate *window_private;
-  GdkColormapPrivate *colormap_private;
-  
-  g_return_if_fail (window != NULL);
-  g_return_if_fail (colormap != NULL);
-  
-  window_private = (GdkWindowPrivate*) window;
-  colormap_private = (GdkColormapPrivate*) colormap;
-  
-  if (!window_private->destroyed)
+   /* Set new cursor in all cases if we're over our window */
+  if (gdk_window_get_pointer(window, NULL, NULL, NULL) == window)
+    SetCursor (impl->hcursor);
+
+  /* Destroy the previous cursor: Need to make sure it's no longer in
+   * use before we destroy it, in case we're not over our window but
+   * the cursor is still set to our old one.
+   */
+  if (hprevcursor != NULL)
     {
-      /* XXX ??? */
-      GDK_NOTE (MISC, g_print ("gdk_window_set_colormap: %#x %#x\n",
-                              window_private->xwindow,
-                              colormap_private->xcolormap));
-      if (window_private->colormap)
-       gdk_colormap_unref (window_private->colormap);
-      window_private->colormap = colormap;
-      gdk_colormap_ref (window_private->colormap);
+      if (GetCursor() == hprevcursor)
+       SetCursor (NULL);
+
+      GDK_NOTE (MISC, g_print ("...DestroyCursor (%p)\n",
+                              hprevcursor));
       
-      if (window_private->window_type != GDK_WINDOW_TOPLEVEL)
-       gdk_window_add_colormap_windows (window);
+      if (!DestroyCursor (hprevcursor))
+       WIN32_API_FAILED ("DestroyCursor");
     }
 }
 
-void
-gdk_window_get_user_data (GdkWindow *window,
-                         gpointer  *data)
-{
-  g_return_if_fail (window != NULL);
-  
-  *data = window->user_data;
-}
-
 void
 gdk_window_get_geometry (GdkWindow *window,
                         gint      *x,
@@ -1615,19 +1666,17 @@ gdk_window_get_geometry (GdkWindow *window,
                         gint      *height,
                         gint      *depth)
 {
-  GdkWindowPrivate *window_private;
+  g_return_if_fail (window == NULL || GDK_IS_WINDOW (window));
   
   if (!window)
-    window = (GdkWindow*) &gdk_root_parent;
+    window = _gdk_parent_root;
   
-  window_private = (GdkWindowPrivate*) window;
-  
-  if (!window_private->destroyed)
+  if (!GDK_WINDOW_DESTROYED (window))
     {
       RECT rect;
 
-      if (!GetClientRect (window_private->xwindow, &rect))
-       g_warning ("gdk_window_get_geometry: GetClientRect failed");
+      if (!GetClientRect (GDK_WINDOW_HWND (window), &rect))
+       WIN32_API_FAILED ("GetClientRect");
 
       if (x)
        *x = rect.left;
@@ -1638,98 +1687,8 @@ gdk_window_get_geometry (GdkWindow *window,
       if (height)
        *height = rect.bottom - rect.top;
       if (depth)
-       *depth = gdk_window_get_visual (window)->depth;
-    }
-}
-
-void
-gdk_window_get_position (GdkWindow *window,
-                        gint      *x,
-                        gint      *y)
-{
-  GdkWindowPrivate *window_private;
-  
-  g_return_if_fail (window != NULL);
-  
-  window_private = (GdkWindowPrivate*) window;
-  
-  if (x)
-    *x = window_private->x;
-  if (y)
-    *y = window_private->y;
-}
-
-void
-gdk_window_get_size (GdkWindow *window,
-                    gint       *width,
-                    gint       *height)
-{
-  GdkWindowPrivate *window_private;
-  
-  g_return_if_fail (window != NULL);
-  
-  window_private = (GdkWindowPrivate*) window;
-  
-  if (width)
-    *width = window_private->width;
-  if (height)
-    *height = window_private->height;
-}
-
-GdkVisual*
-gdk_window_get_visual (GdkWindow *window)
-{
-  GdkWindowPrivate *window_private;
-   
-  g_return_val_if_fail (window != NULL, NULL);
-
-  window_private = (GdkWindowPrivate*) window;
-  /* Huh? ->parent is never set for a pixmap. We should just return
-   * null immeditately. Well, do it then!
-   */
-  if (window_private->window_type == GDK_WINDOW_PIXMAP)
-    return NULL;
-  
-  if (!window_private->destroyed)
-    {
-       if (window_private->colormap == NULL)
-        return gdk_visual_get_system (); /* XXX ??? */
-       else
-        return ((GdkColormapPrivate *)window_private->colormap)->visual;
-    }
-  
-  return NULL;
-}
-
-GdkColormap*
-gdk_window_get_colormap (GdkWindow *window)
-{
-  GdkWindowPrivate *window_private;
-  
-  g_return_val_if_fail (window != NULL, NULL);
-  window_private = (GdkWindowPrivate*) window;
-
-  g_return_val_if_fail (window_private->window_type != GDK_WINDOW_PIXMAP, NULL);
-  if (!window_private->destroyed)
-    {
-      if (window_private->colormap == NULL)
-       return gdk_colormap_get_system (); /* XXX ??? */
-      else
-       return window_private->colormap;
+       *depth = gdk_drawable_get_visual (window)->depth;
     }
-  
-  return NULL;
-}
-
-GdkWindowType
-gdk_window_get_type (GdkWindow *window)
-{
-  GdkWindowPrivate *window_private;
-
-  g_return_val_if_fail (window != NULL, (GdkWindowType) -1);
-
-  window_private = (GdkWindowPrivate*) window;
-  return window_private->window_type;
 }
 
 gint
@@ -1737,22 +1696,19 @@ gdk_window_get_origin (GdkWindow *window,
                       gint      *x,
                       gint      *y)
 {
-  GdkWindowPrivate *private;
   gint return_val;
   gint tx = 0;
   gint ty = 0;
 
   g_return_val_if_fail (window != NULL, 0);
 
-  private = (GdkWindowPrivate*) window;
-
-  if (!private->destroyed)
+  if (!GDK_WINDOW_DESTROYED (window))
     {
       POINT pt;
 
       pt.x = 0;
       pt.y = 0;
-      ClientToScreen (private->xwindow, &pt);
+      ClientToScreen (GDK_WINDOW_HWND (window), &pt);
       tx = pt.x;
       ty = pt.y;
       return_val = 1;
@@ -1765,8 +1721,9 @@ gdk_window_get_origin (GdkWindow *window,
   if (y)
     *y = ty;
 
-  GDK_NOTE (MISC, g_print ("gdk_window_get_origin: %#x: +%d+%d\n",
-                          private->xwindow, tx, ty));
+  GDK_NOTE (MISC, g_print ("gdk_window_get_origin: %p: +%d+%d\n",
+                          GDK_WINDOW_HWND (window),
+                          tx, ty));
   return return_val;
 }
 
@@ -1783,57 +1740,80 @@ gdk_window_get_root_origin (GdkWindow *window,
                            gint      *x,
                            gint      *y)
 {
-  GdkWindowPrivate *private;
-  POINT pt;
+  GdkRectangle rect;
 
-  g_return_if_fail (window != NULL);
+  g_return_if_fail (GDK_IS_WINDOW (window));
+
+  gdk_window_get_frame_extents (window, &rect);
 
-  private = (GdkWindowPrivate*) window;
   if (x)
-    *x = 0;
+    *x = rect.x;
+
   if (y)
-    *y = 0;
-  if (private->destroyed)
-    return;
-      
-  while (private->parent && ((GdkWindowPrivate*) private->parent)->parent)
-    private = (GdkWindowPrivate*) private->parent;
-  if (private->destroyed)
+    *y = rect.y;
+}
+
+void
+gdk_window_get_frame_extents (GdkWindow    *window,
+                              GdkRectangle *rect)
+{
+  GdkWindowObject *private;
+  HWND hwnd;
+  RECT r;
+
+  g_return_if_fail (GDK_IS_WINDOW (window));
+  g_return_if_fail (rect != NULL);
+
+  private = GDK_WINDOW_OBJECT (window);
+
+  rect->x = 0;
+  rect->y = 0;
+  rect->width = 1;
+  rect->height = 1;
+  
+  if (GDK_WINDOW_DESTROYED (window))
     return;
 
-  pt.x = 0;
-  pt.y = 0;
-  ClientToScreen (private->xwindow, &pt);
-  if (x)
-    *x = pt.x;
-  if (y)
-    *y = pt.y;
+  while (private->parent && ((GdkWindowObject*) private->parent)->parent)
+    private = (GdkWindowObject*) private->parent;
+
+  hwnd = GDK_WINDOW_HWND (window);
+
+  /* find the frame window */
+  while (HWND_DESKTOP != GetParent (hwnd))
+    {
+      hwnd = GetParent (hwnd);
+      g_return_if_fail (NULL != hwnd);
+    }
 
-  GDK_NOTE (MISC, g_print ("gdk_window_get_root_origin: %#x: (%#x) +%d+%d\n",
-                          ((GdkWindowPrivate *) window)->xwindow,
-                          private->xwindow, pt.x, pt.y));
+  if (!GetWindowRect (hwnd, &r))
+    WIN32_API_FAILED ("GetWindowRect");
+
+  rect->x = r.left;
+  rect->y = r.right;
+  rect->width = r.right - r.left;
+  rect->height = r.bottom - r.top;
 }
 
 GdkWindow*
-gdk_window_get_pointer (GdkWindow       *window,
-                       gint            *x,
-                       gint            *y,
-                       GdkModifierType *mask)
+_gdk_windowing_window_get_pointer (GdkWindow       *window,
+                                  gint            *x,
+                                  gint            *y,
+                                  GdkModifierType *mask)
 {
-  GdkWindowPrivate *private;
   GdkWindow *return_val;
-  POINT pointc, point;
+  POINT screen_point, point;
   HWND hwnd, hwndc;
 
+  g_return_val_if_fail (window == NULL || GDK_IS_WINDOW (window), NULL);
+  
   if (!window)
-    window = (GdkWindow*) &gdk_root_parent;
-
-  private = (GdkWindowPrivate*) window;
+    window = _gdk_parent_root;
 
   return_val = NULL;
-  GetCursorPos (&pointc);
-  point = pointc;
-  ScreenToClient (private->xwindow, &point);
+  GetCursorPos (&screen_point);
+  point = screen_point;
+  ScreenToClient (GDK_WINDOW_HWND (window), &point);
 
   if (x)
     *x = point.x;
@@ -1841,17 +1821,28 @@ gdk_window_get_pointer (GdkWindow       *window,
     *y = point.y;
 
   hwnd = WindowFromPoint (point);
-  point = pointc;
-  ScreenToClient (hwnd, &point);
-  
-  do {
-    hwndc = ChildWindowFromPoint (hwnd, point);
-    ClientToScreen (hwnd, &point);
-    ScreenToClient (hwndc, &point);
-  } while (hwndc != hwnd && (hwnd = hwndc, 1));        /* Ouch! */
-
-  return_val = gdk_window_lookup (hwnd);
-
+  if (hwnd != NULL)
+    {
+      gboolean done = FALSE;
+      
+      while (!done)
+       {
+         point = screen_point;
+         ScreenToClient (hwnd, &point);
+         hwndc = ChildWindowFromPoint (hwnd, point);
+         if (hwndc == NULL)
+           done = TRUE;
+         else if (hwndc == hwnd)
+           done = TRUE;
+         else
+           hwnd = hwndc;
+       }
+      
+      return_val = gdk_window_lookup ((GdkNativeWindow) hwnd);
+    }
+  else
+    return_val = NULL;
+      
   if (mask)
     {
       BYTE kbd[256];
@@ -1878,24 +1869,22 @@ gdk_window_get_pointer (GdkWindow       *window,
 }
 
 GdkWindow*
-gdk_window_at_pointer (gint *win_x,
-                      gint *win_y)
+_gdk_windowing_window_at_pointer (GdkScreen *screen,
+                                 gint      *win_x,
+                                 gint      *win_y)
 {
-  GdkWindowPrivate *private;
   GdkWindow *window;
   POINT point, pointc;
   HWND hwnd, hwndc;
   RECT rect;
 
-  private = &gdk_root_parent;
-
   GetCursorPos (&pointc);
   point = pointc;
   hwnd = WindowFromPoint (point);
 
   if (hwnd == NULL)
     {
-      window = (GdkWindow *) &gdk_root_parent;
+      window = _gdk_parent_root;
       if (win_x)
        *win_x = pointc.x;
       if (win_y)
@@ -1911,7 +1900,7 @@ gdk_window_at_pointer (gint *win_x,
     ScreenToClient (hwndc, &point);
   } while (hwndc != hwnd && (hwnd = hwndc, 1));
 
-  window = gdk_window_lookup (hwnd);
+  window = gdk_win32_handle_table_lookup ((GdkNativeWindow) hwnd);
 
   if (window && (win_x || win_y))
     {
@@ -1922,229 +1911,116 @@ gdk_window_at_pointer (gint *win_x,
        *win_y = point.y - rect.top;
     }
 
-  GDK_NOTE (MISC, g_print ("gdk_window_at_pointer: +%d+%d %#x%s\n",
-                          point.x, point.y, hwnd,
-                          (window == NULL ? " NULL" : "")));
-
-  return window;
-}
-
-GdkWindow*
-gdk_window_get_parent (GdkWindow *window)
-{
-  g_return_val_if_fail (window != NULL, NULL);
-
-  return ((GdkWindowPrivate*) window)->parent;
-}
-
-GdkWindow*
-gdk_window_get_toplevel (GdkWindow *window)
-{
-  GdkWindowPrivate *private;
-
-  g_return_val_if_fail (window != NULL, NULL);
-
-  private = (GdkWindowPrivate*) window;
-
-  while (private->window_type == GDK_WINDOW_CHILD)
-    {
-      window = ((GdkWindowPrivate*) window)->parent;
-      private = (GdkWindowPrivate*) window;
-    }
-
-  return window;
-}
-
-GList*
-gdk_window_get_children (GdkWindow *window)
-{
-  GdkWindowPrivate *private;
-  GList *children;
-
-  g_return_val_if_fail (window != NULL, NULL);
-
-  private = (GdkWindowPrivate*) window;
-  if (private->destroyed)
-    return NULL;
-
-  /* XXX ??? */
-  g_warning ("gdk_window_get_children ???");
-  children = NULL;
+  GDK_NOTE (MISC, g_print ("gdk_window_at_pointer: +%ld+%ld %p%s\n",
+                          point.x, point.y,
+                          hwnd,
+                          (window == NULL ? " NULL" : "")));
 
-  return children;
+  return window;
 }
 
 GdkEventMask  
 gdk_window_get_events (GdkWindow *window)
 {
-  GdkWindowPrivate *private;
-
   g_return_val_if_fail (window != NULL, 0);
+  g_return_val_if_fail (GDK_IS_WINDOW (window), 0);
 
-  private = (GdkWindowPrivate*) window;
-  if (private->destroyed)
+  if (GDK_WINDOW_DESTROYED (window))
     return 0;
 
-  return private->event_mask;
+  return GDK_WINDOW_OBJECT (window)->event_mask;
 }
 
 void          
 gdk_window_set_events (GdkWindow   *window,
                       GdkEventMask event_mask)
 {
-  GdkWindowPrivate *private;
-
   g_return_if_fail (window != NULL);
+  g_return_if_fail (GDK_IS_WINDOW (window));
 
-  private = (GdkWindowPrivate*) window;
-  if (private->destroyed)
+  if (GDK_WINDOW_DESTROYED (window))
     return;
 
-  private->event_mask = event_mask;
-}
-
-void
-gdk_window_add_colormap_windows (GdkWindow *window)
-{
-  g_warning ("gdk_window_add_colormap_windows not implemented"); /* XXX */
+  /* gdk_window_new() always sets the GDK_STRUCTURE_MASK, so better
+   * set it here, too. Not that I know or remember why it is
+   * necessary, will have to test some day.
+   */
+  GDK_WINDOW_OBJECT (window)->event_mask = GDK_STRUCTURE_MASK | event_mask;
 }
 
-/*
- * This needs the X11 shape extension.
- * If not available, shaped windows will look
- * ugly, but programs still work.    Stefan Wille
- */
 void
 gdk_window_shape_combine_mask (GdkWindow *window,
                               GdkBitmap *mask,
                               gint x, gint y)
 {
-  GdkWindowPrivate *window_private;
-
   g_return_if_fail (window != NULL);
+  g_return_if_fail (GDK_IS_WINDOW (window));
 
-  window_private = (GdkWindowPrivate*) window;
-  
   if (!mask)
     {
-      GDK_NOTE (MISC, g_print ("gdk_window_shape_combine_mask: %#x none\n",
-                              window_private->xwindow));
-      SetWindowRgn (window_private->xwindow, NULL, TRUE);
+      GDK_NOTE (MISC, g_print ("gdk_window_shape_combine_mask: %p none\n",
+                              GDK_WINDOW_HWND (window)));
+      SetWindowRgn (GDK_WINDOW_HWND (window), NULL, TRUE);
     }
   else
     {
-      GdkPixmapPrivate *pixmap_private;
       HRGN hrgn;
       DWORD dwStyle;
       DWORD dwExStyle;
       RECT rect;
 
       /* Convert mask bitmap to region */
-      pixmap_private = (GdkPixmapPrivate*) mask;
-      hrgn = BitmapToRegion (pixmap_private->xwindow);
+      hrgn = _gdk_win32_bitmap_to_region (mask);
 
-      GDK_NOTE (MISC, g_print ("gdk_window_shape_combine_mask: %#x %#x\n",
-                              window_private->xwindow,
-                              pixmap_private->xwindow));
+      GDK_NOTE (MISC, g_print ("gdk_window_shape_combine_mask: %p %p\n",
+                              GDK_WINDOW_HWND (window),
+                              GDK_WINDOW_HWND (mask)));
 
       /* SetWindowRgn wants window (not client) coordinates */ 
-      dwStyle = GetWindowLong (window_private->xwindow, GWL_STYLE);
-      dwExStyle = GetWindowLong (window_private->xwindow, GWL_EXSTYLE);
-      GetClientRect (window_private->xwindow, &rect);
+      dwStyle = GetWindowLong (GDK_WINDOW_HWND (window), GWL_STYLE);
+      dwExStyle = GetWindowLong (GDK_WINDOW_HWND (window), GWL_EXSTYLE);
+      GetClientRect (GDK_WINDOW_HWND (window), &rect);
       AdjustWindowRectEx (&rect, dwStyle, FALSE, dwExStyle);
       OffsetRgn (hrgn, -rect.left, -rect.top);
 
       OffsetRgn (hrgn, x, y);
 
       /* If this is a top-level window, add the title bar to the region */
-      if (window_private->window_type == GDK_WINDOW_TOPLEVEL)
+      if (GDK_WINDOW_TYPE (window) == GDK_WINDOW_TOPLEVEL)
        {
-         CombineRgn (hrgn, hrgn,
-                     CreateRectRgn (0, 0, rect.right - rect.left, -rect.top),
-                     RGN_OR);
+         HRGN tmp = CreateRectRgn (0, 0, rect.right - rect.left, -rect.top);
+         CombineRgn (hrgn, hrgn, tmp, RGN_OR);
+         DeleteObject (tmp);
        }
       
-      SetWindowRgn (window_private->xwindow, hrgn, TRUE);
+      SetWindowRgn (GDK_WINDOW_HWND (window), hrgn, TRUE);
     }
 }
 
-void          
-gdk_window_add_filter (GdkWindow     *window,
-                      GdkFilterFunc  function,
-                      gpointer       data)
+void
+gdk_window_set_override_redirect (GdkWindow *window,
+                                 gboolean   override_redirect)
 {
-  GdkWindowPrivate *private;
-  GList *tmp_list;
-  GdkEventFilter *filter;
-
-  private = (GdkWindowPrivate*) window;
-  if (private && private->destroyed)
-    return;
-
-  if (private)
-    tmp_list = private->filters;
-  else
-    tmp_list = gdk_default_filters;
-
-  while (tmp_list)
-    {
-      filter = (GdkEventFilter *)tmp_list->data;
-      if ((filter->function == function) && (filter->data == data))
-       return;
-      tmp_list = tmp_list->next;
-    }
-
-  filter = g_new (GdkEventFilter, 1);
-  filter->function = function;
-  filter->data = data;
+  g_return_if_fail (window != NULL);
+  g_return_if_fail (GDK_IS_WINDOW (window));
 
-  if (private)
-    private->filters = g_list_append (private->filters, filter);
-  else
-    gdk_default_filters = g_list_append (gdk_default_filters, filter);
+  g_warning ("gdk_window_set_override_redirect not implemented");
 }
 
-void
-gdk_window_remove_filter (GdkWindow     *window,
-                         GdkFilterFunc  function,
-                         gpointer       data)
+void          
+gdk_window_set_icon_list (GdkWindow *window,
+                         GList     *pixbufs)
 {
-  GdkWindowPrivate *private;
-  GList *tmp_list, *node;
-  GdkEventFilter *filter;
-
-  private = (GdkWindowPrivate*) window;
-
-  if(private)
-    tmp_list = private->filters;
-  else
-    tmp_list = gdk_default_filters;
-
-  while (tmp_list)
-    {
-      filter = (GdkEventFilter *)tmp_list->data;
-      node = tmp_list;
-      tmp_list = tmp_list->next;
+  g_return_if_fail (GDK_IS_WINDOW (window));
 
-      if ((filter->function == function) && (filter->data == data))
-       {
-         if(private)
-           private->filters = g_list_remove_link (private->filters, node);
-         else
-           gdk_default_filters = g_list_remove_link (gdk_default_filters, tmp_list);
-         g_list_free_1 (node);
-         g_free (filter);
-         
-         return;
-       }
-    }
-}
+  if (GDK_WINDOW_DESTROYED (window))
+    return;
 
-void
-gdk_window_set_override_redirect (GdkWindow *window,
-                                 gboolean   override_redirect)
-{
-  g_warning ("gdk_window_set_override_redirect not implemented"); /* XXX */
+  /* We could convert it to a hIcon and DrawIcon () it when getting
+   * a WM_PAINT with IsIconic, but is it worth it ? Same probably
+   * goes for gdk_window_set_icon (). Patches accepted :-)  --hb
+   * Or do we only need to deliver the Icon on WM_GETICON ?
+   */
 }
 
 void          
@@ -2153,40 +2029,58 @@ gdk_window_set_icon (GdkWindow *window,
                     GdkPixmap *pixmap,
                     GdkBitmap *mask)
 {
-  g_warning ("gdk_window_set_icon not implemented"); /* XXX */
+  g_return_if_fail (window != NULL);
+  g_return_if_fail (GDK_IS_WINDOW (window));
+
+  if (GDK_WINDOW_DESTROYED (window))
+    return;
+  
+  /* Nothing to do, really. As we share window classes between windows
+   * we can't have window-specific icons, sorry. Don't print any warning
+   * either.
+   */
 }
 
-void          
-gdk_window_set_icon_name (GdkWindow *window, 
-                         gchar     *name)
+void
+gdk_window_set_icon_name (GdkWindow   *window, 
+                         const gchar *name)
 {
-  GdkWindowPrivate *window_private;
-
   g_return_if_fail (window != NULL);
-  window_private = (GdkWindowPrivate*) window;
-  if (window_private->destroyed)
-    return;
+  g_return_if_fail (GDK_IS_WINDOW (window));
 
-  if (!SetWindowText (window_private->xwindow, name))
-    g_warning ("gdk_window_set_icon_name: SetWindowText failed");
+  if (GDK_WINDOW_DESTROYED (window))
+    return;
+  
+  if (!SetWindowText (GDK_WINDOW_HWND (window), name))
+    WIN32_API_FAILED ("SetWindowText");
 }
 
 void          
 gdk_window_set_group (GdkWindow *window, 
                      GdkWindow *leader)
 {
-  g_warning ("gdk_window_set_group not implemented"); /* XXX */
+  g_return_if_fail (window != NULL);
+  g_return_if_fail (GDK_IS_WINDOW (window));
+  g_return_if_fail (leader != NULL);
+  g_return_if_fail (GDK_IS_WINDOW (leader));
+
+  if (GDK_WINDOW_DESTROYED (window) || GDK_WINDOW_DESTROYED (leader))
+    return;
+  
+  g_warning ("gdk_window_set_group not implemented");
 }
 
 void
 gdk_window_set_decorations (GdkWindow      *window,
                            GdkWMDecoration decorations)
 {
-  GdkWindowPrivate *window_private = (GdkWindowPrivate *) window;
   LONG style, exstyle;
 
-  style = GetWindowLong (window_private->xwindow, GWL_STYLE);
-  exstyle = GetWindowLong (window_private->xwindow, GWL_EXSTYLE);
+  g_return_if_fail (window != NULL);
+  g_return_if_fail (GDK_IS_WINDOW (window));
+  
+  style = GetWindowLong (GDK_WINDOW_HWND (window), GWL_STYLE);
+  exstyle = GetWindowLong (GDK_WINDOW_HWND (window), GWL_EXSTYLE);
 
   style &= (WS_OVERLAPPED|WS_POPUP|WS_CHILD|WS_MINIMIZE|WS_VISIBLE|WS_DISABLED
            |WS_CLIPSIBLINGS|WS_CLIPCHILDREN|WS_MAXIMIZE);
@@ -2208,18 +2102,20 @@ gdk_window_set_decorations (GdkWindow      *window,
   if (decorations & GDK_DECOR_MAXIMIZE)
     style |= (WS_MAXIMIZEBOX);
   
-  SetWindowLong (window_private->xwindow, GWL_STYLE, style);
+  SetWindowLong (GDK_WINDOW_HWND (window), GWL_STYLE, style);
 }
 
 void
 gdk_window_set_functions (GdkWindow    *window,
                          GdkWMFunction functions)
 {
-  GdkWindowPrivate *window_private = (GdkWindowPrivate *) window;
   LONG style, exstyle;
 
-  style = GetWindowLong (window_private->xwindow, GWL_STYLE);
-  exstyle = GetWindowLong (window_private->xwindow, GWL_EXSTYLE);
+  g_return_if_fail (window != NULL);
+  g_return_if_fail (GDK_IS_WINDOW (window));
+  
+  style = GetWindowLong (GDK_WINDOW_HWND (window), GWL_STYLE);
+  exstyle = GetWindowLong (GDK_WINDOW_HWND (window), GWL_EXSTYLE);
 
   style &= (WS_OVERLAPPED|WS_POPUP|WS_CHILD|WS_MINIMIZE|WS_VISIBLE|WS_DISABLED
            |WS_CLIPSIBLINGS|WS_CLIPCHILDREN|WS_MAXIMIZE|WS_CAPTION|WS_BORDER
@@ -2238,23 +2134,7 @@ gdk_window_set_functions (GdkWindow    *window,
   if (functions & GDK_FUNC_MAXIMIZE)
     style |= (WS_MAXIMIZEBOX);
   
-  SetWindowLong (window_private->xwindow, GWL_STYLE, style);
-}
-
-GList *
-gdk_window_get_toplevels (void)
-{
-  GList *new_list = NULL;
-  GList *tmp_list;
-
-  tmp_list = gdk_root_parent.children;
-  while (tmp_list)
-    {
-      new_list = g_list_prepend (new_list, tmp_list->data);
-      tmp_list = tmp_list->next;
-    }
-
-  return new_list;
+  SetWindowLong (GDK_WINDOW_HWND (window), GWL_STYLE, style);
 }
 
 /* 
@@ -2302,7 +2182,6 @@ gdk_propagate_shapes (HANDLE   win,
 {
    RECT emptyRect;
    HRGN region, childRegion;
-   RECT rect;
    HWND *list = NULL;
    gint i, num;
 
@@ -2321,7 +2200,7 @@ gdk_propagate_shapes (HANDLE   win,
        for (i = 0; i < num; i++)
         {
           GetWindowPlacement (list[i], &placement);
-          if (placement.showCmd = SW_SHOWNORMAL)
+          if (placement.showCmd == SW_SHOWNORMAL)
             {
               childRegion = CreateRectRgnIndirect (&emptyRect);
               GetWindowRgn (list[i], childRegion);
@@ -2338,92 +2217,27 @@ gdk_propagate_shapes (HANDLE   win,
 void
 gdk_window_set_child_shapes (GdkWindow *window)
 {
-  GdkWindowPrivate *private;
-   
   g_return_if_fail (window != NULL);
+  g_return_if_fail (GDK_IS_WINDOW (window));
    
-  private = (GdkWindowPrivate*) window;
-  if (private->destroyed)
+  if (GDK_WINDOW_DESTROYED (window))
     return;
 
-  gdk_propagate_shapes ( private->xwindow, FALSE);
+  gdk_propagate_shapes (GDK_WINDOW_HWND (window), FALSE);
 }
 
 void
 gdk_window_merge_child_shapes (GdkWindow *window)
 {
-  GdkWindowPrivate *private;
-  
   g_return_if_fail (window != NULL);
+  g_return_if_fail (GDK_IS_WINDOW (window));
   
-  private = (GdkWindowPrivate*) window;
-  if (private->destroyed)
+  if (GDK_WINDOW_DESTROYED (window))
     return;
 
-  gdk_propagate_shapes (private->xwindow, TRUE);
-}
-
-/*************************************************************
- * gdk_window_is_visible:
- *     Check if the given window is mapped.
- *   arguments:
- *     window: 
- *   results:
- *     is the window mapped
- *************************************************************/
-
-gboolean 
-gdk_window_is_visible (GdkWindow *window)
-{
-  GdkWindowPrivate *private = (GdkWindowPrivate *)window;
-
-  g_return_val_if_fail (window != NULL, FALSE);
-
-  return private->mapped;
-}
-
-/*************************************************************
- * gdk_window_is_viewable:
- *     Check if the window and all ancestors of the window
- *     are mapped. (This is not necessarily "viewable" in
- *     the X sense, since we only check as far as we have
- *     GDK window parents, not to the root window)
- *   arguments:
- *     window:
- *   results:
- *     is the window viewable
- *************************************************************/
-
-gboolean 
-gdk_window_is_viewable (GdkWindow *window)
-{
-  GdkWindowPrivate *private = (GdkWindowPrivate *)window;
-
-  g_return_val_if_fail (window != NULL, FALSE);
-
-  while (private && 
-        (private != &gdk_root_parent) &&
-        (private->window_type != GDK_WINDOW_FOREIGN))
-    {
-      if (!private->mapped)
-       return FALSE;
-
-      private = (GdkWindowPrivate *)private->parent;
-    }
-
-  return TRUE;
-}
-
-void          
-gdk_drawable_set_data (GdkDrawable   *drawable,
-                      const gchar   *key,
-                      gpointer       data,
-                      GDestroyNotify destroy_func)
-{
-  g_dataset_set_data_full (drawable, key, data, destroy_func);
+  gdk_propagate_shapes (GDK_WINDOW_HWND (window), TRUE);
 }
 
-
 /* Support for windows that can be guffaw-scrolled
  * (See http://www.gtk.org/~otaylor/whitepapers/guffaw-scrolling.txt)
  */
@@ -2433,7 +2247,7 @@ gdk_window_gravity_works (void)
 {
   enum { UNKNOWN, NO, YES };
   static gint gravity_works = UNKNOWN;
-
+  
   if (gravity_works == UNKNOWN)
     {
       GdkWindowAttr attr;
@@ -2453,7 +2267,7 @@ gdk_window_gravity_works (void)
       
       attr.window_type = GDK_WINDOW_CHILD;
       child = gdk_window_new (parent, &attr, GDK_WA_X | GDK_WA_Y);
-
+      
       gdk_window_set_static_win_gravity (child, TRUE);
       
       gdk_window_resize (parent, 100, 110);
@@ -2468,33 +2282,27 @@ gdk_window_gravity_works (void)
       
       gdk_window_destroy (parent);
       gdk_window_destroy (child);
-  
+      
       gravity_works = ((y == -20) ? YES : NO);
     }
-
+  
   return (gravity_works == YES);
 }
 
 static void
 gdk_window_set_static_bit_gravity (GdkWindow *window, gboolean on)
 {
-  GdkWindowPrivate *private = (GdkWindowPrivate *)window;
-
   g_return_if_fail (window != NULL);
 
-  GDK_NOTE (MISC,
-           g_print ("gdk_window_set_static_bit_gravity: Not implemented\n"));
+  GDK_NOTE (MISC, g_print ("gdk_window_set_static_bit_gravity: Not implemented\n"));
 }
 
 static void
 gdk_window_set_static_win_gravity (GdkWindow *window, gboolean on)
 {
-  GdkWindowPrivate *private = (GdkWindowPrivate *)window;
-
   g_return_if_fail (window != NULL);
 
-  GDK_NOTE (MISC,
-           g_print ("gdk_window_set_static_win_gravity: Not implemented\n"));
+  GDK_NOTE (MISC, g_print ("gdk_window_set_static_win_gravity: Not implemented\n"));
 }
 
 /*************************************************************
@@ -2513,28 +2321,269 @@ gboolean
 gdk_window_set_static_gravities (GdkWindow *window,
                                 gboolean   use_static)
 {
-  GdkWindowPrivate *private = (GdkWindowPrivate *)window;
+  GdkWindowObject *private = (GdkWindowObject *)window;
   GList *tmp_list;
-
-  g_return_val_if_fail (window != NULL, FALSE);
   
+  g_return_val_if_fail (window != NULL, FALSE);
+  g_return_val_if_fail (GDK_IS_WINDOW (window), FALSE);
+
   if (!use_static == !private->guffaw_gravity)
     return TRUE;
   
   if (use_static && !gdk_window_gravity_works ())
     return FALSE;
-
+  
   private->guffaw_gravity = use_static;
+  
+  if (!GDK_WINDOW_DESTROYED (window))
+    {
+      gdk_window_set_static_bit_gravity (window, use_static);
+      
+      tmp_list = private->children;
+      while (tmp_list)
+       {
+         gdk_window_set_static_win_gravity (window, use_static);
+         
+         tmp_list = tmp_list->next;
+       }
+    }
+  
+  return TRUE;
+}
+
+/*
+ * Setting window states
+ */
+void
+gdk_window_iconify (GdkWindow *window)
+{
+  g_return_if_fail (window != NULL);
+  g_return_if_fail (GDK_IS_WINDOW (window));
 
-  gdk_window_set_static_bit_gravity (window, use_static);
+  if (GDK_WINDOW_DESTROYED (window))
+    return;
 
-  tmp_list = private->children;
-  while (tmp_list)
+  if (GDK_WINDOW_IS_MAPPED (window))
     {
-      gdk_window_set_static_win_gravity (window, use_static);
-      
-      tmp_list = tmp_list->next;
+      ShowWindow (GDK_WINDOW_HWND (window), SW_MINIMIZE);
+    }
+  else
+    {
+      /* Flip our client side flag, the real work happens on map. */
+      gdk_synthesize_window_state (window,
+                                   0,
+                                   GDK_WINDOW_STATE_ICONIFIED);
     }
+}
 
-  return TRUE;
+void
+gdk_window_deiconify (GdkWindow *window)
+{
+  g_return_if_fail (window != NULL);
+  g_return_if_fail (GDK_IS_WINDOW (window));
+
+  if (GDK_WINDOW_DESTROYED (window))
+    return;
+
+  if (GDK_WINDOW_IS_MAPPED (window))
+    {  
+      gdk_window_show (window);
+    }
+  else
+    {
+      /* Flip our client side flag, the real work happens on map. */
+      gdk_synthesize_window_state (window,
+                                   GDK_WINDOW_STATE_ICONIFIED,
+                                   0);
+    }
+}
+
+void
+gdk_window_stick (GdkWindow *window)
+{
+  g_return_if_fail (GDK_IS_WINDOW (window));
+
+  if (GDK_WINDOW_DESTROYED (window))
+    return;
+
+  if (GDK_WINDOW_IS_MAPPED (window))
+    {
+      /* "stick" means stick to all desktops _and_ do not scroll with the
+       * viewport. i.e. glue to the monitor glass in all cases.
+       */
+      g_warning ("gdk_window_stick (%p) ???", GDK_WINDOW_HWND (window));
+    }
+  else
+    {
+      /* Flip our client side flag, the real work happens on map. */
+      gdk_synthesize_window_state (window,
+                                   0,
+                                   GDK_WINDOW_STATE_STICKY);
+    }
+}
+
+void
+gdk_window_unstick (GdkWindow *window)
+{
+  g_return_if_fail (GDK_IS_WINDOW (window));
+
+  if (GDK_WINDOW_DESTROYED (window))
+    return;
+
+  if (GDK_WINDOW_IS_MAPPED (window))
+    {
+      g_warning ("gdk_window_unstick (%p) ???", GDK_WINDOW_HWND (window));
+    }
+  else
+    {
+      /* Flip our client side flag, the real work happens on map. */
+      gdk_synthesize_window_state (window,
+                                   GDK_WINDOW_STATE_STICKY,
+                                   0);
+    }
+}
+
+void
+gdk_window_maximize (GdkWindow *window)
+{
+  g_return_if_fail (GDK_IS_WINDOW (window));
+
+  if (GDK_WINDOW_DESTROYED (window))
+    return;
+
+  if (GDK_WINDOW_IS_MAPPED (window))
+    ShowWindow (GDK_WINDOW_HWND (window), SW_MAXIMIZE);
+  else
+    gdk_synthesize_window_state (window,
+                                0,
+                                GDK_WINDOW_STATE_MAXIMIZED);
+}
+
+void
+gdk_window_unmaximize (GdkWindow *window)
+{
+  g_return_if_fail (GDK_IS_WINDOW (window));
+
+  if (GDK_WINDOW_DESTROYED (window))
+    return;
+
+  if (GDK_WINDOW_IS_MAPPED (window))
+    ShowWindow (GDK_WINDOW_HWND (window), SW_RESTORE);
+  else
+    gdk_synthesize_window_state (window,
+                                GDK_WINDOW_STATE_MAXIMIZED,
+                                0);
+}
+
+void
+gdk_window_focus (GdkWindow *window,
+                  guint32    timestamp)
+{
+  g_return_if_fail (GDK_IS_WINDOW (window));
+
+  if (GDK_WINDOW_DESTROYED (window))
+    return;
+  
+  GDK_NOTE (MISC, g_print ("gdk_window_focus: %p\n", GDK_WINDOW_HWND (window)));
+
+  ShowWindow (GDK_WINDOW_HWND (window), SW_SHOWNORMAL);
+  SetFocus (GDK_WINDOW_HWND (window));
+}
+
+void
+gdk_window_set_modal_hint (GdkWindow *window,
+                          gboolean   modal)
+{
+  GdkWindowObject *private;
+
+  g_return_if_fail (window != NULL);
+  g_return_if_fail (GDK_IS_WINDOW (window));
+  
+  if (GDK_WINDOW_DESTROYED (window))
+    return;
+
+  private = (GdkWindowObject*) window;
+
+  private->modal_hint = modal;
+
+  if (GDK_WINDOW_IS_MAPPED (window))
+    if (!SetWindowPos (GDK_WINDOW_HWND (window), HWND_TOPMOST,
+                           0, 0, 0, 0, SWP_NOMOVE | SWP_NOSIZE))
+      WIN32_API_FAILED ("SetWindowPos");
+}
+
+void
+gdk_window_set_type_hint (GdkWindow        *window,
+                         GdkWindowTypeHint hint)
+{
+  g_return_if_fail (window != NULL);
+  g_return_if_fail (GDK_IS_WINDOW (window));
+  
+  if (GDK_WINDOW_DESTROYED (window))
+    return;
+
+  switch (hint)
+    {
+    case GDK_WINDOW_TYPE_HINT_DIALOG:
+      break;
+    case GDK_WINDOW_TYPE_HINT_MENU:
+      break;
+    case GDK_WINDOW_TYPE_HINT_TOOLBAR:
+      break;
+    default:
+      g_warning ("Unknown hint %d passed to gdk_window_set_type_hint", hint);
+      /* Fall thru */
+    case GDK_WINDOW_TYPE_HINT_NORMAL:
+      break;
+    }
+  /*
+   * XXX ???
+   */
+  GDK_NOTE (MISC, g_print ("gdk_window_set_type_hint (%p)\n",
+                          GDK_WINDOW_HWND (window)));
+}
+
+void
+gdk_window_shape_combine_region (GdkWindow *window,
+                                 GdkRegion *shape_region,
+                                 gint       offset_x,
+                                 gint       offset_y)
+{
+  g_return_if_fail (GDK_IS_WINDOW (window));
+
+  if (GDK_WINDOW_DESTROYED (window))
+    return;
+
+  /* XXX: even on X implemented conditional ... */  
+}
+
+void
+gdk_window_begin_resize_drag (GdkWindow     *window,
+                              GdkWindowEdge  edge,
+                              gint           button,
+                              gint           root_x,
+                              gint           root_y,
+                              guint32        timestamp)
+{
+  g_return_if_fail (GDK_IS_WINDOW (window));
+  
+  if (GDK_WINDOW_DESTROYED (window))
+    return;
+
+  /* XXX: isn't all this default on win32 ... */  
+}
+
+void
+gdk_window_begin_move_drag (GdkWindow *window,
+                            gint       button,
+                            gint       root_x,
+                            gint       root_y,
+                            guint32    timestamp)
+{
+  g_return_if_fail (GDK_IS_WINDOW (window));
+  
+  if (GDK_WINDOW_DESTROYED (window))
+    return;
+
+  /* XXX: isn't all this default on win32 ... */  
 }