]> git.saurik.com Git - wxWidgets.git/blobdiff - include/wx/colour.h
Avoid warnings from VC++ 5.0
[wxWidgets.git] / include / wx / colour.h
index 15833968a46d03d6d1698c33223f408d91618e8a..509dc7440512c16dc09f43612b1ebd3e7652f794 100644 (file)
 // this macro avoids to repeat these lines across all colour.h files, since
 // Set() is a virtual function and thus cannot be called by wxColourBase
 // constructors
-#define DEFINE_STD_WXCOLOUR_CONSTRUCTORS                                        \
-    wxColour( unsigned char red, unsigned char green, unsigned char blue )      \
-        { Set(red, green, blue); }                                              \
-    wxColour( unsigned long colRGB ) { Set(colRGB); }                           \
-    wxColour(const wxString &colourName) { Set(colourName); }                   \
+#define DEFINE_STD_WXCOLOUR_CONSTRUCTORS                                    \
+    wxColour( unsigned char red, unsigned char green, unsigned char blue )  \
+        { Set(red, green, blue); }                                          \
+    wxColour( unsigned long colRGB ) { Set(colRGB); }                       \
+    wxColour(const wxString &colourName) { Set(colourName); }               \
     wxColour(const wxChar *colourName) { Set(colourName); }
 
 
@@ -114,7 +114,7 @@ public:
 #elif defined(__WXGTK__)
 #include "wx/gtk1/colour.h"
 #elif defined(__WXMGL__)
-#include "wx/mgl/colour.h"
+#include "wx/generic/colour.h"
 #elif defined(__WXX11__)
 #include "wx/x11/colour.h"
 #elif defined(__WXMAC__)