X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/df816ad92f556233cc6346e74dbbdb0317f442cd..a75124d0da255513e83d2e62f963dd849829466b:/include/wx/mac/carbon/palette.h diff --git a/include/wx/mac/carbon/palette.h b/include/wx/mac/carbon/palette.h index b28de1c40b..0532aed4e1 100644 --- a/include/wx/mac/carbon/palette.h +++ b/include/wx/mac/carbon/palette.h @@ -15,13 +15,13 @@ #include "wx/colour.h" #include "wx/gdiobj.h" -class WXDLLEXPORT wxPalette; +class WXDLLIMPEXP_FWD_CORE wxPalette; class WXDLLEXPORT wxPaletteRefData: public wxGDIRefData { DECLARE_NO_COPY_CLASS(wxPaletteRefData) - friend class WXDLLEXPORT wxPalette; + friend class WXDLLIMPEXP_FWD_CORE wxPalette; public: wxPaletteRefData(); virtual ~wxPaletteRefData(); @@ -44,10 +44,8 @@ public: 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 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; } + virtual bool Ok() const { return IsOk(); } + virtual bool IsOk() const { return (m_refData != NULL) ; } virtual int GetColoursCount() const;