X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/4b41f6bc001ea11a0585771e0fa92c7bc1dc6863..211cc8dc907ee50ca6d383b8df16bba9a4d3ce2d:/src/xpm/scan.c

diff --git a/src/xpm/scan.c b/src/xpm/scan.c
index 8ff2e47c95..f5e61bb78d 100644
--- a/src/xpm/scan.c
+++ b/src/xpm/scan.c
@@ -96,16 +96,25 @@ LFUNC(AGetImagePixels, int, (XImage *image, unsigned int width,
 			     int (*storeFunc) ()));
 # endif/* AMIGA */
 #else  /* ndef FOR_MSW */
+
+#if defined(__OS2__) && defined(__VISAGECPP30__)
+LFUNC(MSWGetImagePixels, int, (Display* display, XImage* image, unsigned int width,
+                               unsigned int height, PixelsMap* pmap,
+                               int (*storeFunc) (Pixel, PixelsMap*, unsigned int*)));
+#else
 LFUNC(MSWGetImagePixels, int, (Display *d, XImage *image, unsigned int width,
-			       unsigned int height, PixelsMap *pmap,
-			       int (*storeFunc) ()));
+                   unsigned int height, PixelsMap *pmap,
+                   int (*storeFunc) ()));
+#endif
+
 #endif
+
 LFUNC(ScanTransparentColor, int, (XpmColor *color, unsigned int cpp,
-				  XpmAttributes *attributes));
+                  XpmAttributes *attributes));
 
 LFUNC(ScanOtherColors, int, (Display *display, XpmColor *colors, int ncolors,
-			     Pixel *pixels, unsigned int mask,
-			     unsigned int cpp, XpmAttributes *attributes));
+                 Pixel *pixels, unsigned int mask,
+                 unsigned int cpp, XpmAttributes *attributes));
 
 /*
  * This function stores the given pixel in the given arrays which are grown
@@ -261,7 +270,7 @@ XpmCreateXpmImageFromImage(display, image, shapeimage,
     /*
      * scan shape mask if any
      */
-    if (shapeimage) 
+    if (shapeimage)
     {
 #ifndef FOR_MSW
 # ifndef AMIGA
@@ -273,11 +282,8 @@ XpmCreateXpmImageFromImage(display, image, shapeimage,
 # endif /* AMIGA */
 #else
 
-#ifndef __OS2__
 	    ErrorStatus = MSWGetImagePixels(display, shapeimage, width, height,
 		    			&pmap, storeMaskPixel);
-/* calling convention all messed up OS/2 -- figure out later */
-#endif
 
 #endif /* ndef for FOR_MSW */
 
@@ -293,7 +299,7 @@ XpmCreateXpmImageFromImage(display, image, shapeimage,
      *
      */
 
-    if (image) 
+    if (image)
     {
 #ifndef FOR_MSW
 # ifndef AMIGA
@@ -301,7 +307,7 @@ XpmCreateXpmImageFromImage(display, image, shapeimage,
 	        (image->byte_order == image->bitmap_bit_order))
     	    ErrorStatus = GetImagePixels1(image, width, height, &pmap,
 	    				  storePixel);
-	    else if (image->format == ZPixmap) 
+	    else if (image->format == ZPixmap)
     	{
 	        if (image->bits_per_pixel == 8)
     		    ErrorStatus = GetImagePixels8(image, width, height, &pmap);
@@ -309,21 +315,17 @@ XpmCreateXpmImageFromImage(display, image, shapeimage,
 		        ErrorStatus = GetImagePixels16(image, width, height, &pmap);
     	    else if (image->bits_per_pixel == 32)
 	        	ErrorStatus = GetImagePixels32(image, width, height, &pmap);
-    	} 
+    	}
 	    else
 	        ErrorStatus = GetImagePixels(image, width, height, &pmap);
 # else
 	    ErrorStatus = AGetImagePixels(image, width, height, &pmap,
 		    		      storePixel);
 # endif /* AMIGA */
-
 #else
 
-#ifndef __OS2__
 	    ErrorStatus = MSWGetImagePixels(display, image, width, height, &pmap,
 		    			storePixel);
-/* calling convention all messed up OS/2 -- figure out later */
-#endif
 
 #endif
 
@@ -508,7 +510,7 @@ ScanOtherColors(display, colors, ncolors, pixels, mask, cpp, attributes)
 	return (XpmNoMemory);
 
     for (i = 0, i2 = mask, color = colors, xcolor = xcolors;
-	 i < ncolors; i++, i2++, color++, xcolor++, pixels++) {
+	 i < (unsigned)ncolors; i++, i2++, color++, xcolor++, pixels++) {
 
 	if (!(s = color->string = (char *) XpmMalloc(cpp + 1))) {
 	    XpmFree(xcolors);
@@ -551,7 +553,7 @@ ScanOtherColors(display, colors, ncolors, pixels, mask, cpp, attributes)
     }
 /* end 3.2 bc */
 
-    for (i = 0, color = colors, xcolor = xcolors; i < ncolors;
+    for (i = 0, color = colors, xcolor = xcolors; i < (unsigned)ncolors;
 						  i++, color++, xcolor++) {
 
 	/* look for related info from the attributes if any */
@@ -603,7 +605,7 @@ ScanOtherColors(display, colors, ncolors, pixels, mask, cpp, attributes)
 #else
 		sprintf(buf, "#%02x%02x%02x",
 			xcolor->red, xcolor->green, xcolor->blue);
-#endif			
+#endif
 		color->c_color = (char *) xpmstrdup(buf);
 	    }
 	    if (!color->c_color) {
@@ -991,9 +993,18 @@ AGetImagePixels (
 #else  /* ndef FOR_MSW */
 
 #ifdef __OS2__
-/* Visual Age cannot deal with old, non-ansi, code */
-static int
-MSWGetImagePixels(
+
+#ifdef __VISAGECPP30__
+static int MSWGetImagePixels(
+  Display*     display
+, XImage*      image
+, unsigned int width
+, unsigned int height
+, PixelsMap*   pmap
+, int          (*storeFunc) (Pixel, PixelsMap*, unsigned int*)
+)
+#else
+static int MSWGetImagePixels(
   Display*     display
 , XImage*      image
 , unsigned int width
@@ -1001,6 +1012,8 @@ MSWGetImagePixels(
 , PixelsMap*   pmap
 , int          (*storeFunc) ()
 )
+#endif
+
 #else
 static int
 MSWGetImagePixels(display, image, width, height, pmap, storeFunc)
@@ -1016,8 +1029,8 @@ MSWGetImagePixels(display, image, width, height, pmap, storeFunc)
     unsigned int x, y;
     Pixel pixel;
 #ifdef __OS2__
-     HAB          hab;
-     HPS          hps;
+     HAB          hab = WinQueryAnchorBlock(HWND_DESKTOP);
+     HDC          shapedc;
      DEVOPENSTRUC dop = {NULL, "DISPLAY", NULL, NULL, NULL, NULL, NULL, NULL, NULL};
      SIZEL        sizl = {0, 0};
      POINTL       point;
@@ -1026,8 +1039,9 @@ MSWGetImagePixels(display, image, width, height, pmap, storeFunc)
     iptr = pmap->pixelindex;
 
 #ifdef __OS2__
-    hps = GpiCreatePS(hab, *display, &sizl, GPIA_ASSOC | PU_PELS);
-    GpiSetBitmap(hps, image->bitmap);
+    shapedc = DevOpenDC(hab, OD_MEMORY, "*", 5L, (PDEVOPENDATA)&dop, NULLHANDLE);
+    *display = GpiCreatePS(hab, shapedc, &sizl, GPIA_ASSOC | PU_PELS);
+    GpiSetBitmap(*display, image->bitmap);
 #else
     SelectObject(*display, image->bitmap);
 #endif
@@ -1037,16 +1051,13 @@ MSWGetImagePixels(display, image, width, height, pmap, storeFunc)
 #ifdef __OS2__
      point.x = x;
      point.y = y;
-     pixel = GpiQueryPel(hps, &point);
+     pixel = GpiQueryPel(*display, &point);
 #else
 	    pixel = GetPixel(*display, x, y);
 #endif
 
-#ifndef __OS2__
-/* calling convention all messed up under OS/2 */
 	    if ((*storeFunc) (pixel, pmap, iptr))
 		return (XpmNoMemory);
-#endif
 	}
     }
     return (XpmSuccess);