need to cast image->mem away from void* to avoid 'error C2036: 'void *' :

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

diff --git a/gdk/win32/gdkdrawable-win32.c b/gdk/win32/gdkdrawable-win32.c
index 8350525ea117900ce111b63a7b387ef985051864..4f94df3299dfabff80de70911d09bc8b8ca7b9b3 100644 (file)
--- a/gdk/win32/gdkdrawable-win32.c
+++ b/gdk/win32/gdkdrawable-win32.c
@@ -176,6 +176,8 @@ gdk_drawable_impl_win32_class_init (GdkDrawableImplWin32Class *klass)
   drawable_class->get_visual = gdk_win32_get_visual;
 
   drawable_class->get_image = _gdk_win32_get_image;
+
+  drawable_class->_copy_to_image = _gdk_win32_copy_to_image;
 }
 
 static void
@@ -1026,7 +1028,7 @@ gdk_win32_draw_image (GdkDrawable     *drawable,
 
   hdc = gdk_win32_hdc_get (drawable, gc, 0);
 
-  if (image->visual->type == GDK_VISUAL_PSEUDO_COLOR &&
+  if (image->visual && image->visual->type == GDK_VISUAL_PSEUDO_COLOR &&
          colormap_private && colormap_private->xcolormap->rc_palette)
     {
       if (!bmi_inited)