X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e45080c10b11190028e843b617564caec95e82dd..a74deb88184cfdf0e7c535312b163daea3a9f64e:/include/wx/msw/icon.h diff --git a/include/wx/msw/icon.h b/include/wx/msw/icon.h index 7984f79d37..46c29a6c3a 100644 --- a/include/wx/msw/icon.h +++ b/include/wx/msw/icon.h @@ -24,7 +24,7 @@ // notice that although wxIconRefData inherits from wxBitmapRefData, it is not // a valid wxBitmapRefData -class WXDLLEXPORT wxIconRefData : public wxGDIImageRefData +class WXDLLIMPEXP_CORE wxIconRefData : public wxGDIImageRefData { public: wxIconRefData() { } @@ -37,7 +37,7 @@ public: // Icon // --------------------------------------------------------------------------- -class WXDLLEXPORT wxIcon : public wxGDIImage +class WXDLLIMPEXP_CORE wxIcon : public wxGDIImage { public: // ctors @@ -54,7 +54,7 @@ public: #endif // from resource/file wxIcon(const wxString& name, - long type = wxBITMAP_TYPE_ICO_RESOURCE, + wxBitmapType type = wxBITMAP_TYPE_ICO_RESOURCE, int desiredWidth = -1, int desiredHeight = -1); wxIcon(const wxIconLocation& loc); @@ -62,7 +62,7 @@ public: virtual ~wxIcon(); virtual bool LoadFile(const wxString& name, - long type = wxBITMAP_TYPE_ICO_RESOURCE, + wxBitmapType type = wxBITMAP_TYPE_ICO_RESOURCE, int desiredWidth = -1, int desiredHeight = -1); // implementation only from now on