reset m_selection in DeleteAllPages() (patch 1922215); some cleanup of DoRemovePage...

[wxWidgets.git] / include / wx / xrc / xh_sizer.h

diff --git a/include/wx/xrc/xh_sizer.h b/include/wx/xrc/xh_sizer.h
index c960d36383cd22eca45a697931b661a84e0bada3..c26179e95e063a603062dd8f98ec9a527c3bdcd4 100644 (file)
--- a/include/wx/xrc/xh_sizer.h
+++ b/include/wx/xrc/xh_sizer.h
@@ -12,15 +12,18 @@
 #define _WX_XH_SIZER_H_
 
 #include "wx/xrc/xmlres.h"
+
+#if wxUSE_XRC
+
 #include "wx/sizer.h"
 #include "wx/gbsizer.h"
 
-
-class WXDLLEXPORT wxSizer;
+class WXDLLIMPEXP_FWD_CORE wxSizer;
 
 class WXDLLIMPEXP_XRC wxSizerXmlHandler : public wxXmlResourceHandler
 {
-DECLARE_DYNAMIC_CLASS(wxSizerXmlHandler)
+    DECLARE_DYNAMIC_CLASS(wxSizerXmlHandler)
+
 public:
     wxSizerXmlHandler();
     virtual wxObject *DoCreateResource();
@@ -38,7 +41,9 @@ private:
     wxObject* Handle_spacer();
     wxObject* Handle_sizer();
     wxSizer*  Handle_wxBoxSizer();
+#if wxUSE_STATBOX
     wxSizer*  Handle_wxStaticBoxSizer();
+#endif
     wxSizer*  Handle_wxGridSizer();
     wxSizer*  Handle_wxFlexGridSizer();
     wxSizer*  Handle_wxGridBagSizer();
@@ -51,10 +56,13 @@ private:
     void AddSizerItem(wxSizerItem* sitem);
 };
 
+#if wxUSE_BUTTON
 
 class WXDLLIMPEXP_XRC wxStdDialogButtonSizerXmlHandler
     : public wxXmlResourceHandler
 {
+    DECLARE_DYNAMIC_CLASS(wxStdDialogButtonSizerXmlHandler)
+
 public:
     wxStdDialogButtonSizerXmlHandler();
     virtual wxObject *DoCreateResource();
@@ -63,9 +71,10 @@ public:
 private:
     bool m_isInside;
     wxStdDialogButtonSizer *m_parentSizer;
-
-    DECLARE_DYNAMIC_CLASS(wxStdDialogButtonSizerXmlHandler)
 };
 
+#endif // wxUSE_BUTTON
+
+#endif // wxUSE_XRC
 
 #endif // _WX_XH_SIZER_H_