wxUSE_XRC implies wxUSE_XML now

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29272 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/xrc/xh_bmpbt.h b/include/wx/xrc/xh_bmpbt.h
index b2fdee58f41199fc43ef902a5237e2b88718d79d..6a33f955facf8236e1ddfb2571b0b262ba2e3806 100644 (file)
--- a/include/wx/xrc/xh_bmpbt.h
+++ b/include/wx/xrc/xh_bmpbt.h
@@ -17,7 +17,7 @@
 
 #include "wx/xrc/xmlres.h"
 
-#if wxUSE_XML && wxUSE_XRC
+#if wxUSE_XRC
 
 
 class WXDLLIMPEXP_XRC wxBitmapButtonXmlHandler : public wxXmlResourceHandler
@@ -29,7 +29,7 @@ public:
     virtual bool CanHandle(wxXmlNode *node);
 };
 
-#endif //wxUSE_XML && wxUSE_XRC
+#endif // wxUSE_XRC
 
 
 #endif // _WX_XH_BMPBT_H_

diff --git a/include/wx/xrc/xmlres.h b/include/wx/xrc/xmlres.h
index 82e8c5871b3e39d7514aacc84dcf26d0d4445443..ded3f30324458511a8f010470caf2dbde0ab0596 100644 (file)
--- a/include/wx/xrc/xmlres.h
+++ b/include/wx/xrc/xmlres.h
@@ -17,7 +17,7 @@
 
 #include "wx/defs.h"
 
-#if wxUSE_XML && wxUSE_XRC
+#if wxUSE_XRC
 
 #include "wx/string.h"
 #include "wx/dynarray.h"
@@ -492,6 +492,6 @@ public:
     #define GetXMLID          GetXRCID
 #endif
 
-#endif // wxUSE_XML && wxUSE_XRC
+#endif // wxUSE_XRC
 
 #endif // _WX_XMLRES_H_

diff --git a/src/xrc/xh_bmp.cpp b/src/xrc/xh_bmp.cpp
index ab18f0acb344e42e407d9abde71ef98b03290079..ad56a9add2fb87d5ffd04a05d4f998e2e4cba272 100644 (file)
--- a/src/xrc/xh_bmp.cpp
+++ b/src/xrc/xh_bmp.cpp
@@ -19,7 +19,7 @@
     #pragma hdrstop
 #endif
 
-#if wxUSE_XML && wxUSE_XRC
+#if wxUSE_XRC
 
 #include "wx/xrc/xh_bmp.h"
 #include "wx/bitmap.h"
@@ -58,4 +58,4 @@ bool wxIconXmlHandler::CanHandle(wxXmlNode *node)
     return IsOfClass(node, wxT("wxIcon"));
 }
 
-#endif // wxUSE_XML && wxUSE_XRC
+#endif // wxUSE_XRC

diff --git a/src/xrc/xh_bmpbt.cpp b/src/xrc/xh_bmpbt.cpp
index 512575c72998508fb6f4df0edbccae3c3acb2869..e29178e7e52cecaef5136be2e38bb37e1b54e19a 100644 (file)
--- a/src/xrc/xh_bmpbt.cpp
+++ b/src/xrc/xh_bmpbt.cpp
@@ -19,7 +19,7 @@
     #pragma hdrstop
 #endif
 
-#if wxUSE_XML && wxUSE_XRC
+#if wxUSE_XRC
 
 #include "wx/xrc/xh_bmpbt.h"
 #include <wx/bmpbuttn.h>
@@ -68,4 +68,4 @@ bool wxBitmapButtonXmlHandler::CanHandle(wxXmlNode *node)
     return IsOfClass(node, wxT("wxBitmapButton"));
 }
 
-#endif // wxUSE_XML && wxUSE_XRC
+#endif // wxUSE_XRC

diff --git a/src/xrc/xh_bttn.cpp b/src/xrc/xh_bttn.cpp
index d391e8ea2beb4f56be748dea14e17e491326f6bd..f6b4cffd2ffd8324536b60ff9beb2f47f9f3edd6 100644 (file)
--- a/src/xrc/xh_bttn.cpp
+++ b/src/xrc/xh_bttn.cpp
@@ -19,7 +19,7 @@
     #pragma hdrstop
 #endif
 
-#if wxUSE_XML && wxUSE_XRC
+#if wxUSE_XRC
 
 #include "wx/xrc/xh_bttn.h"
 #include "wx/button.h"
@@ -61,4 +61,4 @@ bool wxButtonXmlHandler::CanHandle(wxXmlNode *node)
     return IsOfClass(node, wxT("wxButton"));
 }
 
-#endif // wxUSE_XML && wxUSE_XRC
+#endif // wxUSE_XRC

diff --git a/src/xrc/xh_cald.cpp b/src/xrc/xh_cald.cpp
index 42d706c1de5e1f5a973ab1fcee32f22809da23f6..67fa6e5edf4a4fe43b2d97943cd83f532e656617 100644 (file)
--- a/src/xrc/xh_cald.cpp
+++ b/src/xrc/xh_cald.cpp
@@ -19,7 +19,7 @@
     #pragma hdrstop
 #endif
 
-#if wxUSE_XML && wxUSE_XRC && wxUSE_CALENDARCTRL
+#if wxUSE_XRC && wxUSE_CALENDARCTRL
 
 #include "wx/xrc/xh_cald.h"
 #include "wx/event.h"
@@ -64,4 +64,4 @@ bool wxCalendarCtrlXmlHandler::CanHandle(wxXmlNode *node)
     return IsOfClass(node, wxT("wxCalendarCtrl"));
 }
 
-#endif // wxUSE_XML && wxUSE_XRC && wxUSE_CALENDARCTRL
+#endif // wxUSE_XRC && wxUSE_CALENDARCTRL

diff --git a/src/xrc/xh_chckb.cpp b/src/xrc/xh_chckb.cpp
index 52160e255e607e43ae6f43530a081284240584b2..3731c6b8899351b90c248128872601842cad7ed9 100644 (file)
--- a/src/xrc/xh_chckb.cpp
+++ b/src/xrc/xh_chckb.cpp
@@ -19,7 +19,7 @@
     #pragma hdrstop
 #endif
 
-#if wxUSE_XML && wxUSE_XRC && wxUSE_CHECKBOX
+#if wxUSE_XRC && wxUSE_CHECKBOX
 
 #include "wx/xrc/xh_chckb.h"
 #include "wx/checkbox.h"
@@ -59,4 +59,4 @@ bool wxCheckBoxXmlHandler::CanHandle(wxXmlNode *node)
     return IsOfClass(node, wxT("wxCheckBox"));
 }
 
-#endif // wxUSE_XML && wxUSE_XRC && wxUSE_CHECKBOX
+#endif // wxUSE_XRC && wxUSE_CHECKBOX

diff --git a/src/xrc/xh_chckl.cpp b/src/xrc/xh_chckl.cpp
index c9c9c45236403fc651b362fee9ae94cf2ec7c4a2..536c011ae616325145c480e4cd8d9326b258e794 100644 (file)
--- a/src/xrc/xh_chckl.cpp
+++ b/src/xrc/xh_chckl.cpp
@@ -19,7 +19,7 @@
     #pragma hdrstop
 #endif
 
-#if wxUSE_XML && wxUSE_XRC
+#if wxUSE_XRC
 
 #if wxUSE_OWNER_DRAWN || !defined(__WXMSW__)
 
@@ -133,4 +133,4 @@ bool wxCheckListBoxXmlHandler::CanHandle(wxXmlNode *node)
 
 #endif // wxUSE_OWNER_DRAWN || !defined(__WXMSW__)
 
-#endif // wxUSE_XML && wxUSE_XRC
+#endif // wxUSE_XRC

diff --git a/src/xrc/xh_choic.cpp b/src/xrc/xh_choic.cpp
index 8f74f5c88548b133da82df073c06b224c9655ae2..29262cc59e15e3a205a5820235dacb99044c6a25 100644 (file)
--- a/src/xrc/xh_choic.cpp
+++ b/src/xrc/xh_choic.cpp
@@ -19,7 +19,7 @@
     #pragma hdrstop
 #endif
 
-#if wxUSE_XML && wxUSE_XRC
+#if wxUSE_XRC
 
 #include "wx/xrc/xh_choic.h"
 #include "wx/choice.h"
@@ -96,4 +96,4 @@ bool wxChoiceXmlHandler::CanHandle(wxXmlNode *node)
            (m_insideBox && node->GetName() == wxT("item")));
 }
 
-#endif // wxUSE_XML && wxUSE_XRC
+#endif // wxUSE_XRC

diff --git a/src/xrc/xh_combo.cpp b/src/xrc/xh_combo.cpp
index fa72c134cc65fc87aed6699de9cc8c7a51e3b582..16b11715a6498a854685930a93127f693ee28566 100644 (file)
--- a/src/xrc/xh_combo.cpp
+++ b/src/xrc/xh_combo.cpp
@@ -19,7 +19,7 @@
     #pragma hdrstop
 #endif
 
-#if wxUSE_XML && wxUSE_XRC && wxUSE_COMBOBOX
+#if wxUSE_XRC && wxUSE_COMBOBOX
 
 #include "wx/xrc/xh_combo.h"
 #include "wx/combobox.h"
@@ -100,4 +100,4 @@ bool wxComboBoxXmlHandler::CanHandle(wxXmlNode *node)
            (m_insideBox && node->GetName() == wxT("item")));
 }
 
-#endif // wxUSE_XML && wxUSE_XRC && wxUSE_COMBOBOX
+#endif // wxUSE_XRC && wxUSE_COMBOBOX

diff --git a/src/xrc/xh_dlg.cpp b/src/xrc/xh_dlg.cpp
index 6108b8c3c3c3074fadecc146b526c7bf726fcb4d..eef07949ec13f492197f863e706d1275055d9a78 100644 (file)
--- a/src/xrc/xh_dlg.cpp
+++ b/src/xrc/xh_dlg.cpp
@@ -19,7 +19,7 @@
     #pragma hdrstop
 #endif
 
-#if wxUSE_XML && wxUSE_XRC
+#if wxUSE_XRC
 
 #include "wx/xrc/xh_dlg.h"
 #include "wx/dialog.h"
@@ -82,4 +82,4 @@ bool wxDialogXmlHandler::CanHandle(wxXmlNode *node)
     return IsOfClass(node, wxT("wxDialog"));
 }
 
-#endif // wxUSE_XML && wxUSE_XRC
+#endif // wxUSE_XRC

diff --git a/src/xrc/xh_frame.cpp b/src/xrc/xh_frame.cpp
index 9d93881f0b8c00ae0c6f9282f44c8dfa8efd0bac..2685be16e06aeee8192317d869a7a5ef6e81fede 100644 (file)
--- a/src/xrc/xh_frame.cpp
+++ b/src/xrc/xh_frame.cpp
@@ -19,7 +19,7 @@
     #pragma hdrstop
 #endif
 
-#if wxUSE_XML && wxUSE_XRC
+#if wxUSE_XRC
 
 #include "wx/xrc/xh_frame.h"
 #include "wx/frame.h"
@@ -87,4 +87,4 @@ bool wxFrameXmlHandler::CanHandle(wxXmlNode *node)
     return IsOfClass(node, wxT("wxFrame"));
 }
 
-#endif // wxUSE_XML && wxUSE_XRC
+#endif // wxUSE_XRC

diff --git a/src/xrc/xh_gauge.cpp b/src/xrc/xh_gauge.cpp
index d10a958a7bfab424afbe8778e471233918f86a6d..c529b21cbf7c36e8ad1125511015e23b825f7bfd 100644 (file)
--- a/src/xrc/xh_gauge.cpp
+++ b/src/xrc/xh_gauge.cpp
@@ -19,7 +19,7 @@
     #pragma hdrstop
 #endif
 
-#if wxUSE_XML && wxUSE_XRC && wxUSE_GAUGE
+#if wxUSE_XRC && wxUSE_GAUGE
 
 #include "wx/xrc/xh_gauge.h"
 #include "wx/gauge.h"
@@ -71,4 +71,4 @@ bool wxGaugeXmlHandler::CanHandle(wxXmlNode *node)
     return IsOfClass(node, wxT("wxGauge"));
 }
 
-#endif // wxUSE_XML && wxUSE_XRC && wxUSE_GAUGE
+#endif // wxUSE_XRC && wxUSE_GAUGE

diff --git a/src/xrc/xh_gdctl.cpp b/src/xrc/xh_gdctl.cpp
index 6cb07ef41f0749dec05315abb43ad94852428098..46e1add1830a030ddd84e544497b831e523ba4d6 100644 (file)
--- a/src/xrc/xh_gdctl.cpp
+++ b/src/xrc/xh_gdctl.cpp
@@ -19,7 +19,7 @@
     #pragma hdrstop
 #endif
 
-#if wxUSE_XML && wxUSE_XRC && wxUSE_DIRDLG
+#if wxUSE_XRC && wxUSE_DIRDLG
 
 #include "wx/textctrl.h"
 #include "wx/xrc/xh_gdctl.h"
@@ -60,4 +60,4 @@ bool wxGenericDirCtrlXmlHandler::CanHandle(wxXmlNode *node)
     return IsOfClass(node, wxT("wxGenericDirCtrl"));
 }
 
-#endif // wxUSE_XML && wxUSE_XRC && wxUSE_DIRDLG
+#endif // wxUSE_XRC && wxUSE_DIRDLG

diff --git a/src/xrc/xh_html.cpp b/src/xrc/xh_html.cpp
index cc97440d56d316ba43ee5cfd0fa9a92e0a7da2aa..7bdf27ed8fa70ac95598b7dbf403ec9eb84b9cdd 100644 (file)
--- a/src/xrc/xh_html.cpp
+++ b/src/xrc/xh_html.cpp
@@ -19,7 +19,7 @@
     #pragma hdrstop
 #endif
 
-#if wxUSE_XML && wxUSE_XRC && wxUSE_HTML
+#if wxUSE_XRC && wxUSE_HTML
 
 #include "wx/xrc/xh_html.h"
 
@@ -82,4 +82,4 @@ bool wxHtmlWindowXmlHandler::CanHandle(wxXmlNode *node)
     return IsOfClass(node, wxT("wxHtmlWindow"));
 }
 
-#endif // wxUSE_XML && wxUSE_XRC && wxUSE_HTML
+#endif // wxUSE_XRC && wxUSE_HTML

diff --git a/src/xrc/xh_listb.cpp b/src/xrc/xh_listb.cpp
index 84a3b58d8351a644310f0ca20cbc0d3773c053dd..939d6e834c314753656a187b0dc57cfaf17593c3 100644 (file)
--- a/src/xrc/xh_listb.cpp
+++ b/src/xrc/xh_listb.cpp
@@ -19,7 +19,7 @@
     #pragma hdrstop
 #endif
 
-#if wxUSE_XML && wxUSE_XRC
+#if wxUSE_XRC
 
 #include "wx/xrc/xh_listb.h"
 #include "wx/listbox.h"
@@ -102,4 +102,4 @@ bool wxListBoxXmlHandler::CanHandle(wxXmlNode *node)
            (m_insideBox && node->GetName() == wxT("item")));
 }
 
-#endif // wxUSE_XML && wxUSE_XRC
+#endif // wxUSE_XRC

diff --git a/src/xrc/xh_listc.cpp b/src/xrc/xh_listc.cpp
index 689b62bb4ddef5a818e91a69345621e06410f7f9..6746b8322435657bef9297f3b6e20fe998d7754a 100644 (file)
--- a/src/xrc/xh_listc.cpp
+++ b/src/xrc/xh_listc.cpp
@@ -19,7 +19,7 @@
     #pragma hdrstop
 #endif
 
-#if wxUSE_XML && wxUSE_XRC
+#if wxUSE_XRC
 
 #include "wx/textctrl.h"
 #include "wx/xrc/xh_listc.h"
@@ -74,4 +74,4 @@ bool wxListCtrlXmlHandler::CanHandle(wxXmlNode *node)
     return IsOfClass(node, wxT("wxListCtrl"));
 }
 
-#endif // wxUSE_XML && wxUSE_XRC
+#endif // wxUSE_XRC

diff --git a/src/xrc/xh_menu.cpp b/src/xrc/xh_menu.cpp
index e95171cc59ac60333d9c7436bc2168765a22c130..1f473c6dee43997664c46f68c100b716c649af9f 100644 (file)
--- a/src/xrc/xh_menu.cpp
+++ b/src/xrc/xh_menu.cpp
@@ -19,7 +19,7 @@
     #pragma hdrstop
 #endif
 
-#if wxUSE_XML && wxUSE_XRC
+#if wxUSE_XRC
 
 #include "wx/xrc/xh_menu.h"
 #include "wx/menu.h"
@@ -142,4 +142,4 @@ bool wxMenuBarXmlHandler::CanHandle(wxXmlNode *node)
     return IsOfClass(node, wxT("wxMenuBar"));
 }
 
-#endif // wxUSE_XML && wxUSE_XRC
+#endif // wxUSE_XRC

diff --git a/src/xrc/xh_notbk.cpp b/src/xrc/xh_notbk.cpp
index 4947899622ec4b11d24ecd379708be8215144608..5248793026e29af0cfaefa808a1e2b61dab4ec97 100644 (file)
--- a/src/xrc/xh_notbk.cpp
+++ b/src/xrc/xh_notbk.cpp
@@ -19,7 +19,7 @@
     #pragma hdrstop
 #endif
 
-#if wxUSE_XML && wxUSE_XRC && wxUSE_NOTEBOOK
+#if wxUSE_XRC && wxUSE_NOTEBOOK
 
 #include "wx/xrc/xh_notbk.h"
 
@@ -98,4 +98,4 @@ bool wxNotebookXmlHandler::CanHandle(wxXmlNode *node)
             (m_isInside && IsOfClass(node, wxT("notebookpage"))));
 }
 
-#endif // wxUSE_XML && wxUSE_XRC && wxUSE_NOTEBOOK
+#endif // wxUSE_XRC && wxUSE_NOTEBOOK

diff --git a/src/xrc/xh_panel.cpp b/src/xrc/xh_panel.cpp
index 035c6cade405db7af504f412ace846ea7071db40..6b6a467e19e7b675d75a38cf26ea2569bb503bb9 100644 (file)
--- a/src/xrc/xh_panel.cpp
+++ b/src/xrc/xh_panel.cpp
@@ -19,7 +19,7 @@
     #pragma hdrstop
 #endif
 
-#if wxUSE_XML && wxUSE_XRC
+#if wxUSE_XRC
 
 #include "wx/xrc/xh_panel.h"
 #include "wx/panel.h"
@@ -57,4 +57,4 @@ bool wxPanelXmlHandler::CanHandle(wxXmlNode *node)
     return IsOfClass(node, wxT("wxPanel"));
 }
 
-#endif // wxUSE_XML && wxUSE_XRC
+#endif // wxUSE_XRC

diff --git a/src/xrc/xh_radbt.cpp b/src/xrc/xh_radbt.cpp
index 1fa49b84ecf91d099b65ca300835f891c0691831..e615ef9365815200a01667208703d1dbe90d6690 100644 (file)
--- a/src/xrc/xh_radbt.cpp
+++ b/src/xrc/xh_radbt.cpp
@@ -19,7 +19,7 @@
     #pragma hdrstop
 #endif
 
-#if wxUSE_XML && wxUSE_XRC && wxUSE_RADIOBOX
+#if wxUSE_XRC && wxUSE_RADIOBOX
 
 #include "wx/xrc/xh_radbt.h"
 #include "wx/radiobut.h"
@@ -63,4 +63,4 @@ bool wxRadioButtonXmlHandler::CanHandle(wxXmlNode *node)
     return IsOfClass(node, wxT("wxRadioButton"));
 }
 
-#endif // wxUSE_XML && wxUSE_XRC && wxUSE_NOTEBOOK
+#endif // wxUSE_XRC && wxUSE_NOTEBOOK

diff --git a/src/xrc/xh_radbx.cpp b/src/xrc/xh_radbx.cpp
index efb0f72389b423b0717f037b0c299e832af4d13c..066f397d1ef87e2b64ad4c3ccd638a88eec26fe6 100644 (file)
--- a/src/xrc/xh_radbx.cpp
+++ b/src/xrc/xh_radbx.cpp
@@ -19,7 +19,7 @@
     #pragma hdrstop
 #endif
 
-#if wxUSE_XML && wxUSE_XRC && wxUSE_RADIOBOX
+#if wxUSE_XRC && wxUSE_RADIOBOX
 
 #include "wx/xrc/xh_radbx.h"
 #include "wx/radiobox.h"

diff --git a/src/xrc/xh_scrol.cpp b/src/xrc/xh_scrol.cpp
index d95d17e9b8bd98a93725ab262078cdc6e4f00417..dd330bb78b0d25296faded9d38afdec399fa96af 100644 (file)
--- a/src/xrc/xh_scrol.cpp
+++ b/src/xrc/xh_scrol.cpp
@@ -19,7 +19,7 @@
     #pragma hdrstop
 #endif
 
-#if wxUSE_XML && wxUSE_XRC
+#if wxUSE_XRC
 
 #include "wx/xrc/xh_scrol.h"
 #include "wx/scrolbar.h"
@@ -61,4 +61,4 @@ bool wxScrollBarXmlHandler::CanHandle(wxXmlNode *node)
     return IsOfClass(node, wxT("wxScrollBar"));
 }
 
-#endif // wxUSE_XML && wxUSE_XRC
+#endif // wxUSE_XRC

diff --git a/src/xrc/xh_scwin.cpp b/src/xrc/xh_scwin.cpp
index c68bb099bf7b4c153a3f1a507c4881bc7d045b4c..886da64ce04f010612ca1914c778cff831456e75 100644 (file)
--- a/src/xrc/xh_scwin.cpp
+++ b/src/xrc/xh_scwin.cpp
@@ -19,7 +19,7 @@
     #pragma hdrstop
 #endif
 
-#if wxUSE_XML && wxUSE_XRC
+#if wxUSE_XRC
 
 #include "wx/xrc/xh_scwin.h"
 #include "wx/scrolwin.h"
@@ -62,4 +62,4 @@ bool wxScrolledWindowXmlHandler::CanHandle(wxXmlNode *node)
     return IsOfClass(node, wxT("wxScrolledWindow"));
 }
 
-#endif // wxUSE_XML && wxUSE_XRC
+#endif // wxUSE_XRC

diff --git a/src/xrc/xh_sizer.cpp b/src/xrc/xh_sizer.cpp
index d694e9a27523b2185f56d4f78a0c789f3713c955..806370b3a67cc135481b9218f73dfdaf212cc018 100644 (file)
--- a/src/xrc/xh_sizer.cpp
+++ b/src/xrc/xh_sizer.cpp
@@ -19,7 +19,7 @@
     #pragma hdrstop
 #endif
 
-#if wxUSE_XML && wxUSE_XRC
+#if wxUSE_XRC
 
 #include "wx/xrc/xh_sizer.h"
 #include "wx/sizer.h"
@@ -363,4 +363,4 @@ void wxSizerXmlHandler::AddSizerItem(wxSizerItem* sitem)
         m_parentSizer->Add(sitem);
 }
 
-#endif // wxUSE_XML && wxUSE_XRC
+#endif // wxUSE_XRC

diff --git a/src/xrc/xh_slidr.cpp b/src/xrc/xh_slidr.cpp
index 9afbf18aa054834b2718c50eeae40470daa85d95..3ca8b26aa7bc36f8ecdd1b895c2c82727a8c824e 100644 (file)
--- a/src/xrc/xh_slidr.cpp
+++ b/src/xrc/xh_slidr.cpp
@@ -19,7 +19,7 @@
     #pragma hdrstop
 #endif
 
-#if wxUSE_XML && wxUSE_XRC && wxUSE_SLIDER
+#if wxUSE_XRC && wxUSE_SLIDER
 
 #include "wx/xrc/xh_slidr.h"
 #include "wx/slider.h"
@@ -91,4 +91,4 @@ bool wxSliderXmlHandler::CanHandle(wxXmlNode *node)
     return IsOfClass(node, wxT("wxSlider"));
 }
 
-#endif // wxUSE_XML && wxUSE_XRC && wxUSE_SLIDER
+#endif // wxUSE_XRC && wxUSE_SLIDER

diff --git a/src/xrc/xh_spin.cpp b/src/xrc/xh_spin.cpp
index 5189a02fe39e0710089ca1bc206c5afccb9096ee..3398ffaad1733141b61fa6659bb48afd777cefc5 100644 (file)
--- a/src/xrc/xh_spin.cpp
+++ b/src/xrc/xh_spin.cpp
@@ -19,7 +19,7 @@
     #pragma hdrstop
 #endif
 
-#if wxUSE_XML && wxUSE_XRC
+#if wxUSE_XRC
 
 #include "wx/xrc/xh_spin.h"
 
@@ -105,4 +105,4 @@ bool wxSpinCtrlXmlHandler::CanHandle(wxXmlNode *node)
 
 #endif // wxUSE_SPINCTRL
 
-#endif // wxUSE_XML && wxUSE_XRC
+#endif // wxUSE_XRC

diff --git a/src/xrc/xh_split.cpp b/src/xrc/xh_split.cpp
index d9b2597896e788dab66597dca8a00e3e90115238..948b241ec19f720a5054d8d5cf9c21d54780ce70 100644 (file)
--- a/src/xrc/xh_split.cpp
+++ b/src/xrc/xh_split.cpp
@@ -19,7 +19,7 @@
     #pragma hdrstop
 #endif
 
-#if wxUSE_XML && wxUSE_XRC
+#if wxUSE_XRC
 
 #include "wx/xrc/xh_split.h"
 #include "wx/splitter.h"
@@ -105,4 +105,4 @@ bool wxSplitterWindowXmlHandler::CanHandle(wxXmlNode *node)
      return IsOfClass(node, wxT("wxSplitterWindow"));
 }
 
-#endif // wxUSE_XML && wxUSE_XRC
+#endif // wxUSE_XRC

diff --git a/src/xrc/xh_statbar.cpp b/src/xrc/xh_statbar.cpp
index 2bb2a51d0a8c20e566b4aec80d473ae37885e4f6..5dead981daf36bcad541aa2fe593744259958946 100644 (file)
--- a/src/xrc/xh_statbar.cpp
+++ b/src/xrc/xh_statbar.cpp
@@ -19,7 +19,7 @@
     #pragma hdrstop
 #endif
 
-#if wxUSE_XML && wxUSE_XRC && wxUSE_STATUSBAR
+#if wxUSE_XRC && wxUSE_STATUSBAR
 
 #include "wx/frame.h"
 #include "wx/string.h"
@@ -105,5 +105,5 @@ bool wxStatusBarXmlHandler::CanHandle(wxXmlNode *node)
     return IsOfClass(node, wxT("wxStatusBar"));
 }
 
-#endif // wxUSE_XML && wxUSE_XRC && wxUSE_STATUSBAR
+#endif // wxUSE_XRC && wxUSE_STATUSBAR
 

diff --git a/src/xrc/xh_stbmp.cpp b/src/xrc/xh_stbmp.cpp
index b57a98410cee4550ffa7ac40693a8fbaaeee6dfc..42f8073a91c646742ab342b06f460a432f89ae68 100644 (file)
--- a/src/xrc/xh_stbmp.cpp
+++ b/src/xrc/xh_stbmp.cpp
@@ -19,7 +19,7 @@
     #pragma hdrstop
 #endif
 
-#if wxUSE_XML && wxUSE_XRC
+#if wxUSE_XRC
 
 #include "wx/xrc/xh_stbmp.h"
 #include "wx/statbmp.h"
@@ -53,4 +53,4 @@ bool wxStaticBitmapXmlHandler::CanHandle(wxXmlNode *node)
     return IsOfClass(node, wxT("wxStaticBitmap"));
 }
 
-#endif // wxUSE_XML && wxUSE_XRC
+#endif // wxUSE_XRC

diff --git a/src/xrc/xh_stbox.cpp b/src/xrc/xh_stbox.cpp
index a5df4e68f294a399e1224556c92230f4405342f7..93f21b42d2d022c88ce4217962750cbeb54d835f 100644 (file)
--- a/src/xrc/xh_stbox.cpp
+++ b/src/xrc/xh_stbox.cpp
@@ -19,7 +19,7 @@
     #pragma hdrstop
 #endif
 
-#if wxUSE_XML && wxUSE_XRC
+#if wxUSE_XRC
 
 #include "wx/xrc/xh_stbox.h"
 #include "wx/statbox.h"
@@ -53,4 +53,4 @@ bool wxStaticBoxXmlHandler::CanHandle(wxXmlNode *node)
     return IsOfClass(node, wxT("wxStaticBox"));
 }
 
-#endif // wxUSE_XML && wxUSE_XRC
+#endif // wxUSE_XRC

diff --git a/src/xrc/xh_stlin.cpp b/src/xrc/xh_stlin.cpp
index a3ee62202b8b9a0e769b1e0f2c24b701c69d0c95..025713ec14424ad3b2ef6d5b4aaedb7d2b63568e 100644 (file)
--- a/src/xrc/xh_stlin.cpp
+++ b/src/xrc/xh_stlin.cpp
@@ -19,7 +19,7 @@
     #pragma hdrstop
 #endif
 
-#if wxUSE_XML && wxUSE_XRC && wxUSE_STATLINE
+#if wxUSE_XRC && wxUSE_STATLINE
 
 #include "wx/xrc/xh_stlin.h"
 #include "wx/statline.h"
@@ -54,4 +54,4 @@ bool wxStaticLineXmlHandler::CanHandle(wxXmlNode *node)
     return IsOfClass(node, wxT("wxStaticLine"));
 }
 
-#endif // wxUSE_XML && wxUSE_XRC && wxUSE_STATLINE
+#endif // wxUSE_XRC && wxUSE_STATLINE

diff --git a/src/xrc/xh_sttxt.cpp b/src/xrc/xh_sttxt.cpp
index dc42cd178ff84d7c84ac1e4cc3914441cae5a242..da772ef4165eaa2a281d062845da2f0916f5b851 100644 (file)
--- a/src/xrc/xh_sttxt.cpp
+++ b/src/xrc/xh_sttxt.cpp
@@ -19,7 +19,7 @@
     #pragma hdrstop
 #endif
 
-#if wxUSE_XML && wxUSE_XRC
+#if wxUSE_XRC
 
 #include "wx/xrc/xh_sttxt.h"
 #include "wx/stattext.h"
@@ -57,4 +57,4 @@ bool wxStaticTextXmlHandler::CanHandle(wxXmlNode *node)
     return IsOfClass(node, wxT("wxStaticText"));
 }
 
-#endif // wxUSE_XML && wxUSE_XRC
+#endif // wxUSE_XRC

diff --git a/src/xrc/xh_text.cpp b/src/xrc/xh_text.cpp
index 9bc80750bd7943016961aed521446e66be07199f..745189008dec2f598a113873fa6f2e1eddaf6e7f 100644 (file)
--- a/src/xrc/xh_text.cpp
+++ b/src/xrc/xh_text.cpp
@@ -19,7 +19,7 @@
     #pragma hdrstop
 #endif
 
-#if wxUSE_XML && wxUSE_XRC
+#if wxUSE_XRC
 
 #include "wx/xrc/xh_text.h"
 #include "wx/textctrl.h"
@@ -71,4 +71,4 @@ bool wxTextCtrlXmlHandler::CanHandle(wxXmlNode *node)
     return IsOfClass(node, wxT("wxTextCtrl"));
 }
 
-#endif // wxUSE_XML && wxUSE_XRC
+#endif // wxUSE_XRC

diff --git a/src/xrc/xh_tglbtn.cpp b/src/xrc/xh_tglbtn.cpp
index 0fad6c4d12ee35522ba3694d4e7980ee11ff36c8..1974ab14d1b8e60c2e43efe4037acaef11e4959d 100644 (file)
--- a/src/xrc/xh_tglbtn.cpp
+++ b/src/xrc/xh_tglbtn.cpp
@@ -19,7 +19,7 @@
     #pragma hdrstop
 #endif
 
-#if wxUSE_XML && wxUSE_XRC && wxUSE_TOGGLEBTN
+#if wxUSE_XRC && wxUSE_TOGGLEBTN
 
 #include "wx/xrc/xh_tglbtn.h"
 #include "wx/tglbtn.h"
@@ -55,4 +55,4 @@ bool wxToggleButtonXmlHandler::CanHandle(wxXmlNode *node)
     return IsOfClass(node, wxT("wxToggleButton"));
 }
 
-#endif // wxUSE_XML && wxUSE_XRC && wxUSE_TOGGLEBTN
+#endif // wxUSE_XRC && wxUSE_TOGGLEBTN

diff --git a/src/xrc/xh_toolb.cpp b/src/xrc/xh_toolb.cpp
index 18656c683e0a5c5c1b65826cac2a9a0d32c060e0..a7a569ead4fba2a5a403506b137bfaec176c422e 100644 (file)
--- a/src/xrc/xh_toolb.cpp
+++ b/src/xrc/xh_toolb.cpp
@@ -19,7 +19,7 @@
     #pragma hdrstop
 #endif
 
-#if wxUSE_XML && wxUSE_XRC && wxUSE_TOOLBAR
+#if wxUSE_XRC && wxUSE_TOOLBAR
 
 #include "wx/xrc/xh_toolb.h"
 #include "wx/toolbar.h"

diff --git a/src/xrc/xh_tree.cpp b/src/xrc/xh_tree.cpp
index 7a21b5f4407b91845edcaa3720c363f5048c9f46..cb886cf3d97c15c68eace63b3994b79fbff5025b 100644 (file)
--- a/src/xrc/xh_tree.cpp
+++ b/src/xrc/xh_tree.cpp
@@ -19,7 +19,7 @@
     #pragma hdrstop
 #endif
 
-#if wxUSE_XML && wxUSE_XRC
+#if wxUSE_XRC
 
 #include "wx/xrc/xh_tree.h"
 #include "wx/treectrl.h"

diff --git a/src/xrc/xh_unkwn.cpp b/src/xrc/xh_unkwn.cpp
index ee2aaaf8c2f78232a47cecafa86a9fd6a08b213b..f9b56480367f442c0afeaa1db5e74ceabdb6e15e 100644 (file)
--- a/src/xrc/xh_unkwn.cpp
+++ b/src/xrc/xh_unkwn.cpp
@@ -19,7 +19,7 @@
     #pragma hdrstop
 #endif
 
-#if wxUSE_XML && wxUSE_XRC
+#if wxUSE_XRC
 
 #include "wx/xrc/xh_unkwn.h"
 #include "wx/window.h"

diff --git a/src/xrc/xh_wizrd.cpp b/src/xrc/xh_wizrd.cpp
index 4fd68ca54dfa32cdcfa02c47c57a5ff4e19e8bfd..2b9508ae05cb1a0391c70f6a6ac43b01b10c66b9 100644 (file)
--- a/src/xrc/xh_wizrd.cpp
+++ b/src/xrc/xh_wizrd.cpp
@@ -19,7 +19,7 @@
     #pragma hdrstop
 #endif
 
-#if wxUSE_XML && wxUSE_XRC && wxUSE_WIZARDDLG
+#if wxUSE_XRC && wxUSE_WIZARDDLG
 
 #include "wx/xrc/xh_wizrd.h"
 #include "wx/log.h"

diff --git a/src/xrc/xmlres.cpp b/src/xrc/xmlres.cpp
index c02b81d49632d64127d27d03a99568cf9aaa7356..197ea98480f8dd9c55fe235a3467313e12f2ffa0 100644 (file)
--- a/src/xrc/xmlres.cpp
+++ b/src/xrc/xmlres.cpp
@@ -19,7 +19,7 @@
     #pragma hdrstop
 #endif
 
-#if wxUSE_XML && wxUSE_XRC
+#if wxUSE_XRC
 
 #include "wx/dialog.h"
 #include "wx/panel.h"

diff --git a/src/xrc/xmlrsall.cpp b/src/xrc/xmlrsall.cpp
index a5c414217ce98fe98bf8ded423efb9d9bcb05f63..bf2eb997348da36d54efab3878fe7a2d0557bcca 100644 (file)
--- a/src/xrc/xmlrsall.cpp
+++ b/src/xrc/xmlrsall.cpp
@@ -20,7 +20,7 @@
     #pragma hdrstop
 #endif
 
-#if wxUSE_XML && wxUSE_XRC
+#if wxUSE_XRC
 
 #include "wx/xrc/xmlres.h"
 #include "wx/xrc/xh_all.h"