remove unused variable assignment, closes #14928

[wxWidgets.git] / include / wx / xrc / xmlres.h

diff --git a/include/wx/xrc/xmlres.h b/include/wx/xrc/xmlres.h
index 7ddca28eef4118c866f8a4e8d0dbe64573b23ea5..23cbea1c518e9decce971d756b5981c06d3921e5 100644 (file)
--- 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/icon.h"
 #include "wx/artprov.h"
 #include "wx/colour.h"

-#include "wx/animate.h"

 #include "wx/vector.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;
 #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_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;
 class WXDLLIMPEXP_FWD_XRC wxXmlSubclassFactory;
 class wxXmlSubclassFactories;
 class wxXmlResourceModule;


@@ -575,7 +564,7 @@ public:
 
 #if wxUSE_ANIMATIONCTRL
     // Gets an animation.
 
 #if wxUSE_ANIMATIONCTRL
     // Gets an animation.

-    wxAnimation GetAnimation(const wxString& param = wxT("animation"));
+    wxAnimation* GetAnimation(const wxString& param = wxT("animation"));

 #endif
 
     // Gets a font.
 #endif
 
     // Gets a font.