compilation

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

diff --git a/include/wx/palette.h b/include/wx/palette.h
index ec364de2bb6ddf01fb55a4762c275e8b50795331..15be24fe3feb0b48982f5d3eaab9921ffc8e7156 100644 (file)
--- a/include/wx/palette.h
+++ b/include/wx/palette.h
@@ -19,14 +19,15 @@
 #include "wx/object.h"
 #include "wx/gdiobj.h"
 
-// wxBrushBase
+// wxPaletteBase
 class WXDLLEXPORT wxPaletteBase: public wxGDIObject
 {
 public:
     virtual ~wxPaletteBase() { }
 
-    virtual bool Ok() const = 0;
-    virtual int GetColoursCount() const { wxFAIL_MSG( _T("not implemented") ); return 0; };
+    virtual bool Ok() const { return IsOk(); }
+    virtual bool IsOk() const = 0;
+    virtual int GetColoursCount() const { wxFAIL_MSG( _T("not implemented") ); return 0; }
 };
 
 #if defined(__WXPALMOS__)
@@ -47,11 +48,6 @@ public:
     #include "wx/os2/palette.h"
 #endif
 
-#if WXWIN_COMPATIBILITY_2_4
-    #define wxColorMap wxPalette
-    #define wxColourMap wxPalette
-#endif
-
 #endif // wxUSE_PALETTE
 
 #endif