X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/9b5933bcbc58f62ba5e3423cbf56a7064c00b62e..db7035e48a4ccc6265fa01949cb92db3c6b6c17f:/include/wx/iconbndl.h diff --git a/include/wx/iconbndl.h b/include/wx/iconbndl.h index e96b199547..1892c30a1c 100644 --- a/include/wx/iconbndl.h +++ b/include/wx/iconbndl.h @@ -18,10 +18,10 @@ #include "wx/gdicmn.h" #include "wx/icon.h" -class WXDLLIMPEXP_CORE wxIcon; -class WXDLLIMPEXP_BASE wxString; +class WXDLLIMPEXP_FWD_CORE wxIcon; +class WXDLLIMPEXP_FWD_BASE wxString; -class WXDLLEXPORT wxIconBundle; +class WXDLLIMPEXP_FWD_CORE wxIconBundle; WX_DECLARE_EXPORTED_OBJARRAY(wxIcon, wxIconArray); @@ -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