X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/627ddac99ee82dcd930029815ad696c64375182d..c17eafaaf1510f008f8114afa85a11f0f08d5570:/include/wx/xrc/xh_sizer.h

diff --git a/include/wx/xrc/xh_sizer.h b/include/wx/xrc/xh_sizer.h
index f97aba525d..5c941dea97 100644
--- a/include/wx/xrc/xh_sizer.h
+++ b/include/wx/xrc/xh_sizer.h
@@ -18,8 +18,6 @@
 #include "wx/sizer.h"
 #include "wx/gbsizer.h"
 
-class WXDLLEXPORT wxSizer;
-
 class WXDLLIMPEXP_XRC wxSizerXmlHandler : public wxXmlResourceHandler
 {
     DECLARE_DYNAMIC_CLASS(wxSizerXmlHandler)
@@ -29,13 +27,16 @@ public:
     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();
@@ -45,9 +46,11 @@ private:
     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);