X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a4294b7832a5aed3c1cccc06aecd227d43da8830..52170c5b4419c63d6e0083df411aad420395ec98:/include/wx/motif/icon.h diff --git a/include/wx/motif/icon.h b/include/wx/motif/icon.h index dcec9a6004..0be2892759 100644 --- a/include/wx/motif/icon.h +++ b/include/wx/motif/icon.h @@ -1,69 +1,62 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: icon.h +// Name: wx/motif/icon.h // Purpose: wxIcon class // Author: Julian Smart // Modified by: // Created: 17/09/98 // RCS-ID: $Id$ // Copyright: (c) Julian Smart -// Licence: wxWindows licence +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// #ifndef _WX_ICON_H_ #define _WX_ICON_H_ -#ifdef __GNUG__ -#pragma interface "icon.h" -#endif - #include "wx/bitmap.h" -/* -// Same as for wxBitmap -class WXDLLEXPORT wxIconRefData: public wxBitmapRefData +// Icon +class WXDLLEXPORT wxIcon : public wxBitmap { - friend class WXDLLEXPORT wxBitmap; - friend class WXDLLEXPORT wxIcon; public: - wxIconRefData(); - ~wxIconRefData(); -}; -*/ + wxIcon(); -#define M_ICONDATA ((wxBitmapRefData *)m_refData) -#define M_ICONHANDLERDATA ((wxBitmapRefData *)bitmap->GetRefData()) + // Initialize with XBM data + wxIcon(const char bits[], int width, int height); -// Icon -class WXDLLEXPORT wxIcon: public wxBitmap -{ - DECLARE_DYNAMIC_CLASS(wxIcon) + // Initialize with XPM data + wxIcon(const char **data); + wxIcon(char **data); -public: - wxIcon(); + wxIcon(const wxString& name, wxBitmapType type = wxBITMAP_TYPE_XPM, + int desiredWidth = -1, int desiredHeight = -1) + { + LoadFile(name, type, desiredWidth, desiredHeight); + } - // Copy constructors - inline wxIcon(const wxIcon& icon) { Ref(icon); } - inline wxIcon(const wxIcon* icon) { if (icon) Ref(*icon); } + wxIcon(const wxIconLocation& loc) + { + LoadFile(loc.GetFileName(), wxBITMAP_TYPE_ANY); + } - // Initialize with XBM data - wxIcon(const char bits[], int width, int height); + virtual ~wxIcon(); - // Initialize with XPM data - wxIcon(char **data); + bool LoadFile(const wxString& name, wxBitmapType type, + int desiredWidth, int desiredHeight = -1); - wxIcon(const wxString& name, long flags = wxBITMAP_TYPE_ICO_RESOURCE, - int desiredWidth = -1, int desiredHeight = -1); - ~wxIcon(); + // unhide base class LoadFile() + virtual bool LoadFile(const wxString& name, + wxBitmapType type = wxBITMAP_TYPE_XPM) + { + return LoadFile(name, type, -1, -1); + } - bool LoadFile(const wxString& name, long flags = wxBITMAP_TYPE_ICO_RESOURCE, - 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) { 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)); } + DECLARE_DYNAMIC_CLASS(wxIcon) }; -#endif - // _WX_ICON_H_ +#endif // _WX_ICON_H_