X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/16c1f7f345e1850f590cfbf67c3b00fbb6d2e62e..8f25531f6f1ec5cc29f7ea8d09143133e1b8edbb:/include/wx/motif/icon.h?ds=sidebyside diff --git a/include/wx/motif/icon.h b/include/wx/motif/icon.h index 012fd0754d..4ddc46c336 100644 --- a/include/wx/motif/icon.h +++ b/include/wx/motif/icon.h @@ -18,80 +18,40 @@ #include "wx/bitmap.h" -class WXDLLEXPORT wxIconRefData: public wxBitmapRefData -{ - friend class WXDLLEXPORT wxBitmap; - friend class WXDLLEXPORT wxIcon; -public: - wxIconRefData(); - ~wxIconRefData(); -}; - -#define M_ICONDATA ((wxIconRefData *)m_refData) -#define M_ICONHANDLERDATA ((wxIconRefData *)bitmap->GetRefData()) +#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); } - inline wxIcon(const wxIcon* icon) { if (icon) Ref(*icon); } - - wxIcon(const char bits[], int width, int height); - 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; } - -/* TODO */ - virtual bool Ok() const { return (m_refData != NULL) ; } + 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, long flags = wxBITMAP_TYPE_XPM, + int desiredWidth = -1, int desiredHeight = -1); + ~wxIcon(); + + bool LoadFile(const wxString& name, long flags = wxBITMAP_TYPE_XPM, + 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) 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)); } }; -/* Example handlers. TODO: write your own handlers for relevant types. - -class WXDLLEXPORT wxICOFileHandler: public wxBitmapHandler -{ - DECLARE_DYNAMIC_CLASS(wxICOFileHandler) -public: - inline wxICOFileHandler() - { - m_name = "ICO icon file"; - m_extension = "ico"; - m_type = wxBITMAP_TYPE_ICO; - }; - - virtual bool LoadFile(wxBitmap *bitmap, const wxString& name, long flags, - int desiredWidth = -1, int desiredHeight = -1); -}; - -class WXDLLEXPORT wxICOResourceHandler: public wxBitmapHandler -{ - DECLARE_DYNAMIC_CLASS(wxICOResourceHandler) -public: - inline wxICOResourceHandler() - { - m_name = "ICO resource"; - m_extension = "ico"; - m_type = wxBITMAP_TYPE_ICO_RESOURCE; - }; - - virtual bool LoadFile(wxBitmap *bitmap, const wxString& name, long flags, - int desiredWidth = -1, int desiredHeight = -1); - -}; - -*/ - #endif - // _WX_ICON_H_ +// _WX_ICON_H_