X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/793f619f7f0e5b1eaba6a9e3f731462c1893b7f7..9d9ad67384e5dc658c4de46e49113c321489bf81:/include/wx/gtk1/icon.h diff --git a/include/wx/gtk1/icon.h b/include/wx/gtk1/icon.h index e306018665..0bcbf462c0 100644 --- a/include/wx/gtk1/icon.h +++ b/include/wx/gtk1/icon.h @@ -11,7 +11,7 @@ #ifndef __GTKICONH__ #define __GTKICONH__ -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #pragma interface #endif @@ -31,25 +31,36 @@ class wxIcon; class wxIcon: public wxBitmap { - DECLARE_DYNAMIC_CLASS(wxIcon) - public: + wxIcon(); + wxIcon( const wxIcon& icon); + wxIcon( const char **bits, int width=-1, int height=-1 ); + + // For compatibility with wxMSW where desired size is sometimes required to + // distinguish between multiple icons in a resource. + wxIcon( const wxString& filename, wxBitmapType type = wxBITMAP_TYPE_XPM, + int WXUNUSED(desiredWidth)=-1, int WXUNUSED(desiredHeight)=-1 ) : + wxBitmap(filename, type) + { + } + wxIcon( char **bits, int width=-1, int height=-1 ); + + wxIcon(const wxIconLocation& loc) + : wxBitmap(loc.GetFileName(), wxBITMAP_TYPE_ANY) + { + } + + wxIcon& operator=(const wxIcon& icon); + bool operator==(const wxIcon& icon) const { return m_refData == icon.m_refData; } + bool operator!=(const wxIcon& icon) const { return !(*this == icon); } + + // 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); - wxIcon(); - wxIcon( const wxIcon& icon); - wxIcon( const char **bits, int width=-1, int height=-1 ); - - // For compatibility with wxMSW where desired size is sometimes required to - // distinguish between multiple icons in a resource. - wxIcon( const wxString& filename, int type = wxBITMAP_TYPE_XPM, int WXUNUSED(desiredWidth)=-1, int WXUNUSED(desiredHeight)=-1 ): - wxBitmap(filename, type) - { - } - wxIcon( char **bits, int width=-1, int height=-1 ); - - wxIcon& operator = (const wxIcon& icon); - inline bool operator == (const wxIcon& icon) { return m_refData == icon.m_refData; } - inline bool operator != (const wxIcon& icon) { return m_refData != icon.m_refData; } +private: + DECLARE_DYNAMIC_CLASS(wxIcon) };