X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f8855e47254a28f5141524b3aaaac03c2944e997..f54e5c1a4f6952c62ed4480f7d26feddc20f98ba:/include/wx/palmos/palette.h?ds=sidebyside diff --git a/include/wx/palmos/palette.h b/include/wx/palmos/palette.h index 28e4109d20..f4c1ad4229 100644 --- a/include/wx/palmos/palette.h +++ b/include/wx/palmos/palette.h @@ -14,21 +14,21 @@ #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); - ~wxPaletteRefData(void); + virtual ~wxPaletteRefData(void); protected: WXHPALETTE m_hPalette; }; #define M_PALETTEDATA ((wxPaletteRefData *)m_refData) -class WXDLLEXPORT wxPalette: public wxPaletteBase +class WXDLLIMPEXP_CORE wxPalette: public wxPaletteBase { DECLARE_DYNAMIC_CLASS(wxPalette) @@ -36,16 +36,11 @@ public: wxPalette(void); wxPalette(int n, const unsigned char *red, const unsigned char *green, const unsigned char *blue); - ~wxPalette(void); + virtual ~wxPalette(void); 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(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); }