X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c781807d89448537ba1d6d8627ff153f3ecc581a..5524d92aaa1752e94e8b81abd7859713c96ba963:/include/wx/msw/icon.h?ds=sidebyside diff --git a/include/wx/msw/icon.h b/include/wx/msw/icon.h index 741874298c..ac8695bdb7 100644 --- a/include/wx/msw/icon.h +++ b/include/wx/msw/icon.h @@ -12,7 +12,7 @@ #ifndef _WX_ICON_H_ #define _WX_ICON_H_ -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #pragma interface "icon.h" #endif @@ -53,14 +53,19 @@ public: // from raw data wxIcon(const char bits[], int width, int height); + // from XPM data wxIcon(const char **data) { CreateIconFromXpm(data); } + wxIcon(char **data) { CreateIconFromXpm((const char **)data); } + // from resource/file wxIcon(const wxString& name, long type = wxBITMAP_TYPE_ICO_RESOURCE, int desiredWidth = -1, int desiredHeight = -1); + wxIcon(const wxIconLocation& loc); + virtual ~wxIcon(); virtual bool LoadFile(const wxString& name,