X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b7cacb43db1e69b87b257a67912b4d52995b070a..86ac84b8ce086e6bbda58f422d41f84268606e35:/include/wx/palmos/palette.h diff --git a/include/wx/palmos/palette.h b/include/wx/palmos/palette.h index 0229985a7a..f4c1ad4229 100644 --- a/include/wx/palmos/palette.h +++ b/include/wx/palmos/palette.h @@ -14,11 +14,11 @@ #include "wx/gdiobj.h" -class WXDLLEXPORT wxPalette; +class WXDLLIMPEXP_FWD_CORE wxPalette; -class WXDLLEXPORT wxPaletteRefData: public wxGDIRefData +class WXDLLIMPEXP_CORE wxPaletteRefData: public wxGDIRefData { - friend class WXDLLEXPORT wxPalette; + friend class WXDLLIMPEXP_FWD_CORE wxPalette; public: wxPaletteRefData(void); virtual ~wxPaletteRefData(void); @@ -28,7 +28,7 @@ protected: #define M_PALETTEDATA ((wxPaletteRefData *)m_refData) -class WXDLLEXPORT wxPalette: public wxPaletteBase +class WXDLLIMPEXP_CORE wxPalette: public wxPaletteBase { DECLARE_DYNAMIC_CLASS(wxPalette) @@ -41,12 +41,6 @@ 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 IsOk(); } - virtual bool IsOk(void) 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 FreeResource(bool force = false); inline WXHPALETTE GetHPALETTE(void) const { return (M_PALETTEDATA ? M_PALETTEDATA->m_hPalette : 0); }