fix for assert when setting tooltip for a readonly combo

[wxWidgets.git] / src / xpm / create.c

diff --git a/src/xpm/create.c b/src/xpm/create.c
index a40b9882f7a8a27b4f618bf9005e7598bf294741..1105c1fb3d3dde94aafc00c75d0f47da81a292f1 100644 (file)
--- a/src/xpm/create.c
+++ b/src/xpm/create.c
@@ -267,7 +267,7 @@ AllocColor(
 static int
 AllocColor(display, colormap, colorname, xcolor, closure)
     Display *display;
-    Colormap* colormap;
+    Colormap colormap;
     char *colorname;
     XColor *xcolor;
     void *closure;             /* not used */
@@ -563,9 +563,9 @@ SetColor(display, colormap, visual, colorname, color_index,
        *mask_pixel = 0;
 #else
 #ifdef __OS2__
-       *mask_pixel = OS2RGB(0,0,0);
+    *mask_pixel = OS2RGB(255,255,255);
 #else
-       *mask_pixel = RGB(0,0,0);
+    *mask_pixel = RGB(255,255,255);
 #endif
 #endif
        /* store the color table index */