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

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

diff --git a/include/wx/xrc/xmlres.h b/include/wx/xrc/xmlres.h
index 7ddca28eef4118c866f8a4e8d0dbe64573b23ea5..4622b3d8a74a1d78711af473817cd4e7e3657c9e 100644 (file)
--- a/include/wx/xrc/xmlres.h
+++ b/include/wx/xrc/xmlres.h
@@ -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;

diff --git a/src/xrc/xh_bmpcbox.cpp b/src/xrc/xh_bmpcbox.cpp
index 43936df9dd8e66eb3dae870e46d1e32041fe1b0a..f88dc7bc3fb3c0e58eac0288f2675797ebb593cf 100644 (file)
--- a/src/xrc/xh_bmpcbox.cpp
+++ b/src/xrc/xh_bmpcbox.cpp
@@ -26,6 +26,8 @@
 
 #include "wx/bmpcbox.h"
 
+#include "wx/xml/xml.h"
+
 IMPLEMENT_DYNAMIC_CLASS(wxBitmapComboBoxXmlHandler, wxXmlResourceHandler)
 
 wxBitmapComboBoxXmlHandler::wxBitmapComboBoxXmlHandler()

diff --git a/src/xrc/xh_chckl.cpp b/src/xrc/xh_chckl.cpp
index a633b112a9a62498f88981f61d52784099862470..c8f853a51e9d875f3239231d179a4d930ffca88c 100644 (file)
--- a/src/xrc/xh_chckl.cpp
+++ b/src/xrc/xh_chckl.cpp
@@ -25,6 +25,8 @@
     #include "wx/checklst.h"
 #endif
 
+#include "wx/xml/xml.h"
+
 IMPLEMENT_DYNAMIC_CLASS(wxCheckListBoxXmlHandler, wxXmlResourceHandler)
 
 wxCheckListBoxXmlHandler::wxCheckListBoxXmlHandler()

diff --git a/src/xrc/xh_choic.cpp b/src/xrc/xh_choic.cpp
index 6a0ccc2566a834ce8e99428858d6b782c1b5d518..7aaf0f0bc68427d819beca6932ba536c1dc361a5 100644 (file)
--- a/src/xrc/xh_choic.cpp
+++ b/src/xrc/xh_choic.cpp
@@ -24,6 +24,8 @@
     #include "wx/choice.h"
 #endif
 
+#include "wx/xml/xml.h"
+
 IMPLEMENT_DYNAMIC_CLASS(wxChoiceXmlHandler, wxXmlResourceHandler)
 
 wxChoiceXmlHandler::wxChoiceXmlHandler()

diff --git a/src/xrc/xh_combo.cpp b/src/xrc/xh_combo.cpp
index fd3179a66b97c265c6c805bc79eff50eece77f91..78e1556cc90591132ef44bc4e92114e8071b0ecb 100644 (file)
--- a/src/xrc/xh_combo.cpp
+++ b/src/xrc/xh_combo.cpp
@@ -25,6 +25,8 @@
     #include "wx/textctrl.h"    // for wxTE_PROCESS_ENTER
 #endif
 
+#include "wx/xml/xml.h"
+
 IMPLEMENT_DYNAMIC_CLASS(wxComboBoxXmlHandler, wxXmlResourceHandler)
 
 wxComboBoxXmlHandler::wxComboBoxXmlHandler()

diff --git a/src/xrc/xh_editlbox.cpp b/src/xrc/xh_editlbox.cpp
index 70246cc51bf202cb88caf0763704513304cc7294..cf1d4f676bfbec7a58a2db6461cbec9d3c9a6506 100644 (file)
--- a/src/xrc/xh_editlbox.cpp
+++ b/src/xrc/xh_editlbox.cpp
@@ -32,6 +32,8 @@
 #include "wx/editlbox.h"
 #include "wx/xrc/xh_editlbox.h"
 
+#include "wx/xml/xml.h"
+
 // ----------------------------------------------------------------------------
 // constants
 // ----------------------------------------------------------------------------

diff --git a/src/xrc/xh_htmllbox.cpp b/src/xrc/xh_htmllbox.cpp
index 5753a2132465866e88dc5276c471735a1a59c8ba..da11414ad7820070b642594e975eb6f69d5171c0 100644 (file)
--- a/src/xrc/xh_htmllbox.cpp
+++ b/src/xrc/xh_htmllbox.cpp
@@ -22,6 +22,8 @@
 #include "wx/htmllbox.h"
 #include "wx/filesys.h"
 
+#include "wx/xml/xml.h"
+
 IMPLEMENT_DYNAMIC_CLASS(wxSimpleHtmlListBoxXmlHandler, wxXmlResourceHandler)
 
 wxSimpleHtmlListBoxXmlHandler::wxSimpleHtmlListBoxXmlHandler()

diff --git a/src/xrc/xh_listb.cpp b/src/xrc/xh_listb.cpp
index fb92aeae16844bfd3c5c3b76fabb3ba3cf4a6581..1c51e892107ab595fcba2ca5fa0d1889c689c8bd 100644 (file)
--- a/src/xrc/xh_listb.cpp
+++ b/src/xrc/xh_listb.cpp
@@ -24,6 +24,8 @@
     #include "wx/listbox.h"
 #endif
 
+#include "wx/xml/xml.h"
+
 IMPLEMENT_DYNAMIC_CLASS(wxListBoxXmlHandler, wxXmlResourceHandler)
 
 wxListBoxXmlHandler::wxListBoxXmlHandler()

diff --git a/src/xrc/xh_odcombo.cpp b/src/xrc/xh_odcombo.cpp
index fa4503ff6400cfb8efb5b79d79186e13eed0c263..8ee6ebc034cef6cff098c26319a2a1d42f5e0066 100644 (file)
--- a/src/xrc/xh_odcombo.cpp
+++ b/src/xrc/xh_odcombo.cpp
@@ -26,6 +26,8 @@
 
 #include "wx/odcombo.h"
 
+#include "wx/xml/xml.h"
+
 IMPLEMENT_DYNAMIC_CLASS(wxOwnerDrawnComboBoxXmlHandler, wxXmlResourceHandler)
 
 wxOwnerDrawnComboBoxXmlHandler::wxOwnerDrawnComboBoxXmlHandler()

diff --git a/src/xrc/xh_radbx.cpp b/src/xrc/xh_radbx.cpp
index c6ee9307a685b10ea9ce1342a4a56580dce7febc..921938f540b69d32a795622f684efe9c51c64b95 100644 (file)
--- a/src/xrc/xh_radbx.cpp
+++ b/src/xrc/xh_radbx.cpp
@@ -24,6 +24,8 @@
     #include "wx/radiobox.h"
 #endif
 
+#include "wx/xml/xml.h"
+
 IMPLEMENT_DYNAMIC_CLASS(wxRadioBoxXmlHandler, wxXmlResourceHandler)
 
 wxRadioBoxXmlHandler::wxRadioBoxXmlHandler()

diff --git a/src/xrc/xh_sizer.cpp b/src/xrc/xh_sizer.cpp
index ad9fd5798652ee2bb571c6b0129a0af340b48ef4..b0dd955f440b2251723572cf3df18f97808390ed 100644 (file)
--- a/src/xrc/xh_sizer.cpp
+++ b/src/xrc/xh_sizer.cpp
@@ -35,6 +35,7 @@
 #include "wx/notebook.h"
 #include "wx/tokenzr.h"
 
+#include "wx/xml/xml.h"
 
 //-----------------------------------------------------------------------------
 // wxSizerXmlHandler

diff --git a/src/xrc/xh_split.cpp b/src/xrc/xh_split.cpp
index e14300f4f9679a14068a7e8b7425cc718b4148d4..7e3175c657e55dbaf1bc2d3fae5f688ce75c7b1a 100644 (file)
--- a/src/xrc/xh_split.cpp
+++ b/src/xrc/xh_split.cpp
@@ -25,6 +25,8 @@
 
 #include "wx/splitter.h"
 
+#include "wx/xml/xml.h"
+
 IMPLEMENT_DYNAMIC_CLASS(wxSplitterWindowXmlHandler, wxXmlResourceHandler)
 
 wxSplitterWindowXmlHandler::wxSplitterWindowXmlHandler() : wxXmlResourceHandler()

diff --git a/src/xrc/xh_toolb.cpp b/src/xrc/xh_toolb.cpp
index 2d262ee9024beb2189c4e8a3f1f684f74dfb468b..0c1015364810c8b0d0cfdfb43b3b0c43fa980703 100644 (file)
--- a/src/xrc/xh_toolb.cpp
+++ b/src/xrc/xh_toolb.cpp
@@ -26,6 +26,8 @@
     #include "wx/toolbar.h"
 #endif
 
+#include "wx/xml/xml.h"
+
 IMPLEMENT_DYNAMIC_CLASS(wxToolBarXmlHandler, wxXmlResourceHandler)
 
 wxToolBarXmlHandler::wxToolBarXmlHandler()

diff --git a/src/xrc/xh_toolbk.cpp b/src/xrc/xh_toolbk.cpp
index 22f9b33a41a11b94ba41b2ba1de03256171b0d92..fce8217d3d513ed74bc0cb248ffced5d1671c92b 100644 (file)
--- a/src/xrc/xh_toolbk.cpp
+++ b/src/xrc/xh_toolbk.cpp
@@ -26,6 +26,8 @@
 #include "wx/toolbook.h"
 #include "wx/imaglist.h"
 
+#include "wx/xml/xml.h"
+
 IMPLEMENT_DYNAMIC_CLASS(wxToolbookXmlHandler, wxXmlResourceHandler)
 
 wxToolbookXmlHandler::wxToolbookXmlHandler()

diff --git a/src/xrc/xh_treebk.cpp b/src/xrc/xh_treebk.cpp
index 591d8c50f0f0b7f6d56df15568c3b9fbaff32010..9780ce24eaa61aebe270f139cb86d71d7089e23f 100644 (file)
--- a/src/xrc/xh_treebk.cpp
+++ b/src/xrc/xh_treebk.cpp
@@ -26,6 +26,8 @@
 #include "wx/treebook.h"
 #include "wx/imaglist.h"
 
+#include "wx/xml/xml.h"
+
 IMPLEMENT_DYNAMIC_CLASS(wxTreebookXmlHandler, wxXmlResourceHandler)
 
 wxTreebookXmlHandler::wxTreebookXmlHandler()