Added internal wxHatchStyle enum.

[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 a6cbe7a31c0d085860547146d617ecd71aab0fa8..5c941dea977eb2feda2a7706a69bedae5d3b268c 100644 (file)
--- a/include/wx/xrc/xh_sizer.h
+++ b/include/wx/xrc/xh_sizer.h
@@ -27,13 +27,16 @@ public:
     virtual wxObject *DoCreateResource();
     virtual bool CanHandle(wxXmlNode *node);
 
     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;
 
 private:
     bool m_isInside;
     bool m_isGBS;
 
     wxSizer *m_parentSizer;
 

-    bool IsSizerNode(wxXmlNode *node);

 
     wxObject* Handle_sizeritem();
     wxObject* Handle_spacer();
 
     wxObject* Handle_sizeritem();
     wxObject* Handle_spacer();


@@ -44,9 +47,10 @@ private:
 #endif
     wxSizer*  Handle_wxGridSizer();
     wxFlexGridSizer* Handle_wxFlexGridSizer();
 #endif
     wxSizer*  Handle_wxGridSizer();
     wxFlexGridSizer* Handle_wxFlexGridSizer();

-    wxSizer*  Handle_wxGridBagSizer();
+    wxGridBagSizer* Handle_wxGridBagSizer();

     wxSizer*  Handle_wxWrapSizer();
 
     wxSizer*  Handle_wxWrapSizer();
 

+    bool ValidateGridSizerChildren();

     void SetGrowables(wxFlexGridSizer* fsizer, const wxChar* param, bool rows);
     wxGBPosition GetGBPos(const wxString& param);
     wxGBSpan GetGBSpan(const wxString& param);
     void SetGrowables(wxFlexGridSizer* fsizer, const wxChar* param, bool rows);
     wxGBPosition GetGBPos(const wxString& param);
     wxGBSpan GetGBSpan(const wxString& param);