Store just pixel value of background colour.

[~andy/gtk] / gdk / win32 / gdkdrawable-win32.c

diff --git a/gdk/win32/gdkdrawable-win32.c b/gdk/win32/gdkdrawable-win32.c
index 299d28170f3c03b9a029e34fbfa88f0dbc4190c1..519cc0f6dbaa695f47c76330a83ec9978778b514 100644 (file)
--- a/gdk/win32/gdkdrawable-win32.c
+++ b/gdk/win32/gdkdrawable-win32.c
@@ -726,26 +726,26 @@ gdk_win32_draw_points (GdkDrawable *drawable,
                       GdkPoint    *points,
                       gint         npoints)
 {
-  GdkGCPrivate *gc_private = (GdkGCPrivate*) gc;
-  GdkGCWin32Data *gc_data = GDK_GC_WIN32DATA (gc_private);
   HDC hdc;
   COLORREF fg;
+  GdkGCPrivate *gc_private = (GdkGCPrivate*) gc;
+  GdkGCWin32Data *gc_data = GDK_GC_WIN32DATA (gc_private);
+  GdkDrawablePrivate *drawable_private = (GdkDrawablePrivate *) drawable;
+  GdkColormapPrivateWin32 *colormap_private =
+    (GdkColormapPrivateWin32 *) drawable_private->colormap;
   int i;
 
-  GDK_NOTE (MISC, g_print ("gdk_draw_points: %#x destdc: (%d) %#x "
-                          "npoints: %d\n",
-                          GDK_DRAWABLE_XID (drawable),
-                          gc_private, hdc,
-                          npoints));
+  hdc = gdk_gc_predraw (drawable, gc_private, 0);
+  
+  fg = gdk_colormap_color (colormap_private, gc_data->foreground);
 
-  hdc = gdk_gc_predraw (drawable, gc_private, GDK_GC_FOREGROUND);
-  fg = GetTextColor (hdc);
+  GDK_NOTE (MISC, g_print ("gdk_draw_points: %#x %dx%.06x\n",
+                          GDK_DRAWABLE_XID (drawable), npoints, fg));
 
   for (i = 0; i < npoints; i++)
-    {
-      SetPixel (hdc, points[i].x, points[i].y, fg);
-    }
-  gdk_gc_postdraw (drawable, gc_private, GDK_GC_FOREGROUND);
+    SetPixel (hdc, points[i].x, points[i].y, fg);
+
+  gdk_gc_postdraw (drawable, gc_private, 0);
 }
 
 static void