X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ce113d5ffec01244cb96ab3d9fbd2619c3f6766f..3b49331b7441e091fc5997b830801d76a1243f28:/include/wx/generic/paletteg.h diff --git a/include/wx/generic/paletteg.h b/include/wx/generic/paletteg.h index 9e63395c3d..a8ecde7185 100644 --- a/include/wx/generic/paletteg.h +++ b/include/wx/generic/paletteg.h @@ -1,10 +1,10 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: palette.h +// Name: wx/generic/paletteg.h // Purpose: // Author: Robert Roebling // Created: 01/02/97 -// Id: -// Copyright: (c) 1998 Robert Roebling, Julian Smart and Markus Holzem +// RCS-ID: $Id$ +// Copyright: (c) 1998 Robert Roebling and Julian Smart // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -12,10 +12,6 @@ #ifndef __WX_PALETTEG_H__ #define __WX_PALETTEG_H__ -#ifdef __GNUG__ -#pragma interface "paletteg.h" -#endif - #include "wx/defs.h" #include "wx/object.h" #include "wx/gdiobj.h" @@ -25,35 +21,29 @@ // classes //----------------------------------------------------------------------------- -class wxPalette; +class WXDLLIMPEXP_FWD_CORE wxPalette; //----------------------------------------------------------------------------- // wxPalette //----------------------------------------------------------------------------- -class wxPalette: public wxGDIObject +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 ); - bool operator != ( const wxPalette& palette ); - 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; -#define wxColorMap wxPalette -#define wxColourMap wxPalette +private: + DECLARE_DYNAMIC_CLASS(wxPalette) +}; #endif // __WX_PALETTEG_H__