X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/582f07c2532e6e2d7d1ccb235354548e9bada9bf..e86571392a56f3a2d4a7cfa900d728dc9d6fb392:/src/xrc/xmlrsall.cpp?ds=inline

diff --git a/src/xrc/xmlrsall.cpp b/src/xrc/xmlrsall.cpp
index bc6254ec92..c87da9a592 100644
--- a/src/xrc/xmlrsall.cpp
+++ b/src/xrc/xmlrsall.cpp
@@ -22,24 +22,46 @@
 
 void wxXmlResource::InitAllHandlers()
 {
+    // these are the handlers, which we always have
+    AddHandler(new wxUnknownWidgetXmlHandler);
     AddHandler(new wxBitmapXmlHandler);
     AddHandler(new wxIconXmlHandler);
-    AddHandler(new wxMenuXmlHandler);
-    AddHandler(new wxMenuBarXmlHandler);
     AddHandler(new wxDialogXmlHandler);
     AddHandler(new wxPanelXmlHandler);
     AddHandler(new wxSizerXmlHandler);
+    AddHandler(new wxFrameXmlHandler);
+    AddHandler(new wxScrolledWindowXmlHandler);
+
+    // these are configurable handlers
+#if wxUSE_MENUS
+    AddHandler(new wxMenuXmlHandler);
+    AddHandler(new wxMenuBarXmlHandler);
+#endif
+#if wxUSE_BUTTON
     AddHandler(new wxStdDialogButtonSizerXmlHandler);
     AddHandler(new wxButtonXmlHandler);
+#endif
+#if wxUSE_BMPBUTTON
     AddHandler(new wxBitmapButtonXmlHandler);
+#endif
+#if wxUSE_STATTEXT
     AddHandler(new wxStaticTextXmlHandler);
+#endif
+#if wxUSE_STATBOX
     AddHandler(new wxStaticBoxXmlHandler);
+#endif
+#if wxUSE_STATBMP
     AddHandler(new wxStaticBitmapXmlHandler);
+#endif
+#if wxUSE_TREECTRL
     AddHandler(new wxTreeCtrlXmlHandler);
+#endif
 #if wxUSE_CALENDARCTRL
     AddHandler(new wxCalendarCtrlXmlHandler);
 #endif
+#if wxUSE_LISTCTRL
     AddHandler(new wxListCtrlXmlHandler);
+#endif
 #if wxUSE_CHECKLISTBOX
     AddHandler(new wxCheckListBoxXmlHandler);
 #endif
@@ -72,6 +94,8 @@ void wxXmlResource::InitAllHandlers()
 #endif
 #if wxUSE_RADIOBOX
     AddHandler(new wxRadioBoxXmlHandler);
+#endif
+#if wxUSE_RADIOBTN
     AddHandler(new wxRadioButtonXmlHandler);
 #endif
 #if wxUSE_COMBOBOX
@@ -80,6 +104,9 @@ void wxXmlResource::InitAllHandlers()
 #if wxUSE_ODCOMBOBOX
     AddHandler(new wxOwnerDrawnComboBoxXmlHandler);
 #endif
+#if wxUSE_BITMAPCOMBOBOX
+    AddHandler(new wxBitmapComboBoxXmlHandler);
+#endif
 #if wxUSE_NOTEBOOK
     AddHandler(new wxNotebookXmlHandler);
 #endif
@@ -92,7 +119,9 @@ void wxXmlResource::InitAllHandlers()
 #if wxUSE_TREEBOOK
     AddHandler(new wxTreebookXmlHandler);
 #endif
+#if wxUSE_TEXTCTRL
     AddHandler(new wxTextCtrlXmlHandler);
+#endif
 #if wxUSE_LISTBOX
     AddHandler(new wxListBoxXmlHandler);
 #endif
@@ -102,13 +131,12 @@ void wxXmlResource::InitAllHandlers()
 #if wxUSE_STATLINE
     AddHandler(new wxStaticLineXmlHandler);
 #endif
-    AddHandler(new wxUnknownWidgetXmlHandler);
 #if wxUSE_DIRDLG
     AddHandler(new wxGenericDirCtrlXmlHandler);
 #endif
-    AddHandler(new wxFrameXmlHandler);
-    AddHandler(new wxScrolledWindowXmlHandler);
+#if wxUSE_SPLITTER
     AddHandler(new wxSplitterWindowXmlHandler);
+#endif
 #if wxUSE_WIZARDDLG
     AddHandler(new wxWizardXmlHandler);
 #endif