removed libxpm dependencies from makefiles

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

diff --git a/contrib/src/xml/xmlrsall.cpp b/contrib/src/xml/xmlrsall.cpp
index 19312097e9119a4c9bd2107eb149acc2f0c75872..7db99c52c978aa2886d71f59c989d9024ead7aa1 100644 (file)
--- a/contrib/src/xml/xmlrsall.cpp
+++ b/contrib/src/xml/xmlrsall.cpp
@@ -25,12 +25,33 @@
 
 void wxXmlResource::InitAllHandlers()
 {
 
 void wxXmlResource::InitAllHandlers()
 {

+    AddHandler(new wxBitmapXmlHandler);
+    AddHandler(new wxIconXmlHandler);

     AddHandler(new wxMenuXmlHandler);
     AddHandler(new wxMenuBarXmlHandler);
 
     AddHandler(new wxDialogXmlHandler);
     AddHandler(new wxPanelXmlHandler);
     AddHandler(new wxMenuXmlHandler);
     AddHandler(new wxMenuBarXmlHandler);
 
     AddHandler(new wxDialogXmlHandler);
     AddHandler(new wxPanelXmlHandler);

+
+    AddHandler(new wxSizerXmlHandler);
+//Controls

     AddHandler(new wxButtonXmlHandler);
     AddHandler(new wxButtonXmlHandler);

+    AddHandler(new wxBitmapButtonXmlHandler);
+    AddHandler(new wxStaticTextXmlHandler);
+    AddHandler(new wxStaticBoxXmlHandler);
+    AddHandler(new wxStaticBitmapXmlHandler);
+    AddHandler(new wxTreeCtrlXmlHandler);
+    AddHandler(new wxCalendarCtrlXmlHandler);
+    AddHandler(new wxListCtrlXmlHandler);
+#if CHECKLISTBOX
+    AddHandler(new wxCheckListXmlHandler);
+#endif
+#if wxUSE_CHOICE
+    AddHandler(new wxChoiceXmlHandler);
+#endif
+#if wxUSE_SLIDER
+    AddHandler(new wxSliderXmlHandler);
+#endif

 #if wxUSE_GAUGE
     AddHandler(new wxGaugeXmlHandler);
 #endif
 #if wxUSE_GAUGE
     AddHandler(new wxGaugeXmlHandler);
 #endif


@@ -46,9 +67,10 @@ void wxXmlResource::InitAllHandlers()
 #if wxUSE_SPINCTRL
     AddHandler(new wxSpinCtrlXmlHandler);
 #endif    
 #if wxUSE_SPINCTRL
     AddHandler(new wxSpinCtrlXmlHandler);
 #endif    

-    AddHandler(new wxStaticTextXmlHandler);
-    AddHandler(new wxStaticBitmapXmlHandler);
-    AddHandler(new wxSliderXmlHandler);
+#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);


@@ -56,9 +78,6 @@ void wxXmlResource::InitAllHandlers()
 #if wxUSE_COMBOBOX
     AddHandler(new wxComboBoxXmlHandler);
 #endif
 #if wxUSE_COMBOBOX
     AddHandler(new wxComboBoxXmlHandler);
 #endif

-    AddHandler(new wxChoiceXmlHandler);
-    AddHandler(new wxCheckListXmlHandler);
-    AddHandler(new wxSizerXmlHandler);

 #if wxUSE_NOTEBOOK
     AddHandler(new wxNotebookXmlHandler);
 #endif
 #if wxUSE_NOTEBOOK
     AddHandler(new wxNotebookXmlHandler);
 #endif


@@ -69,4 +88,10 @@ void wxXmlResource::InitAllHandlers()
 #if wxUSE_TOOLBAR
     AddHandler(new wxToolBarXmlHandler);
 #endif
 #if wxUSE_TOOLBAR
     AddHandler(new wxToolBarXmlHandler);
 #endif

+#if wxUSE_STATLINE
+    AddHandler(new wxStaticLineXmlHandler);
+#endif
+    AddHandler(new wxUnknownWidgetXmlHandler);
+
+    AddHandler(new wxFrameXmlHandler);

 }
 }