fixed serious bug in wxFont::operator== (ignored weight)

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

diff --git a/src/xpm/rgbtab.h b/src/xpm/rgbtab.h
index 39e8d27c9ced9181bf7f131455fa57739b39f828..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,8 +47,11 @@ typedef struct {
 #define myRGB(r,g,b) \
        ((unsigned long)r<<16|(unsigned long)g<<8|(unsigned long)b)
 */
+#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[] =
 {