X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1bc822dfb5cdc24fd2d98b59ea20c9951301bfb1..d171743ed3ddbf0178a9d68cf78999a3ca999826:/include/wx/motif/icon.h?ds=sidebyside diff --git a/include/wx/motif/icon.h b/include/wx/motif/icon.h index 9d58ceb389..c4700ea2be 100644 --- a/include/wx/motif/icon.h +++ b/include/wx/motif/icon.h @@ -18,13 +18,10 @@ #include "wx/bitmap.h" -#define M_ICONDATA ((wxBitmapRefData *)m_refData) -#define M_ICONHANDLERDATA ((wxBitmapRefData *)bitmap->GetRefData()) - // Icon class WXDLLEXPORT wxIcon: public wxBitmap { - DECLARE_DYNAMIC_CLASS(wxIcon) + DECLARE_DYNAMIC_CLASS(wxIcon); public: wxIcon(); @@ -51,12 +48,12 @@ public: // ctors, assignment operators...), but it's ok to have such function void CopyFromBitmap(const wxBitmap& bmp); - inline wxIcon& operator = (const wxIcon& icon) { if (*this == icon) return (*this); Ref(icon); return *this; } - inline bool operator == (const wxIcon& icon) const { return m_refData == icon.m_refData; } - inline bool operator != (const wxIcon& icon) const { return m_refData != icon.m_refData; } - - virtual bool Ok() const { return ((m_refData != NULL) && (M_ICONDATA->m_ok)); } + inline wxIcon& operator = (const wxIcon& icon) + { if (*this == icon) return (*this); Ref(icon); return *this; } + inline bool operator == (const wxIcon& icon) const + { return m_refData == icon.m_refData; } + inline bool operator != (const wxIcon& icon) const + { return m_refData != icon.m_refData; } }; -#endif -// _WX_ICON_H_ +#endif // _WX_ICON_H_