From a1e4ec87317aa33fae6dbd8c55fbc699432d0026 Mon Sep 17 00:00:00 2001 From: =?utf8?q?V=C3=A1clav=20Slav=C3=ADk?= Date: Sat, 18 Sep 2004 08:53:16 +0000 Subject: [PATCH] moving XRC to the core git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29187 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/xrc/xmlres.h | 4 ++++ src/xrc/xh_bmp.cpp | 4 ++++ src/xrc/xh_bmpbt.cpp | 4 ++++ src/xrc/xh_bttn.cpp | 4 ++++ src/xrc/xh_cald.cpp | 6 ++---- src/xrc/xh_chckb.cpp | 6 +++--- src/xrc/xh_chckl.cpp | 5 ++++- src/xrc/xh_choic.cpp | 4 ++++ src/xrc/xh_combo.cpp | 6 +++--- src/xrc/xh_dlg.cpp | 4 ++++ src/xrc/xh_frame.cpp | 4 ++++ src/xrc/xh_gauge.cpp | 6 +++--- src/xrc/xh_gdctl.cpp | 5 ++--- src/xrc/xh_html.cpp | 6 +++--- src/xrc/xh_listb.cpp | 4 ++++ src/xrc/xh_listc.cpp | 4 ++++ src/xrc/xh_menu.cpp | 4 ++++ src/xrc/xh_notbk.cpp | 6 +++--- src/xrc/xh_panel.cpp | 4 ++++ src/xrc/xh_radbt.cpp | 6 +++--- src/xrc/xh_radbx.cpp | 6 +++--- src/xrc/xh_scrol.cpp | 4 ++++ src/xrc/xh_scwin.cpp | 4 ++++ src/xrc/xh_sizer.cpp | 12 +++--------- src/xrc/xh_slidr.cpp | 6 +++--- src/xrc/xh_spin.cpp | 6 +++--- src/xrc/xh_split.cpp | 4 +++- src/xrc/xh_statbar.cpp | 6 +++--- src/xrc/xh_stbmp.cpp | 4 ++++ src/xrc/xh_stbox.cpp | 4 ++++ src/xrc/xh_stlin.cpp | 6 +++--- src/xrc/xh_sttxt.cpp | 4 ++++ src/xrc/xh_text.cpp | 4 ++++ src/xrc/xh_tglbtn.cpp | 6 +++--- src/xrc/xh_toolb.cpp | 6 +++--- src/xrc/xh_tree.cpp | 4 ++++ src/xrc/xh_unkwn.cpp | 3 +++ src/xrc/xh_wizrd.cpp | 4 ++-- src/xrc/xmlres.cpp | 4 ++++ src/xrc/xmlrsall.cpp | 4 ++++ 40 files changed, 138 insertions(+), 59 deletions(-) diff --git a/include/wx/xrc/xmlres.h b/include/wx/xrc/xmlres.h index 198efa7a7e..ded3f30324 100644 --- 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 0853104360..ad56a9add2 100644 --- 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 321b36c0b5..e29178e7e5 100644 --- 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 @@ -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 0733bd6f6f..f6b4cffd2f 100644 --- 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 bc7df4efbc..67fa6e5edf 100644 --- 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 426a3746ad..3731c6b889 100644 --- 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 f891730c2e..536c011ae6 100644 --- 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 9b3c33d34e..29262cc59e 100644 --- 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 ffde936198..16b11715a6 100644 --- 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 8b56d45f2b..eef07949ec 100644 --- 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 36461038f5..2685be16e0 100644 --- 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 2f3dad0c44..c529b21cbf 100644 --- 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 5a8226ebb7..46e1add183 100644 --- 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 156370d27a..7bdf27ed8f 100644 --- 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 c0a41a91eb..939d6e834c 100644 --- 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 f6c9eab2c2..6746b83224 100644 --- 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 dbe2a89e61..1f473c6dee 100644 --- 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 1a0c7b14b4..5248793026 100644 --- 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 b05433b018..6b6a467e19 100644 --- 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 01c5ece4f0..e615ef9365 100644 --- 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 5b950e2e93..066f397d1e 100644 --- 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 f1c6fcba19..dd330bb78b 100644 --- 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 e075827f4e..886da64ce0 100644 --- 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 ba6c799f25..806370b3a6 100644 --- 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 e71a5fd41a..3ca8b26aa7 100644 --- 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 c6ad0fcf92..73c96c7a43 100644 --- 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 5deff63190..948b241ec1 100644 --- 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 ec4eefc616..5dead981da 100644 --- 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 2674322938..42f8073a91 100644 --- 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 9a88572d5b..93f21b42d2 100644 --- 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 9d49226eab..025713ec14 100644 --- 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 a65e2b4b4f..da772ef416 100644 --- 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 19bbd601c8..745189008d 100644 --- 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 1e6219ca12..1974ab14d1 100644 --- 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 7e44ab77a1..a7a569ead4 100644 --- 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 a0b32fd6ad..cb886cf3d9 100644 --- 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 84c0158ff1..f9b5648036 100644 --- 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 aff151cede..2b9508ae05 100644 --- 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 b6f24ced63..197ea98480 100644 --- 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 44c417dc51..bf2eb99734 100644 --- 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 -- 2.47.2