1. moved InheritAttributes() from wxControl to wxWindow

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

diff --git a/include/wx/palette.h b/include/wx/palette.h
index 1dbae83aa477b07ed3c3664e8c3ed95bcea57499..52d2da66a1f194f55b53cb78baf650a8ca4ac6d8 100644 (file)
--- a/include/wx/palette.h
+++ b/include/wx/palette.h
@@ -1,13 +1,28 @@
-#ifndef __PALETTEH_BASE__
-#define __PALETTEH_BASE__
-
-#if defined(__WINDOWS__)
-#include "wx/msw/palette.h"
-#elif defined(__MOTIF__)
-#include "wx/xt/palette.h"
-#elif defined(__GTK__)
-#include "wx/gtk/palette.h"
+#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"
+#elif defined(__WXGTK__) || defined(__WXCOCOA__)
+    #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"

 #endif
 
 #endif
 

+#endif // wxUSE_PALETTE
+

 #endif
 #endif

-    // __PALETTEH_BASE__
+    // _WX_PALETTE_H_BASE_