X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c781807d89448537ba1d6d8627ff153f3ecc581a..5d7836c47de679f03b1b7e738c77164c11bd3689:/include/wx/msw/icon.h?ds=sidebyside diff --git a/include/wx/msw/icon.h b/include/wx/msw/icon.h index 741874298c..4fa08e2f6a 100644 --- a/include/wx/msw/icon.h +++ b/include/wx/msw/icon.h @@ -12,10 +12,6 @@ #ifndef _WX_ICON_H_ #define _WX_ICON_H_ -#ifdef __GNUG__ - #pragma interface "icon.h" -#endif - // ---------------------------------------------------------------------------- // headers // ---------------------------------------------------------------------------- @@ -49,18 +45,23 @@ public: wxIcon() { } // copy - wxIcon(const wxIcon& icon) { Ref(icon); } + wxIcon(const wxIcon& icon) : wxGDIImage(icon) { Ref(icon); } // 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, @@ -91,6 +92,8 @@ protected: return new wxIconRefData; } + virtual wxObjectRefData *CloneRefData(const wxObjectRefData *data) const; + // create from XPM data void CreateIconFromXpm(const char **data);