(Flickery) fix for droppings when there are no notebook pages

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

diff --git a/src/xrc/xmlrsall.cpp b/src/xrc/xmlrsall.cpp
index 29deb1c4cad8cb0ea72ad5ea75dd0bdd570901ae..f8465e58f738194ff50605ced8e359b1dcaab95f 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"
 


@@ -29,22 +31,21 @@ 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);
 #if wxUSE_CHECKLISTBOX
     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);


@@ -57,20 +58,22 @@ 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

-    

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


@@ -80,6 +83,12 @@ 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
     AddHandler(new wxTextCtrlXmlHandler);
 #if wxUSE_LISTBOX
 #endif
     AddHandler(new wxTextCtrlXmlHandler);
 #if wxUSE_LISTBOX


@@ -92,6 +101,21 @@ 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);
+#if wxUSE_WIZARDDLG
+    AddHandler(new wxWizardXmlHandler);
+#endif
+#if wxUSE_STATUSBAR
+    AddHandler(new wxStatusBarXmlHandler);
+#endif
+#if wxUSE_DATEPICKCTRL
+    AddHandler(new wxDateCtrlXmlHandler);
+#endif

 }
 }

+
+#endif // wxUSE_XRC