X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/88ef3a57a47f840adea9d38bc11cb30689a0838a..dbaa16de075ca1f81ee663f11a67cecf4c0eb7bd:/include/wx/os2/palette.h?ds=sidebyside diff --git a/include/wx/os2/palette.h b/include/wx/os2/palette.h index 3e90e05682..ba3109be26 100644 --- a/include/wx/os2/palette.h +++ b/include/wx/os2/palette.h @@ -15,14 +15,14 @@ #include "wx/gdiobj.h" #include "wx/os2/private.h" -class WXDLLEXPORT wxPalette; +class WXDLLIMPEXP_FWD_CORE wxPalette; class WXDLLEXPORT wxPaletteRefData: public wxGDIRefData { - friend class WXDLLEXPORT wxPalette; + friend class WXDLLIMPEXP_FWD_CORE wxPalette; public: wxPaletteRefData(); - ~wxPaletteRefData(); + virtual ~wxPaletteRefData(); // protected: WXHPALETTE m_hPalette; HPS m_hPS; @@ -36,14 +36,13 @@ class WXDLLEXPORT wxPalette: public wxPaletteBase public: wxPalette(); - inline wxPalette(const wxPalette& rPalette) { Ref(rPalette); } wxPalette( int n ,const unsigned char* pRed ,const unsigned char* pGreen ,const unsigned char* pBlue ); - ~wxPalette(); + virtual ~wxPalette(); bool Create( int n ,const unsigned char* pRed @@ -60,14 +59,6 @@ public: ,unsigned char* pBlue ) const; - virtual bool Ok(void) const { return (m_refData != NULL) ; } - - inline wxPalette& operator = (const wxPalette& rPalette) { if (*this == rPalette) return (*this); Ref(rPalette); return *this; } - inline bool operator == (const wxPalette& rPalette) const - { return m_refData == rPalette.m_refData; } - inline bool operator != (const wxPalette& rPalette) const - { return m_refData != rPalette.m_refData; } - virtual bool FreeResource(bool bForce = false); inline WXHPALETTE GetHPALETTE(void) const { return (M_PALETTEDATA ? M_PALETTEDATA->m_hPalette : 0); }