GetIcon() returns wxIconLocation, not wxIcon, now

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

diff --git a/include/wx/palette.h b/include/wx/palette.h
index 8e8c6b5bba312b900fb4a741c3e25daa70a8b60f..52d2da66a1f194f55b53cb78baf650a8ca4ac6d8 100644 (file)
--- a/include/wx/palette.h
+++ b/include/wx/palette.h
@@ -1,22 +1,25 @@
 #ifndef _WX_PALETTE_H_BASE_
 #define _WX_PALETTE_H_BASE_
 
 #ifndef _WX_PALETTE_H_BASE_
 #define _WX_PALETTE_H_BASE_
 

+// include it to get wxUSE_PALETTE value
+#include "wx/setup.h"
+

 #if wxUSE_PALETTE
 
 #if defined(__WXMSW__)
     #include "wx/msw/palette.h"
 #elif defined(__WXMOTIF__)
     #include "wx/motif/palette.h"
 #if wxUSE_PALETTE
 
 #if defined(__WXMSW__)
     #include "wx/msw/palette.h"
 #elif defined(__WXMOTIF__)
     #include "wx/motif/palette.h"

-#elif defined(__WXGTK__)
+#elif defined(__WXGTK__) || defined(__WXCOCOA__)

     #include "wx/generic/paletteg.h"
     #include "wx/generic/paletteg.h"

+#elif defined(__WXX11__)
+    #include "wx/x11/palette.h"

 #elif defined(__WXMGL__)
     #include "wx/mgl/palette.h"
 #elif defined(__WXMAC__)
     #include "wx/mac/palette.h"
 #elif defined(__WXPM__)
     #include "wx/os2/palette.h"
 #elif defined(__WXMGL__)
     #include "wx/mgl/palette.h"
 #elif defined(__WXMAC__)
     #include "wx/mac/palette.h"
 #elif defined(__WXPM__)
     #include "wx/os2/palette.h"

-#elif defined(__WXSTUBS__)
-    #include "wx/stubs/palette.h"

 #endif
 
 #endif // wxUSE_PALETTE
 #endif
 
 #endif // wxUSE_PALETTE