X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/fbfb8bcc3fa17e079d4219655b173f8ed2ccc65a..bc1d617aac6575b9764b3f8195504ee79c978f49:/include/wx/generic/paletteg.h?ds=sidebyside diff --git a/include/wx/generic/paletteg.h b/include/wx/generic/paletteg.h index 4f1ee46384..a8ecde7185 100644 --- a/include/wx/generic/paletteg.h +++ b/include/wx/generic/paletteg.h @@ -1,9 +1,9 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: palette.h +// Name: wx/generic/paletteg.h // Purpose: // Author: Robert Roebling // Created: 01/02/97 -// Id: +// RCS-ID: $Id$ // Copyright: (c) 1998 Robert Roebling and Julian Smart // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -21,7 +21,7 @@ // classes //----------------------------------------------------------------------------- -class WXDLLIMPEXP_CORE wxPalette; +class WXDLLIMPEXP_FWD_CORE wxPalette; //----------------------------------------------------------------------------- // wxPalette @@ -29,24 +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 ); - wxPalette( const wxPalette& palette ); - ~wxPalette(); - wxPalette& operator = ( const wxPalette& palette ); - bool operator == ( const wxPalette& palette ) const; - bool operator != ( const wxPalette& palette ) const; - virtual bool Ok() const; + virtual ~wxPalette(); + 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( const unsigned char red, const unsigned char green, const unsigned char blue ) const; + 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__