X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/d3c7fc996a73e9f6a83067bc28a3c5581a3fee65..3b49331b7441e091fc5997b830801d76a1243f28:/include/wx/generic/paletteg.h?ds=sidebyside diff --git a/include/wx/generic/paletteg.h b/include/wx/generic/paletteg.h index f059c0c4f5..a8ecde7185 100644 --- a/include/wx/generic/paletteg.h +++ b/include/wx/generic/paletteg.h @@ -21,7 +21,7 @@ // classes //----------------------------------------------------------------------------- -class WXDLLIMPEXP_CORE wxPalette; +class WXDLLIMPEXP_FWD_CORE wxPalette; //----------------------------------------------------------------------------- // wxPalette @@ -29,22 +29,21 @@ class WXDLLIMPEXP_CORE wxPalette; class WXDLLIMPEXP_CORE wxPalette: public wxPaletteBase { - DECLARE_DYNAMIC_CLASS(wxPalette) - - public: - +public: wxPalette(); wxPalette( int n, const unsigned char *red, const unsigned char *green, const unsigned char *blue ); virtual ~wxPalette(); - bool operator == ( const wxPalette& palette ) const; - bool operator != ( const wxPalette& palette ) const; - virtual bool Ok() const; + virtual bool Ok() const { return IsOk(); } + virtual bool IsOk() const; bool Create( int n, const unsigned char *red, const unsigned char *green, const unsigned char *blue); int GetPixel( unsigned char red, unsigned char green, unsigned char blue ) const; bool GetRGB( int pixel, unsigned char *red, unsigned char *green, unsigned char *blue ) const; - // no data + virtual int GetColoursCount() const; + +private: + DECLARE_DYNAMIC_CLASS(wxPalette) }; #endif // __WX_PALETTEG_H__