Fixed stream test.

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

diff --git a/contrib/include/wx/xrc/xh_sizer.h b/contrib/include/wx/xrc/xh_sizer.h
index fb5cd23670007db2b64ac638796d4a68aebd43c6..2e0ad9606abe8c55e1e4167713dd902d96a06772 100644 (file)
--- a/contrib/include/wx/xrc/xh_sizer.h
+++ b/contrib/include/wx/xrc/xh_sizer.h
@@ -11,17 +11,20 @@
 #ifndef _WX_XH_SIZER_H_
 #define _WX_XH_SIZER_H_
 
 #ifndef _WX_XH_SIZER_H_
 #define _WX_XH_SIZER_H_
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)

 #pragma interface "xh_sizer.h"
 #endif
 
 #include "wx/xrc/xmlres.h"
 #pragma interface "xh_sizer.h"
 #endif
 
 #include "wx/xrc/xmlres.h"

+#include "wx/sizer.h"
+#include "wx/gbsizer.h"

 
 
 class WXDLLEXPORT wxSizer;
 
 
 
 class WXDLLEXPORT wxSizer;
 

-class WXXMLDLLEXPORT wxSizerXmlHandler : public wxXmlResourceHandler
+class WXDLLIMPEXP_XRC wxSizerXmlHandler : public wxXmlResourceHandler

 {
 {

+DECLARE_DYNAMIC_CLASS(wxSizerXmlHandler)

 public:
     wxSizerXmlHandler();
     virtual wxObject *DoCreateResource();
 public:
     wxSizerXmlHandler();
     virtual wxObject *DoCreateResource();


@@ -29,9 +32,27 @@ public:
 
 private:
     bool m_isInside;
 
 private:
     bool m_isInside;

+    bool m_isGBS;
+

     wxSizer *m_parentSizer;
 
     bool IsSizerNode(wxXmlNode *node);
     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);

 };
 
 
 };