bug fixes for using wxTransientPopupWindow and wxDP_ALLOWNONE support from Andreas...

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

diff --git a/include/wx/colour.h b/include/wx/colour.h
index 3fff20043186499810cfe7193e0407ba206c987c..da566b2dc739fd405cdfb5de9ed4da1a168e2550 100644 (file)
--- a/include/wx/colour.h
+++ b/include/wx/colour.h
@@ -1,18 +1,24 @@
 #ifndef _WX_COLOUR_H_BASE_
 #define _WX_COLOUR_H_BASE_
 
 #ifndef _WX_COLOUR_H_BASE_
 #define _WX_COLOUR_H_BASE_
 

-#if defined(__WXMSW__)
+#if defined(__WXPALMOS__)
+#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"
 #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(__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
 
 #define wxColor wxColour