X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/4b912ef220f5509b4d6a09a38c9e7839b5f11a6b..e14d10b039e68a701a447043a4031cf43e9fa90b:/include/wx/gtk1/icon.h diff --git a/include/wx/gtk1/icon.h b/include/wx/gtk1/icon.h index f537cb131f..10bb5b12a2 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(__APPLE__) #pragma interface #endif @@ -45,6 +45,11 @@ public: } wxIcon( char **bits, int width=-1, int height=-1 ); + wxIcon(const wxIconLocation& loc) + : wxBitmap(loc.GetFileName(), wxBITMAP_TYPE_XPM) + { + } + 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); }