X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/7581faf616eef3617152b9ad05b939999f442502..961dd75341aaa5083098fefd5c1074d8308b5732:/include/wx/msw/icon.h diff --git a/include/wx/msw/icon.h b/include/wx/msw/icon.h index a83ec7baa4..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,15 +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,