moving XRC to the core

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

diff --git a/include/wx/xrc/xmlres.h b/include/wx/xrc/xmlres.h
index 198efa7a7e7cab1facd5b862791e5d1e1e564d26..ded3f30324458511a8f010470caf2dbde0ab0596 100644 (file)
--- a/include/wx/xrc/xmlres.h
+++ b/include/wx/xrc/xmlres.h
@@ -16,6 +16,9 @@
 #endif
 
 #include "wx/defs.h"
+
+#if wxUSE_XRC
+
 #include "wx/string.h"
 #include "wx/dynarray.h"
 #include "wx/datetime.h"
@@ -489,5 +492,6 @@ public:
     #define GetXMLID          GetXRCID
 #endif
 
+#endif // wxUSE_XRC
 
 #endif // _WX_XMLRES_H_

diff --git a/src/xrc/xh_bmp.cpp b/src/xrc/xh_bmp.cpp
index 085310436078d9cc0046efbaed2add8d7be9c60b..ad56a9add2fb87d5ffd04a05d4f998e2e4cba272 100644 (file)
--- a/src/xrc/xh_bmp.cpp
+++ b/src/xrc/xh_bmp.cpp
@@ -19,6 +19,8 @@
     #pragma hdrstop
 #endif
 
+#if wxUSE_XRC
+
 #include "wx/xrc/xh_bmp.h"
 #include "wx/bitmap.h"
 
@@ -55,3 +57,5 @@ bool wxIconXmlHandler::CanHandle(wxXmlNode *node)
 {
     return IsOfClass(node, wxT("wxIcon"));
 }
+
+#endif // wxUSE_XRC

diff --git a/src/xrc/xh_bmpbt.cpp b/src/xrc/xh_bmpbt.cpp
index 321b36c0b5667af63501b6a448e8cacd1a84d28c..e29178e7e52cecaef5136be2e38bb37e1b54e19a 100644 (file)
--- a/src/xrc/xh_bmpbt.cpp
+++ b/src/xrc/xh_bmpbt.cpp
@@ -19,6 +19,8 @@
     #pragma hdrstop
 #endif
 
+#if wxUSE_XRC
+
 #include "wx/xrc/xh_bmpbt.h"
 #include <wx/bmpbuttn.h>
 
@@ -65,3 +67,5 @@ bool wxBitmapButtonXmlHandler::CanHandle(wxXmlNode *node)
 {
     return IsOfClass(node, wxT("wxBitmapButton"));
 }
+
+#endif // wxUSE_XRC

diff --git a/src/xrc/xh_bttn.cpp b/src/xrc/xh_bttn.cpp
index 0733bd6f6f25d23d4a313d6af9bdaf5fcd5333d2..f6b4cffd2ffd8324536b60ff9beb2f47f9f3edd6 100644 (file)
--- a/src/xrc/xh_bttn.cpp
+++ b/src/xrc/xh_bttn.cpp
@@ -19,6 +19,8 @@
     #pragma hdrstop
 #endif
 
+#if wxUSE_XRC
+
 #include "wx/xrc/xh_bttn.h"
 #include "wx/button.h"
 
@@ -58,3 +60,5 @@ bool wxButtonXmlHandler::CanHandle(wxXmlNode *node)
 {
     return IsOfClass(node, wxT("wxButton"));
 }
+
+#endif // wxUSE_XRC

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

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

diff --git a/src/xrc/xh_chckl.cpp b/src/xrc/xh_chckl.cpp
index f891730c2e4da9c8d5720754e118d52432e0e041..536c011ae616325145c480e4cd8d9326b258e794 100644 (file)
--- a/src/xrc/xh_chckl.cpp
+++ b/src/xrc/xh_chckl.cpp
@@ -19,6 +19,8 @@
     #pragma hdrstop
 #endif
 
+#if wxUSE_XRC
+
 #if wxUSE_OWNER_DRAWN || !defined(__WXMSW__)
 
 #include "wx/xrc/xh_chckl.h"
@@ -129,5 +131,6 @@ bool wxCheckListBoxXmlHandler::CanHandle(wxXmlNode *node)
            (m_insideBox && node->GetName() == wxT("item")));
 }
 
-#endif
+#endif // wxUSE_OWNER_DRAWN || !defined(__WXMSW__)
 
+#endif // wxUSE_XRC

diff --git a/src/xrc/xh_choic.cpp b/src/xrc/xh_choic.cpp
index 9b3c33d34e2da62cd58e7c930342d375ed36dcb8..29262cc59e15e3a205a5820235dacb99044c6a25 100644 (file)
--- a/src/xrc/xh_choic.cpp
+++ b/src/xrc/xh_choic.cpp
@@ -19,6 +19,8 @@
     #pragma hdrstop
 #endif
 
+#if wxUSE_XRC
+
 #include "wx/xrc/xh_choic.h"
 #include "wx/choice.h"
 #include "wx/intl.h"
@@ -93,3 +95,5 @@ bool wxChoiceXmlHandler::CanHandle(wxXmlNode *node)
     return (IsOfClass(node, wxT("wxChoice")) ||
            (m_insideBox && node->GetName() == wxT("item")));
 }
+
+#endif // wxUSE_XRC

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

diff --git a/src/xrc/xh_dlg.cpp b/src/xrc/xh_dlg.cpp
index 8b56d45f2b56df433dab59a9e31656dcb384107f..eef07949ec13f492197f863e706d1275055d9a78 100644 (file)
--- a/src/xrc/xh_dlg.cpp
+++ b/src/xrc/xh_dlg.cpp
@@ -19,6 +19,8 @@
     #pragma hdrstop
 #endif
 
+#if wxUSE_XRC
+
 #include "wx/xrc/xh_dlg.h"
 #include "wx/dialog.h"
 #include "wx/log.h"
@@ -79,3 +81,5 @@ bool wxDialogXmlHandler::CanHandle(wxXmlNode *node)
 {
     return IsOfClass(node, wxT("wxDialog"));
 }
+
+#endif // wxUSE_XRC

diff --git a/src/xrc/xh_frame.cpp b/src/xrc/xh_frame.cpp
index 36461038f5ea1e1dccfe2d369de9b5c01fc3ea89..2685be16e06aeee8192317d869a7a5ef6e81fede 100644 (file)
--- a/src/xrc/xh_frame.cpp
+++ b/src/xrc/xh_frame.cpp
@@ -19,6 +19,8 @@
     #pragma hdrstop
 #endif
 
+#if wxUSE_XRC
+
 #include "wx/xrc/xh_frame.h"
 #include "wx/frame.h"
 #include "wx/dialog.h" // to get wxDEFAULT_DIALOG_STYLE
@@ -84,3 +86,5 @@ bool wxFrameXmlHandler::CanHandle(wxXmlNode *node)
 {
     return IsOfClass(node, wxT("wxFrame"));
 }
+
+#endif // wxUSE_XRC

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

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

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

diff --git a/src/xrc/xh_listb.cpp b/src/xrc/xh_listb.cpp
index c0a41a91eb9bb4d7ce30deac2a586f2e2f9919a5..939d6e834c314753656a187b0dc57cfaf17593c3 100644 (file)
--- a/src/xrc/xh_listb.cpp
+++ b/src/xrc/xh_listb.cpp
@@ -19,6 +19,8 @@
     #pragma hdrstop
 #endif
 
+#if wxUSE_XRC
+
 #include "wx/xrc/xh_listb.h"
 #include "wx/listbox.h"
 #include "wx/intl.h"
@@ -99,3 +101,5 @@ bool wxListBoxXmlHandler::CanHandle(wxXmlNode *node)
     return (IsOfClass(node, wxT("wxListBox")) ||
            (m_insideBox && node->GetName() == wxT("item")));
 }
+
+#endif // wxUSE_XRC

diff --git a/src/xrc/xh_listc.cpp b/src/xrc/xh_listc.cpp
index f6c9eab2c29e257815132122d8b3fe2912961c18..6746b8322435657bef9297f3b6e20fe998d7754a 100644 (file)
--- a/src/xrc/xh_listc.cpp
+++ b/src/xrc/xh_listc.cpp
@@ -19,6 +19,8 @@
     #pragma hdrstop
 #endif
 
+#if wxUSE_XRC
+
 #include "wx/textctrl.h"
 #include "wx/xrc/xh_listc.h"
 #include "wx/listctrl.h"
@@ -71,3 +73,5 @@ bool wxListCtrlXmlHandler::CanHandle(wxXmlNode *node)
 {
     return IsOfClass(node, wxT("wxListCtrl"));
 }
+
+#endif // wxUSE_XRC

diff --git a/src/xrc/xh_menu.cpp b/src/xrc/xh_menu.cpp
index dbe2a89e6132d85f186ed75a6fe44d86415d32b8..1f473c6dee43997664c46f68c100b716c649af9f 100644 (file)
--- a/src/xrc/xh_menu.cpp
+++ b/src/xrc/xh_menu.cpp
@@ -19,6 +19,8 @@
     #pragma hdrstop
 #endif
 
+#if wxUSE_XRC
+
 #include "wx/xrc/xh_menu.h"
 #include "wx/menu.h"
 #include "wx/frame.h"
@@ -139,3 +141,5 @@ bool wxMenuBarXmlHandler::CanHandle(wxXmlNode *node)
 {
     return IsOfClass(node, wxT("wxMenuBar"));
 }
+
+#endif // wxUSE_XRC

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

diff --git a/src/xrc/xh_panel.cpp b/src/xrc/xh_panel.cpp
index b05433b0187ff8d58b413aa614699c1e93058847..6b6a467e19e7b675d75a38cf26ea2569bb503bb9 100644 (file)
--- a/src/xrc/xh_panel.cpp
+++ b/src/xrc/xh_panel.cpp
@@ -19,6 +19,8 @@
     #pragma hdrstop
 #endif
 
+#if wxUSE_XRC
+
 #include "wx/xrc/xh_panel.h"
 #include "wx/panel.h"
 #include "wx/frame.h"  // to get wxNO_3D
@@ -54,3 +56,5 @@ bool wxPanelXmlHandler::CanHandle(wxXmlNode *node)
 {
     return IsOfClass(node, wxT("wxPanel"));
 }
+
+#endif // wxUSE_XRC

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

diff --git a/src/xrc/xh_radbx.cpp b/src/xrc/xh_radbx.cpp
index 5b950e2e93a777e9202bdd6610ea84e958c4304b..066f397d1ef87e2b64ad4c3ccd638a88eec26fe6 100644 (file)
--- a/src/xrc/xh_radbx.cpp
+++ b/src/xrc/xh_radbx.cpp
@@ -19,12 +19,12 @@
     #pragma hdrstop
 #endif
 
+#if wxUSE_XRC && wxUSE_RADIOBOX
+
 #include "wx/xrc/xh_radbx.h"
 #include "wx/radiobox.h"
 #include "wx/intl.h"
 
-#if wxUSE_RADIOBOX
-
 IMPLEMENT_DYNAMIC_CLASS(wxRadioBoxXmlHandler, wxXmlResourceHandler)
 
 wxRadioBoxXmlHandler::wxRadioBoxXmlHandler()
@@ -102,4 +102,4 @@ bool wxRadioBoxXmlHandler::CanHandle(wxXmlNode *node)
            (m_insideBox && node->GetName() == wxT("item")));
 }
 
-#endif
+#endif // wxUSE_XRC && wxUSE_RADIOBOX

diff --git a/src/xrc/xh_scrol.cpp b/src/xrc/xh_scrol.cpp
index f1c6fcba19d446772e6b988d8f8ca164819c604c..dd330bb78b0d25296faded9d38afdec399fa96af 100644 (file)
--- a/src/xrc/xh_scrol.cpp
+++ b/src/xrc/xh_scrol.cpp
@@ -19,6 +19,8 @@
     #pragma hdrstop
 #endif
 
+#if wxUSE_XRC
+
 #include "wx/xrc/xh_scrol.h"
 #include "wx/scrolbar.h"
 
@@ -58,3 +60,5 @@ bool wxScrollBarXmlHandler::CanHandle(wxXmlNode *node)
 {
     return IsOfClass(node, wxT("wxScrollBar"));
 }
+
+#endif // wxUSE_XRC

diff --git a/src/xrc/xh_scwin.cpp b/src/xrc/xh_scwin.cpp
index e075827f4e880be9beeace85f75a4f527ae96b89..886da64ce04f010612ca1914c778cff831456e75 100644 (file)
--- a/src/xrc/xh_scwin.cpp
+++ b/src/xrc/xh_scwin.cpp
@@ -19,6 +19,8 @@
     #pragma hdrstop
 #endif
 
+#if wxUSE_XRC
+
 #include "wx/xrc/xh_scwin.h"
 #include "wx/scrolwin.h"
 #include "wx/frame.h"  // to get wxNO_3D
@@ -59,3 +61,5 @@ bool wxScrolledWindowXmlHandler::CanHandle(wxXmlNode *node)
 {
     return IsOfClass(node, wxT("wxScrolledWindow"));
 }
+
+#endif // wxUSE_XRC

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

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

diff --git a/src/xrc/xh_spin.cpp b/src/xrc/xh_spin.cpp
index c6ad0fcf92b06e50422ac18aa8a3a6d63ede5fa1..73c96c7a430c85e979008eba77713318bc036832 100644 (file)
--- a/src/xrc/xh_spin.cpp
+++ b/src/xrc/xh_spin.cpp
@@ -19,11 +19,11 @@
     #pragma hdrstop
 #endif
 
+#if wxUSE_XRC && wxUSE_SPINBTN
+
 #include "wx/xrc/xh_spin.h"
 #include "wx/spinctrl.h"
 
-#if wxUSE_SPINBTN
-
 IMPLEMENT_DYNAMIC_CLASS(wxSpinButtonXmlHandler, wxXmlResourceHandler)
 
 wxSpinButtonXmlHandler::wxSpinButtonXmlHandler()
@@ -98,4 +98,4 @@ bool wxSpinCtrlXmlHandler::CanHandle(wxXmlNode *node)
     return IsOfClass(node, wxT("wxSpinCtrl"));
 }
 
-#endif // wxUSE_SPINCTRL
+#endif // wxUSE_XRC && wxUSE_SPINCTRL

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

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

diff --git a/src/xrc/xh_stbmp.cpp b/src/xrc/xh_stbmp.cpp
index 2674322938d16a01ba1a9728aac5ea8db3624cf6..42f8073a91c646742ab342b06f460a432f89ae68 100644 (file)
--- a/src/xrc/xh_stbmp.cpp
+++ b/src/xrc/xh_stbmp.cpp
@@ -19,6 +19,8 @@
     #pragma hdrstop
 #endif
 
+#if wxUSE_XRC
+
 #include "wx/xrc/xh_stbmp.h"
 #include "wx/statbmp.h"
 
@@ -50,3 +52,5 @@ bool wxStaticBitmapXmlHandler::CanHandle(wxXmlNode *node)
 {
     return IsOfClass(node, wxT("wxStaticBitmap"));
 }
+
+#endif // wxUSE_XRC

diff --git a/src/xrc/xh_stbox.cpp b/src/xrc/xh_stbox.cpp
index 9a88572d5be1296b0415e4bd04b70987463a9da2..93f21b42d2d022c88ce4217962750cbeb54d835f 100644 (file)
--- a/src/xrc/xh_stbox.cpp
+++ b/src/xrc/xh_stbox.cpp
@@ -19,6 +19,8 @@
     #pragma hdrstop
 #endif
 
+#if wxUSE_XRC
+
 #include "wx/xrc/xh_stbox.h"
 #include "wx/statbox.h"
 
@@ -50,3 +52,5 @@ bool wxStaticBoxXmlHandler::CanHandle(wxXmlNode *node)
 {
     return IsOfClass(node, wxT("wxStaticBox"));
 }
+
+#endif // wxUSE_XRC

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

diff --git a/src/xrc/xh_sttxt.cpp b/src/xrc/xh_sttxt.cpp
index a65e2b4b4fdcba43b14f6c4637ecb89586f785b3..da772ef4165eaa2a281d062845da2f0916f5b851 100644 (file)
--- a/src/xrc/xh_sttxt.cpp
+++ b/src/xrc/xh_sttxt.cpp
@@ -19,6 +19,8 @@
     #pragma hdrstop
 #endif
 
+#if wxUSE_XRC
+
 #include "wx/xrc/xh_sttxt.h"
 #include "wx/stattext.h"
 
@@ -54,3 +56,5 @@ bool wxStaticTextXmlHandler::CanHandle(wxXmlNode *node)
 {
     return IsOfClass(node, wxT("wxStaticText"));
 }
+
+#endif // wxUSE_XRC

diff --git a/src/xrc/xh_text.cpp b/src/xrc/xh_text.cpp
index 19bbd601c8501150a3fa8db74d4013a5a354af95..745189008dec2f598a113873fa6f2e1eddaf6e7f 100644 (file)
--- a/src/xrc/xh_text.cpp
+++ b/src/xrc/xh_text.cpp
@@ -19,6 +19,8 @@
     #pragma hdrstop
 #endif
 
+#if wxUSE_XRC
+
 #include "wx/xrc/xh_text.h"
 #include "wx/textctrl.h"
 
@@ -68,3 +70,5 @@ bool wxTextCtrlXmlHandler::CanHandle(wxXmlNode *node)
 {
     return IsOfClass(node, wxT("wxTextCtrl"));
 }
+
+#endif // wxUSE_XRC

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

diff --git a/src/xrc/xh_toolb.cpp b/src/xrc/xh_toolb.cpp
index 7e44ab77a1eecf220db81f878576e1e616570785..a7a569ead4fba2a5a403506b137bfaec176c422e 100644 (file)
--- a/src/xrc/xh_toolb.cpp
+++ b/src/xrc/xh_toolb.cpp
@@ -19,12 +19,12 @@
     #pragma hdrstop
 #endif
 
+#if wxUSE_XRC && wxUSE_TOOLBAR
+
 #include "wx/xrc/xh_toolb.h"
 #include "wx/toolbar.h"
 #include "wx/frame.h"
 
-#if wxUSE_TOOLBAR
-
 IMPLEMENT_DYNAMIC_CLASS(wxToolBarXmlHandler, wxXmlResourceHandler)
 
 wxToolBarXmlHandler::wxToolBarXmlHandler()
@@ -167,4 +167,4 @@ bool wxToolBarXmlHandler::CanHandle(wxXmlNode *node)
             (m_isInside && IsOfClass(node, wxT("separator"))));
 }
 
-#endif
+#endif // wxUSE_XRC && wxUSE_TOOLBAR

diff --git a/src/xrc/xh_tree.cpp b/src/xrc/xh_tree.cpp
index a0b32fd6adaea2c0182218fc54f3465fbc169242..cb886cf3d97c15c68eace63b3994b79fbff5025b 100644 (file)
--- a/src/xrc/xh_tree.cpp
+++ b/src/xrc/xh_tree.cpp
@@ -19,6 +19,8 @@
     #pragma hdrstop
 #endif
 
+#if wxUSE_XRC
+
 #include "wx/xrc/xh_tree.h"
 #include "wx/treectrl.h"
 
@@ -64,3 +66,5 @@ bool wxTreeCtrlXmlHandler::CanHandle(wxXmlNode *node)
 {
     return IsOfClass(node, wxT("wxTreeCtrl"));
 }
+
+#endif // wxUSE_XRC

diff --git a/src/xrc/xh_unkwn.cpp b/src/xrc/xh_unkwn.cpp
index 84c0158ff15b898013a42b1ed0d6b08ff8ac8976..f9b56480367f442c0afeaa1db5e74ceabdb6e15e 100644 (file)
--- a/src/xrc/xh_unkwn.cpp
+++ b/src/xrc/xh_unkwn.cpp
@@ -19,6 +19,8 @@
     #pragma hdrstop
 #endif
 
+#if wxUSE_XRC
+
 #include "wx/xrc/xh_unkwn.h"
 #include "wx/window.h"
 #include "wx/log.h"
@@ -106,3 +108,4 @@ bool wxUnknownWidgetXmlHandler::CanHandle(wxXmlNode *node)
     return IsOfClass(node, wxT("unknown"));
 }
 
+#endif // wxUSE_XRC

diff --git a/src/xrc/xh_wizrd.cpp b/src/xrc/xh_wizrd.cpp
index aff151cede7c7932bc58a99ea318bf792ab71026..2b9508ae05cb1a0391c70f6a6ac43b01b10c66b9 100644 (file)
--- a/src/xrc/xh_wizrd.cpp
+++ b/src/xrc/xh_wizrd.cpp
@@ -19,7 +19,7 @@
     #pragma hdrstop
 #endif
 
-#if wxUSE_WIZARDDLG
+#if wxUSE_XRC && wxUSE_WIZARDDLG
 
 #include "wx/xrc/xh_wizrd.h"
 #include "wx/log.h"
@@ -99,4 +99,4 @@ bool wxWizardXmlHandler::CanHandle(wxXmlNode *node)
            );
 }
 
-#endif // wxUSE_WIZARDDLG
+#endif // wxUSE_XRC && wxUSE_WIZARDDLG

diff --git a/src/xrc/xmlres.cpp b/src/xrc/xmlres.cpp
index b6f24ced63471ec56379b002cb6a22bafbabdb8d..197ea98480f8dd9c55fe235a3467313e12f2ffa0 100644 (file)
--- a/src/xrc/xmlres.cpp
+++ b/src/xrc/xmlres.cpp
@@ -19,6 +19,8 @@
     #pragma hdrstop
 #endif
 
+#if wxUSE_XRC
+
 #include "wx/dialog.h"
 #include "wx/panel.h"
 #include "wx/frame.h"
@@ -1427,3 +1429,5 @@ void wxXmlInitResourceModule()
     module->Init();
     wxModule::RegisterModule(module);
 }
+
+#endif // wxUSE_XRC

diff --git a/src/xrc/xmlrsall.cpp b/src/xrc/xmlrsall.cpp
index 44c417dc513e9c0217108b56317a217b841a710f..bf2eb997348da36d54efab3878fe7a2d0557bcca 100644 (file)
--- a/src/xrc/xmlrsall.cpp
+++ b/src/xrc/xmlrsall.cpp
@@ -20,6 +20,8 @@
     #pragma hdrstop
 #endif
 
+#if wxUSE_XRC
+
 #include "wx/xrc/xmlres.h"
 #include "wx/xrc/xh_all.h"
 
@@ -106,3 +108,5 @@ void wxXmlResource::InitAllHandlers()
     AddHandler(new wxStatusBarXmlHandler);
 #endif
 }
+
+#endif // wxUSE_XRC