added missing operators to wxString::reverse_iterator

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

diff --git a/include/wx/palette.h b/include/wx/palette.h
index 28951a21cee56c20bc7801746f0e614c44814a60..15be24fe3feb0b48982f5d3eaab9921ffc8e7156 100644 (file)
--- a/include/wx/palette.h
+++ b/include/wx/palette.h
@@ -25,8 +25,9 @@ class WXDLLEXPORT wxPaletteBase: public wxGDIObject
 public:
     virtual ~wxPaletteBase() { }
 
 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__)
 };
 
 #if defined(__WXPALMOS__)


@@ -47,11 +48,6 @@ public:
     #include "wx/os2/palette.h"
 #endif
 
     #include "wx/os2/palette.h"
 #endif
 

-#if WXWIN_COMPATIBILITY_2_4
-    #define wxColorMap wxPalette
-    #define wxColourMap wxPalette
-#endif
-

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