X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/99d800190a04a2deaf769017a5fae04a4ae50378..52170c5b4419c63d6e0083df411aad420395ec98:/include/wx/palette.h?ds=sidebyside diff --git a/include/wx/palette.h b/include/wx/palette.h index ec364de2bb..15be24fe3f 100644 --- 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