fixed MSVC6's "C4702: unreachable code" warnings

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

diff --git a/src/xrc/xmlrsall.cpp b/src/xrc/xmlrsall.cpp
index b55badc9f93f0f5653edb0b3903913ddf4578391..33c80ae0cd0c74c747ec1c020befc3b2589e52cf 100644 (file)
--- a/src/xrc/xmlrsall.cpp
+++ b/src/xrc/xmlrsall.cpp
@@ -7,9 +7,9 @@
 // Copyright:   (c) 2000 Vaclav Slavik
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 // Copyright:   (c) 2000 Vaclav Slavik
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////

- 
+

 // -- Already done in xmlres.cpp
 // -- Already done in xmlres.cpp

-//#ifdef __GNUG__
+//#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

 //#pragma implementation "xmlres.h"
 //#endif
 
 //#pragma implementation "xmlres.h"
 //#endif
 


@@ -20,6 +20,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"
 


@@ -43,7 +45,7 @@ void wxXmlResource::InitAllHandlers()
 #endif
     AddHandler(new wxListCtrlXmlHandler);
 #if wxUSE_CHECKLISTBOX
 #endif
     AddHandler(new wxListCtrlXmlHandler);
 #if wxUSE_CHECKLISTBOX

-    AddHandler(new wxCheckListXmlHandler);
+    AddHandler(new wxCheckListBoxXmlHandler);

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


@@ -56,16 +58,19 @@ void wxXmlResource::InitAllHandlers()
 #endif
 #if wxUSE_CHECKBOX
     AddHandler(new wxCheckBoxXmlHandler);
 #endif
 #if wxUSE_CHECKBOX
     AddHandler(new wxCheckBoxXmlHandler);

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

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

-#endif    
+#endif

 #if wxUSE_SPINBTN
     AddHandler(new wxSpinButtonXmlHandler);
 #if wxUSE_SPINBTN
     AddHandler(new wxSpinButtonXmlHandler);

-#endif    
+#endif

 #if wxUSE_SPINCTRL
     AddHandler(new wxSpinCtrlXmlHandler);
 #if wxUSE_SPINCTRL
     AddHandler(new wxSpinCtrlXmlHandler);

-#endif    
+#endif

 #if wxUSE_SCROLLBAR
     AddHandler(new wxScrollBarXmlHandler);
 #endif
 #if wxUSE_SCROLLBAR
     AddHandler(new wxScrollBarXmlHandler);
 #endif


@@ -94,4 +99,17 @@ void wxXmlResource::InitAllHandlers()
     AddHandler(new wxGenericDirCtrlXmlHandler);
 #endif
     AddHandler(new wxFrameXmlHandler);
     AddHandler(new wxGenericDirCtrlXmlHandler);
 #endif
     AddHandler(new wxFrameXmlHandler);

+    AddHandler(new wxScrolledWindowXmlHandler);
+    AddHandler(new wxSplitterWindowXmlHandler);
+#if wxUSE_WIZARDDLG
+    AddHandler(new wxWizardXmlHandler);
+#endif
+#if wxUSE_STATUSBAR
+    AddHandler(new wxStatusBarXmlHandler);
+#endif
+#if wxUSE_DATEPICKCTRL
+    AddHandler(new wxDateCtrlXmlHandler);
+#endif

 }
 }

+
+#endif // wxUSE_XRC