X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/917be7ed065337e8a7a67615969ecaade9eea809..5d0fac27c4b2151b1ff3689cdb602bbaf10a4003:/include/wx/mac/carbon/palette.h diff --git a/include/wx/mac/carbon/palette.h b/include/wx/mac/carbon/palette.h index ed9acb81bc..f64a6ec46e 100644 --- a/include/wx/mac/carbon/palette.h +++ b/include/wx/mac/carbon/palette.h @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: palette.h +// Name: wx/mac/carbon/palette.h // Purpose: wxPalette class // Author: Stefan Csomor // Modified by: @@ -12,10 +12,6 @@ #ifndef _WX_PALETTE_H_ #define _WX_PALETTE_H_ -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) -#pragma interface "palette.h" -#endif - #include "wx/colour.h" #include "wx/gdiobj.h" @@ -28,7 +24,7 @@ class WXDLLEXPORT wxPaletteRefData: public wxGDIRefData friend class WXDLLEXPORT wxPalette; public: wxPaletteRefData(); - ~wxPaletteRefData(); + virtual ~wxPaletteRefData(); protected: wxColour* m_palette; wxInt32 m_count ; @@ -38,30 +34,23 @@ protected: class WXDLLEXPORT wxPalette: public wxPaletteBase { - DECLARE_DYNAMIC_CLASS(wxPalette) - public: - wxPalette(); - wxPalette(const wxPalette& palette) - : wxPaletteBase() - { Ref(palette); } - - wxPalette(int n, const unsigned char *red, const unsigned char *green, const unsigned char *blue); - ~wxPalette(); - 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; - bool GetRGB(int pixel, unsigned char *red, unsigned char *green, unsigned char *blue) const; - - virtual bool Ok() const { return (m_refData != NULL) ; } - - inline wxPalette& operator = (const wxPalette& palette) { if (*this == palette) return (*this); Ref(palette); return *this; } - inline bool operator == (const wxPalette& palette) { return m_refData == palette.m_refData; } - inline bool operator != (const wxPalette& palette) { return m_refData != palette.m_refData; } - -/* TODO: implementation - inline WXHPALETTE GetHPALETTE() const { return (M_PALETTEDATA ? M_PALETTEDATA->m_hPalette : 0); } - void SetHPALETTE(WXHPALETTE pal); -*/ + wxPalette(); + + wxPalette(int n, const unsigned char *red, const unsigned char *green, const unsigned char *blue); + virtual ~wxPalette(); + 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; + + virtual bool Ok() const { return IsOk(); } + virtual bool IsOk() const { return (m_refData != NULL) ; } + + virtual int GetColoursCount() const; + +private: + DECLARE_DYNAMIC_CLASS(wxPalette) }; #endif