correction to maintain data array in synch with string array

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

diff --git a/src/xpm/simx.h b/src/xpm/simx.h
index 001cfdb4eb83832efd1a9b2b8d13e47c289a1f00..0b3439dbc7c67528035d6e8ee76fc52ce1286e93 100644 (file)
--- a/src/xpm/simx.h
+++ b/src/xpm/simx.h
@@ -39,7 +39,23 @@
 
 #ifdef FOR_MSW
 
+#if !defined(__OS2__)
 #include "windows.h"                   /* MS windows GDI types */
+#else
+#define INCL_PM
+#define INCL_GPI
+#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
+//#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 GetBValue(rgb) ((BYTE)((rgb) >> 16))
+#define GetGValue(rgb) ((BYTE)(((WORD)(rgb)) >> 8))
+#define GetRValue(rgb) ((BYTE)(rgb))
+typedef UINT    WORD;
+#endif
+
 
 /*
  * minimal portability layer between ansi and KR C
@@ -49,11 +65,11 @@
 /* these defines get undefed at the end of this file */
 #if __STDC__ || defined(__cplusplus) || defined(c_plusplus)
  /* ANSI || C++ */
-#define FUNC(f, t, p) extern t f p
-#define LFUNC(f, t, p) static t f p
+#  define FUNC(f, t, p) extern t f p
+#  define LFUNC(f, t, p) static t f p
 #else /* k&R */
-#define FUNC(f, t, p) extern t f()
-#define LFUNC(f, t, p) static t f()
+#  define FUNC(f, t, p) extern t f()
+#  define LFUNC(f, t, p) static t f()
 #endif