Fixed parts of toolbar background not being drawn with older comctl32.dll.

[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 620a0a2c6b785408c40d5c632e991a192ca4f18b..5c941dea977eb2feda2a7706a69bedae5d3b268c 100644 (file)
--- a/include/wx/xrc/xh_sizer.h
+++ b/include/wx/xrc/xh_sizer.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        xh_sizer.h
+// Name:        wx/xrc/xh_sizer.h
 // Purpose:     XML resource handler for wxBoxSizer
 // Author:      Vaclav Slavik
 // Created:     2000/04/24
@@ -12,37 +12,45 @@
 #define _WX_XH_SIZER_H_
 
 #include "wx/xrc/xmlres.h"
-#include "wx/sizer.h"
-#include "wx/gbsizer.h"
 
+#if wxUSE_XRC
 
-class WXDLLEXPORT wxSizer;
+#include "wx/sizer.h"
+#include "wx/gbsizer.h"
 
 class WXDLLIMPEXP_XRC wxSizerXmlHandler : public wxXmlResourceHandler
 {
-DECLARE_DYNAMIC_CLASS(wxSizerXmlHandler)
+    DECLARE_DYNAMIC_CLASS(wxSizerXmlHandler)
+
 public:
     wxSizerXmlHandler();
     virtual wxObject *DoCreateResource();
     virtual bool CanHandle(wxXmlNode *node);
 
+protected:
+    virtual wxSizer* DoCreateSizer(const wxString& name);
+    virtual bool IsSizerNode(wxXmlNode *node) const;
+
 private:
     bool m_isInside;
     bool m_isGBS;
 
     wxSizer *m_parentSizer;
 
-    bool IsSizerNode(wxXmlNode *node);
 
     wxObject* Handle_sizeritem();
     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();
+    wxFlexGridSizer* Handle_wxFlexGridSizer();
+    wxGridBagSizer* Handle_wxGridBagSizer();
+    wxSizer*  Handle_wxWrapSizer();
 
+    bool ValidateGridSizerChildren();
     void SetGrowables(wxFlexGridSizer* fsizer, const wxChar* param, bool rows);
     wxGBPosition GetGBPos(const wxString& param);
     wxGBSpan GetGBSpan(const wxString& param);
@@ -51,10 +59,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 +74,10 @@ public:
 private:
     bool m_isInside;
     wxStdDialogButtonSizer *m_parentSizer;
-
-    DECLARE_DYNAMIC_CLASS(wxStdDialogButtonSizerXmlHandler)
 };
 
+#endif // wxUSE_BUTTON
+
+#endif // wxUSE_XRC
 
 #endif // _WX_XH_SIZER_H_