cleanup - reformatting (reapplied after RN-VZ mega-update)

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

diff --git a/src/xrc/xmlrsall.cpp b/src/xrc/xmlrsall.cpp
index 5c26749d931e8eb32ec8335d21e97c06f44ac3bd..df66f1d675672338b30ac183a43a86457e0c0991 100644 (file)
--- a/src/xrc/xmlrsall.cpp
+++ b/src/xrc/xmlrsall.cpp
@@ -8,11 +8,6 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-// -- Already done in xmlres.cpp
-//#ifdef __GNUG__
-//#pragma implementation "xmlres.h"
-//#endif
-

 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 


@@ -20,6 +15,8 @@
     #pragma hdrstop
 #endif
 
     #pragma hdrstop
 #endif
 

+#if wxUSE_XRC
+

 #include "wx/xrc/xmlres.h"
 #include "wx/xrc/xh_all.h"
 
 #include "wx/xrc/xmlres.h"
 #include "wx/xrc/xh_all.h"
 


@@ -32,6 +29,7 @@ void wxXmlResource::InitAllHandlers()
     AddHandler(new wxDialogXmlHandler);
     AddHandler(new wxPanelXmlHandler);
     AddHandler(new wxSizerXmlHandler);
     AddHandler(new wxDialogXmlHandler);
     AddHandler(new wxPanelXmlHandler);
     AddHandler(new wxSizerXmlHandler);

+    AddHandler(new wxStdDialogButtonSizerXmlHandler);

     AddHandler(new wxButtonXmlHandler);
     AddHandler(new wxBitmapButtonXmlHandler);
     AddHandler(new wxStaticTextXmlHandler);
     AddHandler(new wxButtonXmlHandler);
     AddHandler(new wxBitmapButtonXmlHandler);
     AddHandler(new wxStaticTextXmlHandler);


@@ -57,6 +55,9 @@ void wxXmlResource::InitAllHandlers()
 #if wxUSE_CHECKBOX
     AddHandler(new wxCheckBoxXmlHandler);
 #endif
 #if wxUSE_CHECKBOX
     AddHandler(new wxCheckBoxXmlHandler);
 #endif

+#if wxUSE_TOGGLEBTN
+    AddHandler(new wxToggleButtonXmlHandler);
+#endif

 #if wxUSE_HTML
     AddHandler(new wxHtmlWindowXmlHandler);
 #endif
 #if wxUSE_HTML
     AddHandler(new wxHtmlWindowXmlHandler);
 #endif


@@ -78,6 +79,15 @@ void wxXmlResource::InitAllHandlers()
 #endif
 #if wxUSE_NOTEBOOK
     AddHandler(new wxNotebookXmlHandler);
 #endif
 #if wxUSE_NOTEBOOK
     AddHandler(new wxNotebookXmlHandler);

+#endif
+#if wxUSE_LISTBOOK
+    AddHandler(new wxListbookXmlHandler);
+#endif
+#if wxUSE_CHOICEBOOK
+    AddHandler(new wxChoicebookXmlHandler);
+#endif
+#if wxUSE_TREEBOOK
+    AddHandler(new wxTreebookXmlHandler);

 #endif
     AddHandler(new wxTextCtrlXmlHandler);
 #if wxUSE_LISTBOX
 #endif
     AddHandler(new wxTextCtrlXmlHandler);
 #if wxUSE_LISTBOX


@@ -102,4 +112,15 @@ void wxXmlResource::InitAllHandlers()
 #if wxUSE_STATUSBAR
     AddHandler(new wxStatusBarXmlHandler);
 #endif
 #if wxUSE_STATUSBAR
     AddHandler(new wxStatusBarXmlHandler);
 #endif

+#if wxUSE_DATEPICKCTRL
+    AddHandler(new wxDateCtrlXmlHandler);
+#endif
+#if wxUSE_MDI
+    AddHandler(new wxMdiXmlHandler);
+#endif
+#if wxUSE_GRID
+    AddHandler( new wxGridXmlHandler);
+#endif

 }
 }

+
+#endif // wxUSE_XRC