X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c0ed460c2e7802793d591c84f3cfdbff159c5549..73bab6b44da953b35b902c9f3199582e4e76d89b:/include/wx/motif/icon.h diff --git a/include/wx/motif/icon.h b/include/wx/motif/icon.h index 89f048ab15..ec4b1a4050 100644 --- a/include/wx/motif/icon.h +++ b/include/wx/motif/icon.h @@ -12,57 +12,48 @@ #ifndef _WX_ICON_H_ #define _WX_ICON_H_ -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(__APPLE__) #pragma interface "icon.h" #endif #include "wx/bitmap.h" -/* -// Same as for wxBitmap -class WXDLLEXPORT wxIconRefData: public wxBitmapRefData -{ - friend class WXDLLEXPORT wxBitmap; - friend class WXDLLEXPORT wxIcon; -public: - wxIconRefData(); - ~wxIconRefData(); -}; -*/ - -#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(); - - // Copy constructors - inline wxIcon(const wxIcon& icon) { Ref(icon); } - - // Initialize with XBM data - wxIcon(const char bits[], int width, int height); - - // Initialize with XPM data - wxIcon(char **data); - - wxIcon(const wxString& name, long flags = wxBITMAP_TYPE_ICO_RESOURCE, - int desiredWidth = -1, int desiredHeight = -1); - ~wxIcon(); - - bool LoadFile(const wxString& name, long flags = wxBITMAP_TYPE_ICO_RESOURCE, - int desiredWidth = -1, int desiredHeight = -1); - - inline wxIcon& operator = (const wxIcon& icon) { if (*this == icon) return (*this); Ref(icon); return *this; } - inline bool operator == (const wxIcon& icon) { return m_refData == icon.m_refData; } - inline bool operator != (const wxIcon& icon) { return m_refData != icon.m_refData; } - - virtual bool Ok() const { return ((m_refData != NULL) && (M_ICONDATA->m_ok)); } + wxIcon(); + + // Copy constructors + inline wxIcon(const wxIcon& icon) { Ref(icon); } + + // Initialize with XBM data + wxIcon(const char bits[], int width, int height); + + // Initialize with XPM data + wxIcon(const char **data); + wxIcon(char **data); + + wxIcon(const wxString& name, wxBitmapType type = wxBITMAP_TYPE_XPM, + int desiredWidth = -1, int desiredHeight = -1); + ~wxIcon(); + + bool LoadFile(const wxString& name, wxBitmapType type = wxBITMAP_TYPE_XPM, + int desiredWidth = -1, int desiredHeight = -1); + + // create from bitmap (which should have a mask unless it's monochrome): + // there shouldn't be any implicit bitmap -> icon conversion (i.e. no + // 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; } }; -#endif - // _WX_ICON_H_ +#endif // _WX_ICON_H_