forgot to uncomment a few things

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

diff --git a/src/xpm/scan.c b/src/xpm/scan.c
index 8ff2e47c952c8976fdb6793381778c1ebd9e1d6a..f1b35d0e12e70f5f81501daee73458594318e559 100644 (file)
--- a/src/xpm/scan.c
+++ b/src/xpm/scan.c
@@ -319,11 +319,9 @@ XpmCreateXpmImageFromImage(display, image, shapeimage,
 
 #else
 
 
 #else
 

-#ifndef __OS2__

            ErrorStatus = MSWGetImagePixels(display, image, width, height, &pmap,
                                        storePixel);
 /* calling convention all messed up OS/2 -- figure out later */
            ErrorStatus = MSWGetImagePixels(display, image, width, height, &pmap,
                                        storePixel);
 /* calling convention all messed up OS/2 -- figure out later */

-#endif

 
 #endif
 
 
 #endif
 


@@ -1042,11 +1040,8 @@ MSWGetImagePixels(display, image, width, height, pmap, storeFunc)
            pixel = GetPixel(*display, x, y);
 #endif
 
            pixel = GetPixel(*display, x, y);
 #endif
 

-#ifndef __OS2__
-/* calling convention all messed up under OS/2 */

            if ((*storeFunc) (pixel, pmap, iptr))
                return (XpmNoMemory);
            if ((*storeFunc) (pixel, pmap, iptr))
                return (XpmNoMemory);

-#endif

        }
     }
     return (XpmSuccess);
        }
     }
     return (XpmSuccess);