Removed some old cruft from wxBitmap, moved wxMotif- and

[wxWidgets.git] / contrib / src / xrc / xmlrsall.cpp

diff --git a/contrib/src/xrc/xmlrsall.cpp b/contrib/src/xrc/xmlrsall.cpp
index 6f4a5039de01fdf3edda3a48786dccb408f16f29..ea175a776d929f6ec80c66f58b0f99e030727595 100644 (file)
--- a/contrib/src/xrc/xmlrsall.cpp
+++ b/contrib/src/xrc/xmlrsall.cpp
@@ -29,21 +29,20 @@ void wxXmlResource::InitAllHandlers()
     AddHandler(new wxIconXmlHandler);
     AddHandler(new wxMenuXmlHandler);
     AddHandler(new wxMenuBarXmlHandler);
     AddHandler(new wxIconXmlHandler);
     AddHandler(new wxMenuXmlHandler);
     AddHandler(new wxMenuBarXmlHandler);

-

     AddHandler(new wxDialogXmlHandler);
     AddHandler(new wxPanelXmlHandler);
     AddHandler(new wxDialogXmlHandler);
     AddHandler(new wxPanelXmlHandler);

-

     AddHandler(new wxSizerXmlHandler);
     AddHandler(new wxSizerXmlHandler);

-//Controls

     AddHandler(new wxButtonXmlHandler);
     AddHandler(new wxBitmapButtonXmlHandler);
     AddHandler(new wxStaticTextXmlHandler);
     AddHandler(new wxStaticBoxXmlHandler);
     AddHandler(new wxStaticBitmapXmlHandler);
     AddHandler(new wxTreeCtrlXmlHandler);
     AddHandler(new wxButtonXmlHandler);
     AddHandler(new wxBitmapButtonXmlHandler);
     AddHandler(new wxStaticTextXmlHandler);
     AddHandler(new wxStaticBoxXmlHandler);
     AddHandler(new wxStaticBitmapXmlHandler);
     AddHandler(new wxTreeCtrlXmlHandler);

+#if wxUSE_CALENDARCTRL

     AddHandler(new wxCalendarCtrlXmlHandler);
     AddHandler(new wxCalendarCtrlXmlHandler);

+#endif

     AddHandler(new wxListCtrlXmlHandler);
     AddHandler(new wxListCtrlXmlHandler);

-#if CHECKLISTBOX
+#if wxUSE_CHECKLISTBOX

     AddHandler(new wxCheckListXmlHandler);
 #endif
 #if wxUSE_CHOICE
     AddHandler(new wxCheckListXmlHandler);
 #endif
 #if wxUSE_CHOICE


@@ -70,7 +69,6 @@ void wxXmlResource::InitAllHandlers()
 #if wxUSE_SCROLLBAR
     AddHandler(new wxScrollBarXmlHandler);
 #endif
 #if wxUSE_SCROLLBAR
     AddHandler(new wxScrollBarXmlHandler);
 #endif

-    

 #if wxUSE_RADIOBOX
     AddHandler(new wxRadioBoxXmlHandler);
     AddHandler(new wxRadioButtonXmlHandler);
 #if wxUSE_RADIOBOX
     AddHandler(new wxRadioBoxXmlHandler);
     AddHandler(new wxRadioButtonXmlHandler);


@@ -92,6 +90,10 @@ void wxXmlResource::InitAllHandlers()
     AddHandler(new wxStaticLineXmlHandler);
 #endif
     AddHandler(new wxUnknownWidgetXmlHandler);
     AddHandler(new wxStaticLineXmlHandler);
 #endif
     AddHandler(new wxUnknownWidgetXmlHandler);

-
+#if wxUSE_DIRDLG
+    AddHandler(new wxGenericDirCtrlXmlHandler);
+#endif

     AddHandler(new wxFrameXmlHandler);
     AddHandler(new wxFrameXmlHandler);

+    AddHandler(new wxScrolledWindowXmlHandler);
+    AddHandler(new wxSplitterWindowXmlHandler);

 }
 }