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

@@ -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_

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

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

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

src/xrc/xh_cald.cpp

@@ -19,9 +19,7 @@
     #pragma hdrstop
 #endif
 
-#include "wx/setup.h"
+#if wxUSE_XRC && wxUSE_CALENDARCTRL
-
-#if 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

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

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

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

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

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

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

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

src/xrc/xh_gdctl.cpp

@@ -19,8 +19,7 @@
     #pragma hdrstop
 #endif
 
-#include "wx/defs.h"
+#if wxUSE_XRC && wxUSE_DIRDLG
-#if 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

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

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

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

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

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

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

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

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

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

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

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
-
-
-
-
-
-
-
-

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

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

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

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
 

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

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

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

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

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

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

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

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

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

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

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

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