X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a3b9c43bbc6bf71b6b618d4e2a71231e9cd431dc..ca77701441e39245dcbfce903049e76f166979e5:/include/wx/xrc/xmlreshandler.h diff --git a/include/wx/xrc/xmlreshandler.h b/include/wx/xrc/xmlreshandler.h index 46eb374c18..7c7f3fece3 100644 --- a/include/wx/xrc/xmlreshandler.h +++ b/include/wx/xrc/xmlreshandler.h @@ -18,9 +18,11 @@ #include "wx/string.h" #include "wx/artprov.h" #include "wx/colour.h" -#include "wx/animate.h" #include "wx/filesys.h" #include "wx/imaglist.h" +#include "wx/window.h" + +class WXDLLIMPEXP_FWD_ADV wxAnimation; class WXDLLIMPEXP_FWD_XML wxXmlNode; class WXDLLIMPEXP_FWD_XML wxXmlResource; @@ -87,7 +89,7 @@ public: virtual wxImageList *GetImageList(const wxString& param = wxT("imagelist")) = 0; #if wxUSE_ANIMATIONCTRL - virtual wxAnimation GetAnimation(const wxString& param = wxT("animation")) = 0; + virtual wxAnimation* GetAnimation(const wxString& param = wxT("animation")) = 0; #endif virtual wxFont GetFont(const wxString& param = wxT("font"), wxWindow* parent = NULL) = 0; @@ -183,15 +185,15 @@ protected: // Everything else is simply forwarded to wxXmlResourceHandlerImpl. void ReportError(wxXmlNode *context, const wxString& message) { - return GetImpl()->ReportError(context, message); + GetImpl()->ReportError(context, message); } void ReportError(const wxString& message) { - return GetImpl()->ReportError(message); + GetImpl()->ReportError(message); } void ReportParamError(const wxString& param, const wxString& message) { - return GetImpl()->ReportParamError(param, message); + GetImpl()->ReportParamError(param, message); } bool IsOfClass(wxXmlNode *node, const wxString& classname) const @@ -305,7 +307,7 @@ protected: } #if wxUSE_ANIMATIONCTRL - wxAnimation GetAnimation(const wxString& param = wxT("animation")) + wxAnimation* GetAnimation(const wxString& param = wxT("animation")) { return GetImpl()->GetAnimation(param); }