X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b5dbe15d0bacde245539f54c4d97af6b4696f01f..2c66581eaae92045864aa8d0ab80fc27f8725e52:/include/wx/iconbndl.h diff --git a/include/wx/iconbndl.h b/include/wx/iconbndl.h index d7e037b23b..c52c984d8a 100644 --- a/include/wx/iconbndl.h +++ b/include/wx/iconbndl.h @@ -28,7 +28,7 @@ WX_DECLARE_EXPORTED_OBJARRAY(wxIcon, wxIconArray); // this class can't load bitmaps of type wxBITMAP_TYPE_ICO_RESOURCE, // if you need them, you have to load them manually and call // wxIconCollection::AddIcon -class WXDLLEXPORT wxIconBundle : public wxGDIObject +class WXDLLIMPEXP_CORE wxIconBundle : public wxGDIObject { public: // default constructor @@ -46,8 +46,6 @@ public: wxIconBundle& operator=(const wxIconBundle& ic) { if ( this != &ic) Ref(ic); return *this; } - virtual bool IsOk() const; - // adds all the icons contained in the file to the collection, // if the collection already contains icons with the same @@ -87,8 +85,8 @@ public: bool IsEmpty() const { return GetIconCount() == 0; } protected: - virtual wxObjectRefData *CreateRefData() const; - virtual wxObjectRefData *CloneRefData(const wxObjectRefData *data) const; + virtual wxGDIRefData *CreateGDIRefData() const; + virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const; private: // delete all icons