allow using CPPUNIT_ASSERT_EQUAL(int, wxFileOffset) too

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

diff --git a/include/wx/palette.h b/include/wx/palette.h
index b04f513466f51ad1e2bd7f3e0070ec55f99ff845..02edb405b556319248d17aad9ed143827444b5aa 100644 (file)
--- a/include/wx/palette.h
+++ b/include/wx/palette.h
@@ -20,13 +20,11 @@
 #include "wx/gdiobj.h"
 
 // wxPaletteBase
-class WXDLLEXPORT wxPaletteBase: public wxGDIObject
+class WXDLLIMPEXP_CORE wxPaletteBase: public wxGDIObject
 {
 public:
     virtual ~wxPaletteBase() { }
 
-    virtual bool Ok() const { return IsOk(); }
-    virtual bool IsOk() const = 0;
     virtual int GetColoursCount() const { wxFAIL_MSG( _T("not implemented") ); return 0; }
 };
 
@@ -34,26 +32,18 @@ public:
     #include "wx/palmos/palette.h"
 #elif defined(__WXMSW__)
     #include "wx/msw/palette.h"
-#elif defined(__WXMOTIF__)
-    #include "wx/motif/palette.h"
+#elif defined(__WXX11__) || defined(__WXMOTIF__)
+    #include "wx/x11/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"
+    #include "wx/osx/palette.h"
 #elif defined(__WXPM__)
     #include "wx/os2/palette.h"
 #endif
 
-#if WXWIN_COMPATIBILITY_2_4
-    #define wxColorMap wxPalette
-    #define wxColourMap wxPalette
-#endif
-
 #endif // wxUSE_PALETTE
 
-#endif
-    // _WX_PALETTE_H_BASE_
+#endif // _WX_PALETTE_H_BASE_