X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/9b6dbb09746f8f5ee0549a2ff39ae0ac4c725898..6e264973e636cc41915d166cb7eddf2a7e72cf9b:/include/wx/motif/icon.h diff --git a/include/wx/motif/icon.h b/include/wx/motif/icon.h index 48ebe34c5e..8042fb8f06 100644 --- a/include/wx/motif/icon.h +++ b/include/wx/motif/icon.h @@ -18,6 +18,8 @@ #include "wx/bitmap.h" +/* +// Same as for wxBitmap class WXDLLEXPORT wxIconRefData: public wxBitmapRefData { friend class WXDLLEXPORT wxBitmap; @@ -25,15 +27,11 @@ class WXDLLEXPORT wxIconRefData: public wxBitmapRefData public: wxIconRefData(); ~wxIconRefData(); - -public: -/* TODO: whatever your actual icon handle is - WXHICON m_hIcon; -*/ }; +*/ -#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 @@ -45,63 +43,27 @@ public: // Copy constructors inline wxIcon(const wxIcon& icon) { Ref(icon); } - inline wxIcon(const wxIcon* icon) { if (icon) Ref(*icon); } + // Initialize with XBM data wxIcon(const char bits[], int width, int height); - wxIcon(const wxString& name, long flags = wxBITMAP_TYPE_ICO_RESOURCE, + + // 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_ICO_RESOURCE, + 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) { return m_refData == icon.m_refData; } - inline bool operator != (const wxIcon& icon) { return m_refData != icon.m_refData; } - -/* TODO: implementation - void SetHICON(WXHICON ico); - inline WXHICON GetHICON() const { return (M_ICONDATA ? M_ICONDATA->m_hIcon : 0); } -*/ - -/* TODO */ - virtual bool Ok() const { return (m_refData != NULL) ; } -}; - -/* 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); + 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)); } }; -*/ - #endif // _WX_ICON_H_