Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Make wxIcon more independent from wxBitmap implementation.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19941 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Mattia Barbon
2003-04-02 20:48:57 +00:00
parent 70aac632a1
commit 59e034c034
3 changed files with 24 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
include/wx/motif/icon.h
View File

@@ -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_