X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8cf73271dd6f442a98e86b559d4a55c37e25b99f..90527a50d74bed6ed6b4d163e8170ae8c3f5d869:/include/wx/mac/carbon/palette.h diff --git a/include/wx/mac/carbon/palette.h b/include/wx/mac/carbon/palette.h index 74f9a4dd30..ada43c0b8a 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" @@ -24,7 +20,7 @@ class WXDLLEXPORT wxPalette; class WXDLLEXPORT wxPaletteRefData: public wxGDIRefData { DECLARE_NO_COPY_CLASS(wxPaletteRefData) - + friend class WXDLLEXPORT wxPalette; public: wxPaletteRefData(); @@ -36,27 +32,23 @@ protected: #define M_PALETTEDATA ((wxPaletteRefData *)m_refData) -class WXDLLEXPORT wxPalette: public wxGDIObject +class WXDLLEXPORT wxPalette: public wxPaletteBase { DECLARE_DYNAMIC_CLASS(wxPalette) public: wxPalette(); - wxPalette(const wxPalette& palette) - : wxGDIObject() - { 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; + 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 (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; } + inline bool operator == (const wxPalette& palette) const { return m_refData == palette.m_refData; } + inline bool operator != (const wxPalette& palette) const { return m_refData != palette.m_refData; } /* TODO: implementation inline WXHPALETTE GetHPALETTE() const { return (M_PALETTEDATA ? M_PALETTEDATA->m_hPalette : 0); }