X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/88ef3a57a47f840adea9d38bc11cb30689a0838a..0db8bb5866f74a271e03fd0204f7560c710e6265:/include/wx/mac/classic/palette.h diff --git a/include/wx/mac/classic/palette.h b/include/wx/mac/classic/palette.h index c888113b88..cfb7569994 100644 --- a/include/wx/mac/classic/palette.h +++ b/include/wx/mac/classic/palette.h @@ -24,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,19 +38,16 @@ class WXDLLEXPORT wxPalette: public wxPaletteBase 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(); + 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 (m_refData != NULL) ; } + virtual bool Ok() const { return IsOk(); } + virtual bool IsOk() 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) const { return m_refData == palette.m_refData; } inline bool operator != (const wxPalette& palette) const { return m_refData != palette.m_refData; }