Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Include wx/xml/xml.h from the XRC handlers that need it.

Browse Source 
Including this header from wx/xrc/xmlres.h itself only when WXMAKINGDLL_XRC is
defined doesn't work when we're building a static library and not a shared/DLL
one and we don't have any symbol defined in this case, so just don't try to be
smart and include this header from the files that need it.

This fixes breakage of r72756.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@72776 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2012-10-25 22:19:20 +00:00
parent f94a952846
commit df27f1dc9e
15 changed files with 29 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
include/wx/xrc/xmlres.h
View File

@@ -29,18 +29,6 @@
#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 +43,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;