X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/793f619f7f0e5b1eaba6a9e3f731462c1893b7f7..40bd6154f1476dbe598c60b4760bbf2fe0d9ab0f:/include/wx/gtk1/icon.h?ds=sidebyside diff --git a/include/wx/gtk1/icon.h b/include/wx/gtk1/icon.h index e306018665..9455d6c8ab 100644 --- a/include/wx/gtk1/icon.h +++ b/include/wx/gtk1/icon.h @@ -31,25 +31,26 @@ 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, 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; } + 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) };