honour min/max size in wxMGL's wxWindow::DoSetSize

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

diff --git a/src/xpm/rgbtab.h b/src/xpm/rgbtab.h
index 75b0f51aa2e2e54c6448a9b2a25068266a853ed6..2d95e999f5aa0ebdc2271cee54f62c9e5e2dc85f 100644 (file)
--- a/src/xpm/rgbtab.h
+++ b/src/xpm/rgbtab.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1989-94 GROUPE BULL
+ * Copyright (C) 1989-95 GROUPE BULL
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to
@@ -47,15 +47,11 @@ typedef struct {
 #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
+#ifndef __OS2__
 #define myRGB(r,g,b)   RGB(r,g,b)      /* MSW has this macro */
-
+#else
+#define myRGB(r,g,b)    OS2RGB(r,g,b)
+#endif
 
 static rgbRecord theRGBRecords[] =
 {
@@ -297,4 +293,3 @@ static rgbRecord theRGBRecords[] =
 };
 
 static int numTheRGBRecords = 234;
-#endif