Make wxString::WorstEncodingCase take a const wxMBConv&

[wxWidgets.git] / include / wx / colour.h

diff --git a/include/wx/colour.h b/include/wx/colour.h
index 88b50afca501364b9b73079502aa3dd1e6190140..1c44ce4ef7581d757fc11fd073d79899187e516b 100644 (file)
--- a/include/wx/colour.h
+++ b/include/wx/colour.h
@@ -1,19 +1,27 @@
 #ifndef _WX_COLOUR_H_BASE_
 #define _WX_COLOUR_H_BASE_
 
-#if defined(__WXMSW__)
+#if defined(__PALMOS__)
+#include "wx/palmos/colour.h"
+#elif defined(__WXMSW__)
 #include "wx/msw/colour.h"
 #elif defined(__WXMOTIF__)
 #include "wx/motif/colour.h"
 #elif defined(__WXGTK__)
 #include "wx/gtk/colour.h"
-#elif defined(__WXQT__)
-#include "wx/qt/colour.h"
+#elif defined(__WXMGL__)
+#include "wx/mgl/colour.h"
+#elif defined(__WXX11__)
+#include "wx/x11/colour.h"
 #elif defined(__WXMAC__)
 #include "wx/mac/colour.h"
-#elif defined(__WXSTUBS__)
-#include "wx/stubs/colour.h"
+#elif defined(__WXCOCOA__)
+#include "wx/cocoa/colour.h"
+#elif defined(__WXPM__)
+#include "wx/os2/colour.h"
 #endif
 
+#define wxColor wxColour
+
 #endif
     // _WX_COLOUR_H_BASE_