X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/19f87dbe255b5e85236547bfb4e20ad310644373..661698e54f2bc599dc1a961ffbae08ccdd6b9b97:/include/wx/xrc/xmlres.h diff --git a/include/wx/xrc/xmlres.h b/include/wx/xrc/xmlres.h index 7ddca28eef..23cbea1c51 100644 --- a/include/wx/xrc/xmlres.h +++ b/include/wx/xrc/xmlres.h @@ -26,21 +26,8 @@ #include "wx/icon.h" #include "wx/artprov.h" #include "wx/colour.h" -#include "wx/animate.h" #include "wx/vector.h" -// We want to prevent the handlers defined outside of the XRC library from ever -// using wxXmlNode directly as this would result in linking errors as the other -// libraries don't link with the xml one (only xrc does). So do not include -// this header unless building xrc itself (where a lot of code does use -// wxXmlNode directly). -#ifdef WXMAKINGDLL_XRC - #include "wx/xml/xml.h" -#else - class WXDLLIMPEXP_FWD_XML wxXmlDocument; - class WXDLLIMPEXP_FWD_XML wxXmlNode; -#endif - #include "wx/xrc/xmlreshandler.h" class WXDLLIMPEXP_FWD_BASE wxFileName; @@ -55,6 +42,8 @@ class WXDLLIMPEXP_FWD_CORE wxWindow; class WXDLLIMPEXP_FWD_CORE wxFrame; class WXDLLIMPEXP_FWD_CORE wxToolBar; +class WXDLLIMPEXP_FWD_XML wxXmlDocument; +class WXDLLIMPEXP_FWD_XML wxXmlNode; class WXDLLIMPEXP_FWD_XRC wxXmlSubclassFactory; class wxXmlSubclassFactories; class wxXmlResourceModule; @@ -575,7 +564,7 @@ public: #if wxUSE_ANIMATIONCTRL // Gets an animation. - wxAnimation GetAnimation(const wxString& param = wxT("animation")); + wxAnimation* GetAnimation(const wxString& param = wxT("animation")); #endif // Gets a font.