implemented wxGetSingleChoiceIndex version that takes wxArrayString

[wxWidgets.git] / src / xpm / simx.h

diff --git a/src/xpm/simx.h b/src/xpm/simx.h
index 0b3439dbc7c67528035d6e8ee76fc52ce1286e93..9b916182f790f14388819e7811b170c03de4596c 100644 (file)
--- a/src/xpm/simx.h
+++ b/src/xpm/simx.h
@@ -44,17 +44,27 @@
 #else
 #define INCL_PM
 #define INCL_GPI
 #else
 #define INCL_PM
 #define INCL_GPI

+#define INCL_DEV

 #include<os2.h>
 typedef unsigned long COLORREF;
 #include<os2.h>
 typedef unsigned long COLORREF;

+/*

 // RGB under OS2 is more like a PALETTEENTRY struct under Windows so we need a real RGB def
 // RGB under OS2 is more like a PALETTEENTRY struct under Windows so we need a real RGB def

-//#define OS2RGB(r,g,b) ((ULONG ((BYTE) (r) | ((UINT) (g) << 8)) | (((ULONG)(BYTE)(b)) << 16)))
-#define OS2RGB(r,g,b) ((unsigned long)r<<16|(unsigned long)g<<8|(unsigned long)b)
+// #define OS2RGB(r,g,b) ((ULONG ((BYTE) (r) | ((UINT) (g) << 8)) | (((ULONG)(BYTE)(b)) << 16)))
+*/
+#ifndef OS2RGB
+#  define OS2RGB(r,g,b) ((unsigned long)r<<16|(unsigned long)g<<8|(unsigned long)b)
+#endif

 
 

-#define GetBValue(rgb) ((BYTE)((rgb) >> 16))
-#define GetGValue(rgb) ((BYTE)(((WORD)(rgb)) >> 8))
-#define GetRValue(rgb) ((BYTE)(rgb))
-typedef UINT    WORD;
+#ifndef GetBValue
+#  define GetBValue(rgb) ((BYTE)((rgb) >> 16))
+#endif
+#ifndef GetGValue
+#  define GetGValue(rgb) ((BYTE)(((UINT)(rgb)) >> 8))
+#endif
+#ifndef GetRValue
+#  define GetRValue(rgb) ((BYTE)(rgb))

 #endif
 #endif

+#endif /* else __OS2__ */

 
 
 /*
 
 
 /*


@@ -80,7 +90,12 @@ FUNC(boundCheckingRealloc, void *, (void *p, long s));
 /* define MSW types for X window types,
    I don't know much about MSW, but the following defines do the job */
 
 /* define MSW types for X window types,
    I don't know much about MSW, but the following defines do the job */
 

+#if !defined(__OS2__)

 typedef HDC Display;                   /* this should be similar */
 typedef HDC Display;                   /* this should be similar */

+#else
+typedef HPS Display;
+#endif
+

 typedef void *Screen;                  /* not used */
 typedef void *Visual;                  /* not used yet, is for GRAY, COLOR,
                                         * MONO */
 typedef void *Screen;                  /* not used */
 typedef void *Visual;                  /* not used yet, is for GRAY, COLOR,
                                         * MONO */