Visualge V3.0 fix

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@6277 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/xpm/MAKEFILE.VA b/src/xpm/MAKEFILE.VA
index 0aecccdd905c85b044f31354ac3a98bd34692fa1..eaf1200223a2413c403028c45551cc53570581ce 100644 (file)
--- a/src/xpm/MAKEFILE.VA
+++ b/src/xpm/MAKEFILE.VA
@@ -13,7 +13,7 @@
 OBJSUFF=obj
 SRCSUFF=cpp
 
-OS2FLAGS=/c /W2 /DOS232 /D__VISAGECPP__ /Dwx_msw /Q /N100
+OS2FLAGS=/c /W2 /DOS232 /D__VISAGECPP30__ /Dwx_msw /Q /N100
 OS2LINKFLAGS=/BASE:0x00010000 /PMTYPE:PM /NOE /NOD /ALIGN:16
 OS2LIBFLAGS=/NOL /NOE
 OS2LIBS=CPPOM30.lib CPPOOC3.LIB OS2386.LIB
@@ -111,6 +111,23 @@ LIBOBJECTS = \
   wrffrdat.obj \
   wrffri.obj
 
+all:  $(OBJECTS) $(OS2XPMLIB)
+
+$(WXDIR)\lib\os2xpm.lib: $(LIBOBJECTS)
+ touch $(WXDIR)\lib\os2xpm.lib
+ del $(WXDIR)\lib\os2xpm.lib
+ ilib $(OS2LIBFLAGS) $@ @<<
+    $**;
+<<
+  del *.obj
+
+clean:
+        del      $(OS2XPMLIB)
+        erase /N $(OS2XPMDIR)\$D
+        rd       $(OS2XPMDIR)\$D
+
+cleanall:     clean
+
 $(LIBOBJECTS):
   copy ..\xpm\$D\attrib.obj
   copy ..\xpm\$D\crbuffri.obj
@@ -132,20 +149,3 @@ $(LIBOBJECTS):
   copy ..\xpm\$D\wrffrdat.obj
   copy ..\xpm\$D\wrffri.obj
 
-all:  $(OBJECTS) $(OS2XPMLIB)
-
-$(WXDIR)\lib\os2xpm.lib: $(LIBOBJECTS)
- touch $(WXDIR)\lib\os2xpm.lib
- del $(WXDIR)\lib\os2xpm.lib
- ilib $(OS2LIBFLAGS) $@ @<<
-    $**;
-<<
-  del *.obj
-
-clean:
-        del      $(OS2XPMLIB)
-        erase /N $(OS2XPMDIR)\$D
-        rd       $(OS2XPMDIR)\$D
-
-cleanall:     clean
-

diff --git a/src/xpm/scan.c b/src/xpm/scan.c
index f1b35d0e12e70f5f81501daee73458594318e559..f3c7f49d8d838fa24b794dbfceeb16a0326ef084 100644 (file)
--- a/src/xpm/scan.c
+++ b/src/xpm/scan.c
@@ -261,7 +261,7 @@ XpmCreateXpmImageFromImage(display, image, shapeimage,
     /*
      * scan shape mask if any
      */
-    if (shapeimage) 
+    if (shapeimage)
     {
 #ifndef FOR_MSW
 # ifndef AMIGA
@@ -293,7 +293,7 @@ XpmCreateXpmImageFromImage(display, image, shapeimage,
      *
      */
 
-    if (image) 
+    if (image)
     {
 #ifndef FOR_MSW
 # ifndef AMIGA
@@ -301,7 +301,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,7 +309,7 @@ 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
@@ -317,11 +317,8 @@ XpmCreateXpmImageFromImage(display, image, shapeimage,
                                      storePixel);
 # endif /* AMIGA */
 
-#else
-
            ErrorStatus = MSWGetImagePixels(display, image, width, height, &pmap,
                                        storePixel);
-/* calling convention all messed up OS/2 -- figure out later */
 
 #endif
 
@@ -989,9 +986,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
@@ -999,6 +1005,8 @@ MSWGetImagePixels(
 , PixelsMap*   pmap
 , int          (*storeFunc) ()
 )
+#endif
+
 #else
 static int
 MSWGetImagePixels(display, image, width, height, pmap, storeFunc)