2 files changed, 8 insertions, 8 deletions

diff --git a/src/w32term.c b/src/w32term.c
index 5a11e2a871a..e8d66c9e5a1 100644
--- a/src/w32term.c
+++ b/src/w32term.c
@@ -257,7 +257,7 @@ XChangeGC (void *ignore, XGCValues *gc, unsigned long mask,
 }
 
 XGCValues *
-XCreateGC (void *ignore, Window window, unsigned long mask, XGCValues *xgcv)
+XCreateGC (void *ignore, HWND wignore, unsigned long mask, XGCValues *xgcv)
 {
   XGCValues *gc = xzalloc (sizeof (XGCValues));
 
@@ -974,7 +974,7 @@ x_set_cursor_gc (struct glyph_string *s)
                    mask, &xgcv);
       else
         FRAME_DISPLAY_INFO (s->f)->scratch_cursor_gc
-          = XCreateGC (NULL, s->window, mask, &xgcv);
+          = XCreateGC (NULL, FRAME_W32_WINDOW (s->f), mask, &xgcv);
 
       s->gc = FRAME_DISPLAY_INFO (s->f)->scratch_cursor_gc;
     }
@@ -1023,7 +1023,7 @@ x_set_mouse_face_gc (struct glyph_string *s)
                    mask, &xgcv);
       else
         FRAME_DISPLAY_INFO (s->f)->scratch_cursor_gc
-          = XCreateGC (NULL, s->window, mask, &xgcv);
+          = XCreateGC (NULL, FRAME_W32_WINDOW (s->f), mask, &xgcv);
 
       s->gc = FRAME_DISPLAY_INFO (s->f)->scratch_cursor_gc;
     }
@@ -1204,7 +1204,7 @@ x_draw_glyph_string_background (struct glyph_string *s, bool force_p)
         {
           /* Fill background with a stipple pattern.  */
           XSetFillStyle (s->display, s->gc, FillOpaqueStippled);
-          XFillRectangle (s->display, s->window, s->gc, s->x,
+          XFillRectangle (s->display, FRAME_W32_WINDOW (s->f), s->gc, s->x,
                           s->y + box_line_width,
                           s->background_width,
                           s->height - 2 * box_line_width);
@@ -2061,7 +2061,7 @@ x_draw_glyph_string_bg_rect (struct glyph_string *s, int x, int y, int w, int h)
     {
       /* Fill background with a stipple pattern.  */
       XSetFillStyle (s->display, s->gc, FillOpaqueStippled);
-      XFillRectangle (s->display, s->window, s->gc, x, y, w, h);
+      XFillRectangle (s->display, FRAME_W32_WINDOW (s->f), s->gc, x, y, w, h);
       XSetFillStyle (s->display, s->gc, FillSolid);
     }
   else
@@ -2133,7 +2133,7 @@ x_draw_image_glyph_string (struct glyph_string *s)
           int depth = DefaultDepthOfScreen (screen);
 
           /* Create a pixmap as large as the glyph string.  */
-          pixmap = XCreatePixmap (s->display, s->window,
+          pixmap = XCreatePixmap (s->display, FRAME_W32_WINDOW (s->f),
                                   s->background_width,
                                   s->height, depth);
 
@@ -2275,7 +2275,7 @@ x_draw_stretch_glyph_string (struct glyph_string *s)
             {
               /* Fill background with a stipple pattern.  */
               XSetFillStyle (s->display, gc, FillOpaqueStippled);
-              XFillRectangle (s->display, s->window, gc, x, y, w, h);
+              XFillRectangle (s->display, FRAME_W32_WINDOW (s->f), gc, x, y, w, h);
               XSetFillStyle (s->display, gc, FillSolid);
             }
           else
diff --git a/src/w32term.h b/src/w32term.h
index 320477073a5..e29e99357e8 100644
--- a/src/w32term.h
+++ b/src/w32term.h
@@ -790,7 +790,7 @@ typedef struct tagTRACKMOUSEEVENT
 struct image;
 struct face;
 
-XGCValues *XCreateGC (void *, Window, unsigned long, XGCValues *);
+XGCValues *XCreateGC (void *, HWND, unsigned long, XGCValues *);
 
 typedef DWORD (WINAPI * ClipboardSequence_Proc) (void);
 typedef BOOL (WINAPI * AppendMenuW_Proc) (