X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/77ffb5937e89927b621128789401db8921fe580f..682214d5c6ec3e56dbdfd0c97d70d87e614b38c2:/include/wx/generic/paletteg.h diff --git a/include/wx/generic/paletteg.h b/include/wx/generic/paletteg.h index 2aa5b4259e..54a6b51f73 100644 --- a/include/wx/generic/paletteg.h +++ b/include/wx/generic/paletteg.h @@ -5,7 +5,7 @@ // Created: 01/02/97 // Id: // Copyright: (c) 1998 Robert Roebling and Julian Smart -// Licence: wxWidgets licence +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -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__