X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/12028905135250524409f1e7b9bfa9c55e5ce16b..682214d5c6ec3e56dbdfd0c97d70d87e614b38c2:/include/wx/generic/paletteg.h?ds=sidebyside diff --git a/include/wx/generic/paletteg.h b/include/wx/generic/paletteg.h index 3ff00fbf20..54a6b51f73 100644 --- a/include/wx/generic/paletteg.h +++ b/include/wx/generic/paletteg.h @@ -31,7 +31,7 @@ class wxPalette; // wxPalette //----------------------------------------------------------------------------- -class wxPalette: public wxGDIObject +class wxPalette: public wxPaletteBase { DECLARE_DYNAMIC_CLASS(wxPalette) @@ -44,7 +44,7 @@ class wxPalette: public wxGDIObject wxPalette& operator = ( const wxPalette& palette ); bool operator == ( const wxPalette& palette ); bool operator != ( const wxPalette& palette ); - bool Ok() const; + virtual bool Ok() const; bool Create( int n, const unsigned char *red, const unsigned char *green, const unsigned char *blue); int GetPixel( const unsigned char red, const unsigned char green, const unsigned char blue ) const; @@ -53,7 +53,4 @@ class wxPalette: public wxGDIObject // no data }; -#define wxColorMap wxPalette -#define wxColourMap wxPalette - #endif // __WX_PALETTEG_H__