moved SetBestSize() to .cpp file; set min size from it

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

diff --git a/include/wx/palette.h b/include/wx/palette.h
index a09f55dc321bcfde167c6819d2caae5a5a243908..52d2da66a1f194f55b53cb78baf650a8ca4ac6d8 100644 (file)
--- a/include/wx/palette.h
+++ b/include/wx/palette.h
@@ -1,21 +1,28 @@
 #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__)
 #if defined(__WXMSW__)

-#include "wx/msw/palette.h"
+    #include "wx/msw/palette.h"

 #elif defined(__WXMOTIF__)
 #elif defined(__WXMOTIF__)

-#include "wx/motif/palette.h"
-#elif defined(__WXGTK__)
-#include "wx/generic/paletteg.h"
+    #include "wx/motif/palette.h"
+#elif defined(__WXGTK__) || defined(__WXCOCOA__)
+    #include "wx/generic/paletteg.h"
+#elif defined(__WXX11__)
+    #include "wx/x11/palette.h"

 #elif defined(__WXMGL__)
 #elif defined(__WXMGL__)

-#include "wx/mgl/palette.h"
+    #include "wx/mgl/palette.h"

 #elif defined(__WXMAC__)
 #elif defined(__WXMAC__)

-#include "wx/mac/palette.h"
+    #include "wx/mac/palette.h"

 #elif defined(__WXPM__)
 #elif defined(__WXPM__)

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

 #endif
 
 #endif
 

+#endif // wxUSE_PALETTE
+

 #endif
     // _WX_PALETTE_H_BASE_
 #endif
     // _WX_PALETTE_H_BASE_