trying to get wxUSE_NATIVE_STATUSBAR setting correctly: define it to 1 by default...

[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 0c7d16a4ef2f4a0ee9eebbdf039527341c2ce15e..c3329e572f910aab4b473db25b78bef9f0a4c447 100644 (file)
--- a/include/wx/xrc/xh_sizer.h
+++ b/include/wx/xrc/xh_sizer.h
@@ -11,17 +11,20 @@
 #ifndef _WX_XH_SIZER_H_
 #define _WX_XH_SIZER_H_
 
-#if defined(__GNUG__) && !defined(__APPLE__)
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
 #pragma interface "xh_sizer.h"
 #endif
 
 #include "wx/xrc/xmlres.h"
+#include "wx/sizer.h"
+#include "wx/gbsizer.h"
 
 
 class WXDLLEXPORT wxSizer;
 
-class WXXMLDLLEXPORT wxSizerXmlHandler : public wxXmlResourceHandler
+class WXDLLIMPEXP_XRC wxSizerXmlHandler : public wxXmlResourceHandler
 {
+DECLARE_DYNAMIC_CLASS(wxSizerXmlHandler)
 public:
     wxSizerXmlHandler();
     virtual wxObject *DoCreateResource();
@@ -29,9 +32,27 @@ public:
 
 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();
+    wxSizer*  Handle_wxStaticBoxSizer();
+    wxSizer*  Handle_wxGridSizer();
+    wxSizer*  Handle_wxFlexGridSizer();
+    wxSizer*  Handle_wxGridBagSizer();
+
+    void SetGrowables(wxFlexGridSizer* fsizer, const wxChar* param, bool rows);
+    wxGBPosition GetGBPos(const wxString& param);
+    wxGBSpan GetGBSpan(const wxString& param);
+    wxSizerItem* MakeSizerItem();
+    void SetSizerItemAttributes(wxSizerItem* sitem);
+    void AddSizerItem(wxSizerItem* sitem);
 };