X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/4b912ef220f5509b4d6a09a38c9e7839b5f11a6b..f99422e9e916202c36a62534236d2288aae435c7:/include/wx/gtk/icon.h?ds=sidebyside diff --git a/include/wx/gtk/icon.h b/include/wx/gtk/icon.h index f537cb131f..c784b646e4 100644 --- a/include/wx/gtk/icon.h +++ b/include/wx/gtk/icon.h @@ -11,7 +11,7 @@ #ifndef __GTKICONH__ #define __GTKICONH__ -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #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_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); }