Added WS_VSCROLL and WSHSCROLL styles again

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

diff --git a/src/xpm/rgbtab.h b/src/xpm/rgbtab.h
index 39e8d27c9ced9181bf7f131455fa57739b39f828..75b0f51aa2e2e54c6448a9b2a25068266a853ed6 100644 (file)
--- a/src/xpm/rgbtab.h
+++ b/src/xpm/rgbtab.h
@@ -47,6 +47,13 @@ typedef struct {
 #define myRGB(r,g,b) \
        ((unsigned long)r<<16|(unsigned long)g<<8|(unsigned long)b)
 */
 #define myRGB(r,g,b) \
        ((unsigned long)r<<16|(unsigned long)g<<8|(unsigned long)b)
 */

+
+/* Need an RBG conversion confunction here for OS/2 */
+#if defined(__VISAGECPP__)
+/* Bogus stuff to make it compile for now */
+static rgbRecord theRGBRecords[] = { {"AliceBlue", 0L}, {"AntiqueWhite", 1L}, NULL };
+static int numTheRGBRecords = 2;
+#else

 #define myRGB(r,g,b)   RGB(r,g,b)      /* MSW has this macro */
 
 
 #define myRGB(r,g,b)   RGB(r,g,b)      /* MSW has this macro */
 
 


@@ -290,3 +297,4 @@ static rgbRecord theRGBRecords[] =
 };
 
 static int numTheRGBRecords = 234;
 };
 
 static int numTheRGBRecords = 234;

+#endif