Refactored wxSizerXmlHandler and added support for wxGridBagSizer

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24453 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

contrib/include/wx/xrc/xh_sizer.h

@@ -16,6 +16,8 @@
 #endif
 
 #include "wx/xrc/xmlres.h"
+#include "wx/sizer.h"
+#include "wx/gbsizer.h"
 
 
 class WXDLLEXPORT wxSizer;
@@ -30,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);    
 };
 
 

contrib/src/xrc/xh_sizer.cpp

@@ -21,26 +21,24 @@
 
 #include "wx/xrc/xh_sizer.h"
 #include "wx/sizer.h"
+#include "wx/gbsizer.h"
 #include "wx/log.h"
 #include "wx/statbox.h"
 #include "wx/notebook.h"
 #include "wx/panel.h"
 #include "wx/tokenzr.h"
 
-IMPLEMENT_DYNAMIC_CLASS(wxSizerXmlHandler, wxXmlResourceHandler)
 
-bool wxSizerXmlHandler::IsSizerNode(wxXmlNode *node)
+
-{
+IMPLEMENT_DYNAMIC_CLASS(wxSizerXmlHandler, wxXmlResourceHandler)
-    return (IsOfClass(node, wxT("wxBoxSizer"))) ||
-           (IsOfClass(node, wxT("wxStaticBoxSizer"))) ||
-           (IsOfClass(node, wxT("wxGridSizer"))) ||
-           (IsOfClass(node, wxT("wxFlexGridSizer")));
-}
 
     
     
 wxSizerXmlHandler::wxSizerXmlHandler() 
-: wxXmlResourceHandler(), m_isInside(FALSE), m_parentSizer(NULL)
+    : wxXmlResourceHandler(),
+      m_isInside(FALSE),
+      m_isGBS(FALSE),
+      m_parentSizer(NULL)
 {
     XRC_ADD_STYLE(wxHORIZONTAL);
     XRC_ADD_STYLE(wxVERTICAL);
@@ -77,159 +75,298 @@ wxSizerXmlHandler::wxSizerXmlHandler()
 
 
 
-wxObject *wxSizerXmlHandler::DoCreateResource()
-{ 
-    if (m_class == wxT("sizeritem"))
-    {
-        wxXmlNode *n = GetParamNode(wxT("object"));
-
-       if ( !n )
-           n = GetParamNode(wxT("object_ref"));
-
-        if (n)
-        {
-            bool old_ins = m_isInside;
-            wxSizer *old_par = m_parentSizer;
-            m_isInside = FALSE;
-            if (!IsSizerNode(n)) m_parentSizer = NULL;
-            wxObject *item = CreateResFromNode(n, m_parent, NULL);
-            m_isInside = old_ins;
-            m_parentSizer = old_par;
-            wxSizer *sizer = wxDynamicCast(item, wxSizer);
-            wxWindow *wnd = wxDynamicCast(item, wxWindow);
-            wxSize minsize = GetSize(wxT("minsize"));
-
-            if (sizer)
-            {
-                m_parentSizer->Add(sizer, GetLong(wxT("option")), 
-                                   GetStyle(wxT("flag")), GetDimension(wxT("border")));
-                if (!(minsize == wxDefaultSize))
-                    m_parentSizer->SetItemMinSize(sizer, minsize.x, minsize.y);
-            }
-            else if (wnd)
-            {
-                m_parentSizer->Add(wnd, GetLong(wxT("option")), 
-                                   GetStyle(wxT("flag")), GetDimension(wxT("border")));
-                if (!(minsize == wxDefaultSize))
-                    m_parentSizer->SetItemMinSize(wnd, minsize.x, minsize.y);
-            }
-            else 
-                wxLogError(wxT("Error in resource."));
-
-            return item;
-        }
-        else /*n == NULL*/
-        {
-            wxLogError(wxT("Error in resource: no control/sizer within sizer's <item> tag."));
-            return NULL;
-        }
-    }
-    
-    else if (m_class == wxT("spacer"))
-    {
-        wxCHECK_MSG(m_parentSizer, NULL, wxT("Incorrect syntax of XRC resource: spacer not within sizer!"));
-        wxSize sz = GetSize();
-        m_parentSizer->Add(sz.x, sz.y,
-            GetLong(wxT("option")), GetStyle(wxT("flag")), GetDimension(wxT("border")));
-        return NULL;
-    }
-    
-
-    else {
-        wxSizer *sizer = NULL;
-        
-        wxXmlNode *parentNode = m_node->GetParent();
-
-        wxCHECK_MSG(m_parentSizer != NULL ||
-                (parentNode->GetType() == wxXML_ELEMENT_NODE &&
-                    m_parentAsWindow != NULL &&
-                    (m_parentAsWindow->IsKindOf(CLASSINFO(wxPanel)) ||
-                     m_parentAsWindow->IsKindOf(CLASSINFO(wxFrame)) ||
-                     m_parentAsWindow->IsKindOf(CLASSINFO(wxDialog)))
-                ), NULL,
-                wxT("Incorrect use of sizer: parent is not 'wxDialog', 'wxFrame' or 'wxPanel'."));
-
-        if (m_class == wxT("wxBoxSizer"))
-            sizer = new wxBoxSizer(GetStyle(wxT("orient"), wxHORIZONTAL));
-
-        else if (m_class == wxT("wxStaticBoxSizer"))
-        {
-            sizer = new wxStaticBoxSizer(
-                         new wxStaticBox(m_parentAsWindow,
-                                         GetID(),
-                                         GetText(wxT("label")),
-                                         wxDefaultPosition, wxDefaultSize,
-                                         0/*style*/,
-                                         GetName()),
-                         GetStyle(wxT("orient"), wxHORIZONTAL));
-        }
-        
-        else if (m_class == wxT("wxGridSizer"))
-            sizer = new wxGridSizer(GetLong(wxT("rows")), GetLong(wxT("cols")),
-                                    GetDimension(wxT("vgap")), GetDimension(wxT("hgap")));
-                                    
-        else if (m_class == wxT("wxFlexGridSizer"))
-        {
-            wxFlexGridSizer *fsizer = 
-                  new wxFlexGridSizer(GetLong(wxT("rows")), GetLong(wxT("cols")),
-                      GetDimension(wxT("vgap")), GetDimension(wxT("hgap")));
-            sizer = fsizer;
-            wxStringTokenizer tkn;
-            unsigned long l;
-            tkn.SetString(GetParamValue(wxT("growablerows")), wxT(","));
-            while (tkn.HasMoreTokens())
-            {
-                if (!tkn.GetNextToken().ToULong(&l))
-                    wxLogError(wxT("growablerows must be comma-separated list of row numbers"));
-                else
-                    fsizer->AddGrowableRow(l);
-            }
-            tkn.SetString(GetParamValue(wxT("growablecols")), wxT(","));
-            while (tkn.HasMoreTokens())
-            {
-                if (!tkn.GetNextToken().ToULong(&l))
-                    wxLogError(wxT("growablecols must be comma-separated list of column numbers"));
-                else
-                    fsizer->AddGrowableCol(l);
-            }
-        }
-
-        wxSize minsize = GetSize(wxT("minsize"));
-        if (!(minsize == wxDefaultSize))
-            sizer->SetMinSize(minsize);
-
-        wxSizer *old_par = m_parentSizer;
-        m_parentSizer = sizer;
-        bool old_ins = m_isInside;
-        m_isInside = TRUE;
-        CreateChildren(m_parent, TRUE/*only this handler*/);
-        m_isInside = old_ins;
-        m_parentSizer = old_par;
-        
-        if (m_parentSizer == NULL) // setup window:
-        {
-            m_parentAsWindow->SetAutoLayout(TRUE);
-            m_parentAsWindow->SetSizer(sizer);
-
-            wxXmlNode *nd = m_node;
-            m_node = parentNode;
-            if (GetSize() == wxDefaultSize)
-                sizer->Fit(m_parentAsWindow);
-            m_node = nd;
-
-            if (m_parentAsWindow->GetWindowStyle() & (wxRESIZE_BOX | wxRESIZE_BORDER))
-                sizer->SetSizeHints(m_parentAsWindow);
-        }
-        
-        return sizer;
-    }
-}
-
-
-
 bool wxSizerXmlHandler::CanHandle(wxXmlNode *node)
 {
-    return ((!m_isInside && IsSizerNode(node)) ||
+    return ( (!m_isInside && IsSizerNode(node)) ||
-            (m_isInside && IsOfClass(node, wxT("sizeritem"))) ||
+             (m_isInside && IsOfClass(node, wxT("sizeritem"))) ||
-            (m_isInside && IsOfClass(node, wxT("spacer"))));
+             (m_isInside && IsOfClass(node, wxT("spacer"))) 
+        );
 }
+
+    
+wxObject* wxSizerXmlHandler::DoCreateResource()
+{ 
+    if (m_class == wxT("sizeritem"))
+        return Handle_sizeritem();
+    
+    else if (m_class == wxT("spacer"))
+        return Handle_spacer();
+
+    else
+        return Handle_sizer();
+}
+
+
+
+
+bool wxSizerXmlHandler::IsSizerNode(wxXmlNode *node)
+{
+    return (IsOfClass(node, wxT("wxBoxSizer"))) ||
+           (IsOfClass(node, wxT("wxStaticBoxSizer"))) ||
+           (IsOfClass(node, wxT("wxGridSizer"))) ||
+           (IsOfClass(node, wxT("wxFlexGridSizer"))) ||
+           (IsOfClass(node, wxT("wxGridBagSizer")));
+}
+
+
+wxObject* wxSizerXmlHandler::Handle_sizeritem()
+{
+    // find the item to be managed by this sizeritem
+    wxXmlNode *n = GetParamNode(wxT("object"));
+    if ( !n )
+        n = GetParamNode(wxT("object_ref"));
+
+    // did we find one?
+    if (n)
+    {
+        // create a sizer item for it
+        wxSizerItem* sitem = MakeSizerItem();
+        SetSizerItemAttributes(sitem);
+        
+        // now fetch the item to be managed
+        bool old_gbs = m_isGBS;
+        bool old_ins = m_isInside;
+        wxSizer *old_par = m_parentSizer;
+        m_isInside = FALSE;
+        if (!IsSizerNode(n)) m_parentSizer = NULL;        
+        wxObject *item = CreateResFromNode(n, m_parent, NULL);
+        m_isInside = old_ins;
+        m_parentSizer = old_par;
+        m_isGBS = old_gbs;
+
+        // and figure out what type it is
+        wxSizer *sizer = wxDynamicCast(item, wxSizer);
+        wxWindow *wnd = wxDynamicCast(item, wxWindow);
+        
+        if (sizer)
+            sitem->SetSizer(sizer);
+        else if (wnd)
+            sitem->SetWindow(wnd);
+        else 
+            wxLogError(wxT("Error in resource."));
+
+        AddSizerItem(sitem);
+        return item;
+    }
+    else /*n == NULL*/
+    {
+        wxLogError(wxT("Error in resource: no window/sizer/spacer within sizeritem object."));
+        return NULL;
+    }
+}
+
+
+wxObject* wxSizerXmlHandler::Handle_spacer()
+{
+    wxCHECK_MSG(m_parentSizer, NULL, wxT("Incorrect syntax of XRC resource: spacer not within sizer!"));
+
+    wxSizerItem* sitem = MakeSizerItem();
+    SetSizerItemAttributes(sitem);
+    sitem->SetSpacer(GetSize());
+    AddSizerItem(sitem);    
+    return NULL;
+}
+
+
+wxObject* wxSizerXmlHandler::Handle_sizer()
+{
+    wxSizer *sizer = NULL;
+        
+    wxXmlNode *parentNode = m_node->GetParent();
+
+    wxCHECK_MSG(m_parentSizer != NULL ||
+                (parentNode->GetType() == wxXML_ELEMENT_NODE &&
+                 m_parentAsWindow != NULL &&
+                 (m_parentAsWindow->IsKindOf(CLASSINFO(wxPanel)) ||
+                  m_parentAsWindow->IsKindOf(CLASSINFO(wxFrame)) ||
+                  m_parentAsWindow->IsKindOf(CLASSINFO(wxDialog)))
+                    ), NULL,
+                wxT("Incorrect use of sizer: parent is not 'wxDialog', 'wxFrame' or 'wxPanel'."));
+
+    if (m_class == wxT("wxBoxSizer"))
+        sizer = Handle_wxBoxSizer();
+
+    else if (m_class == wxT("wxStaticBoxSizer"))
+        sizer = Handle_wxStaticBoxSizer();
+        
+    else if (m_class == wxT("wxGridSizer"))
+        sizer = Handle_wxGridSizer();
+                                    
+    else if (m_class == wxT("wxFlexGridSizer"))
+        sizer = Handle_wxFlexGridSizer();
+
+    else if (m_class == wxT("wxGridBagSizer"))
+        sizer = Handle_wxGridBagSizer();
+
+    
+    wxSize minsize = GetSize(wxT("minsize"));
+    if (!(minsize == wxDefaultSize))
+        sizer->SetMinSize(minsize);
+
+    // save state
+    wxSizer *old_par = m_parentSizer;
+    bool old_ins = m_isInside;
+    bool old_gbs = m_isGBS;
+
+    // set new state
+    m_parentSizer = sizer;
+    m_isInside = TRUE;
+    m_isGBS = (m_class == wxT("wxGridBagSizer"));
+    
+    CreateChildren(m_parent, TRUE/*only this handler*/);
+
+    // restore state
+    old_gbs = m_isGBS;    
+    m_isInside = old_ins;
+    m_parentSizer = old_par;
+
+    if (m_parentSizer == NULL) // setup window:
+    {
+        m_parentAsWindow->SetAutoLayout(TRUE);
+        m_parentAsWindow->SetSizer(sizer);
+
+        wxXmlNode *nd = m_node;
+        m_node = parentNode;
+        if (GetSize() == wxDefaultSize)
+            sizer->Fit(m_parentAsWindow);
+        m_node = nd;
+
+        if (m_parentAsWindow->GetWindowStyle() & (wxRESIZE_BOX | wxRESIZE_BORDER))
+            sizer->SetSizeHints(m_parentAsWindow);
+    }
+        
+    return sizer;
+}
+
+
+wxSizer*  wxSizerXmlHandler::Handle_wxBoxSizer()
+{
+    return new wxBoxSizer(GetStyle(wxT("orient"), wxHORIZONTAL));
+}        
+    
+wxSizer*  wxSizerXmlHandler::Handle_wxStaticBoxSizer()
+{
+    return new wxStaticBoxSizer(
+            new wxStaticBox(m_parentAsWindow,
+                            GetID(),
+                            GetText(wxT("label")),
+                            wxDefaultPosition, wxDefaultSize,
+                            0/*style*/,
+                            GetName()),
+            GetStyle(wxT("orient"), wxHORIZONTAL));
+}
+    
+wxSizer*  wxSizerXmlHandler::Handle_wxGridSizer()
+{
+    return new wxGridSizer(GetLong(wxT("rows")), GetLong(wxT("cols")),
+                           GetDimension(wxT("vgap")), GetDimension(wxT("hgap")));
+}
+
+
+wxSizer*  wxSizerXmlHandler::Handle_wxFlexGridSizer()
+{
+    wxFlexGridSizer *sizer = 
+        new wxFlexGridSizer(GetLong(wxT("rows")), GetLong(wxT("cols")),
+                            GetDimension(wxT("vgap")), GetDimension(wxT("hgap")));
+    SetGrowables(sizer, wxT("growablerows"), true);
+    SetGrowables(sizer, wxT("growablecols"), false);
+    return sizer;
+}
+
+
+wxSizer*  wxSizerXmlHandler::Handle_wxGridBagSizer()
+{
+    wxGridBagSizer *sizer = 
+        new wxGridBagSizer(GetDimension(wxT("vgap")), GetDimension(wxT("hgap")));
+    SetGrowables(sizer, wxT("growablerows"), true);
+    SetGrowables(sizer, wxT("growablecols"), false);
+    return sizer;
+}
+
+
+
+
+void wxSizerXmlHandler::SetGrowables(wxFlexGridSizer* sizer,
+                                     const wxChar* param,
+                                     bool rows)
+{
+    wxStringTokenizer tkn;
+    unsigned long l;
+    tkn.SetString(GetParamValue(param), wxT(","));
+    while (tkn.HasMoreTokens())
+    {
+        if (!tkn.GetNextToken().ToULong(&l))
+            wxLogError(wxT("growable[rows|cols] must be comma-separated list of row numbers"));
+        else {
+            if (rows)
+                sizer->AddGrowableRow(l);
+            else
+                sizer->AddGrowableCol(l);
+        }
+    }
+}
+
+
+wxGBPosition wxSizerXmlHandler::GetGBPos(const wxString& param)
+{
+    wxSize sz = GetSize(param);
+    if (sz.x < 0) sz.x = 0;
+    if (sz.y < 0) sz.y = 0;
+    return wxGBPosition(sz.x, sz.y);
+}
+
+wxGBSpan wxSizerXmlHandler::GetGBSpan(const wxString& param)
+{
+    wxSize sz = GetSize(param);
+    if (sz.x < 1) sz.x = 1;
+    if (sz.y < 1) sz.y = 1;
+    return wxGBSpan(sz.x, sz.y);
+}
+
+
+
+wxSizerItem* wxSizerXmlHandler::MakeSizerItem()
+{
+    if (m_isGBS)
+        return new wxGBSizerItem();
+    else
+        return new wxSizerItem();
+}
+
+void wxSizerXmlHandler::SetSizerItemAttributes(wxSizerItem* sitem)
+{
+    sitem->SetProportion(GetLong(wxT("option")));  // Should this check for "proportion" too?
+    sitem->SetFlag(GetStyle(wxT("flag")));
+    sitem->SetBorder(GetDimension(wxT("border")));
+    wxSize sz = GetSize(wxT("minsize"));
+    if (!(sz == wxDefaultSize))
+        sitem->SetInitSize(sz.x, sz.y);
+    sz = GetSize(wxT("ratio"));
+    if (!(sz == wxDefaultSize))
+        sitem->SetRatio(sz);
+    
+    if (m_isGBS)
+    {
+        wxGBSizerItem* gbsitem = (wxGBSizerItem*)sitem;
+        gbsitem->SetPos(GetGBPos(wxT("pos")));
+        gbsitem->SetSpan(GetGBSpan(wxT("span")));
+    }    
+}
+
+void wxSizerXmlHandler::AddSizerItem(wxSizerItem* sitem)
+{
+    if (m_isGBS)
+        ((wxGridBagSizer*)m_parentSizer)->Add((wxGBSizerItem*)sitem);
+    else
+        m_parentSizer->Add(sitem);
+}
+   
+
+
+
+
+
+
+
+
+

include/wx/xrc/xh_sizer.h

@@ -16,6 +16,8 @@
 #endif
 
 #include "wx/xrc/xmlres.h"
+#include "wx/sizer.h"
+#include "wx/gbsizer.h"
 
 
 class WXDLLEXPORT wxSizer;
@@ -30,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);    
 };
 
 

src/xrc/xh_sizer.cpp

@@ -21,26 +21,24 @@
 
 #include "wx/xrc/xh_sizer.h"
 #include "wx/sizer.h"
+#include "wx/gbsizer.h"
 #include "wx/log.h"
 #include "wx/statbox.h"
 #include "wx/notebook.h"
 #include "wx/panel.h"
 #include "wx/tokenzr.h"
 
-IMPLEMENT_DYNAMIC_CLASS(wxSizerXmlHandler, wxXmlResourceHandler)
 
-bool wxSizerXmlHandler::IsSizerNode(wxXmlNode *node)
+
-{
+IMPLEMENT_DYNAMIC_CLASS(wxSizerXmlHandler, wxXmlResourceHandler)
-    return (IsOfClass(node, wxT("wxBoxSizer"))) ||
-           (IsOfClass(node, wxT("wxStaticBoxSizer"))) ||
-           (IsOfClass(node, wxT("wxGridSizer"))) ||
-           (IsOfClass(node, wxT("wxFlexGridSizer")));
-}
 
     
     
 wxSizerXmlHandler::wxSizerXmlHandler() 
-: wxXmlResourceHandler(), m_isInside(FALSE), m_parentSizer(NULL)
+    : wxXmlResourceHandler(),
+      m_isInside(FALSE),
+      m_isGBS(FALSE),
+      m_parentSizer(NULL)
 {
     XRC_ADD_STYLE(wxHORIZONTAL);
     XRC_ADD_STYLE(wxVERTICAL);
@@ -77,159 +75,298 @@ wxSizerXmlHandler::wxSizerXmlHandler()
 
 
 
-wxObject *wxSizerXmlHandler::DoCreateResource()
-{ 
-    if (m_class == wxT("sizeritem"))
-    {
-        wxXmlNode *n = GetParamNode(wxT("object"));
-
-       if ( !n )
-           n = GetParamNode(wxT("object_ref"));
-
-        if (n)
-        {
-            bool old_ins = m_isInside;
-            wxSizer *old_par = m_parentSizer;
-            m_isInside = FALSE;
-            if (!IsSizerNode(n)) m_parentSizer = NULL;
-            wxObject *item = CreateResFromNode(n, m_parent, NULL);
-            m_isInside = old_ins;
-            m_parentSizer = old_par;
-            wxSizer *sizer = wxDynamicCast(item, wxSizer);
-            wxWindow *wnd = wxDynamicCast(item, wxWindow);
-            wxSize minsize = GetSize(wxT("minsize"));
-
-            if (sizer)
-            {
-                m_parentSizer->Add(sizer, GetLong(wxT("option")), 
-                                   GetStyle(wxT("flag")), GetDimension(wxT("border")));
-                if (!(minsize == wxDefaultSize))
-                    m_parentSizer->SetItemMinSize(sizer, minsize.x, minsize.y);
-            }
-            else if (wnd)
-            {
-                m_parentSizer->Add(wnd, GetLong(wxT("option")), 
-                                   GetStyle(wxT("flag")), GetDimension(wxT("border")));
-                if (!(minsize == wxDefaultSize))
-                    m_parentSizer->SetItemMinSize(wnd, minsize.x, minsize.y);
-            }
-            else 
-                wxLogError(wxT("Error in resource."));
-
-            return item;
-        }
-        else /*n == NULL*/
-        {
-            wxLogError(wxT("Error in resource: no control/sizer within sizer's <item> tag."));
-            return NULL;
-        }
-    }
-    
-    else if (m_class == wxT("spacer"))
-    {
-        wxCHECK_MSG(m_parentSizer, NULL, wxT("Incorrect syntax of XRC resource: spacer not within sizer!"));
-        wxSize sz = GetSize();
-        m_parentSizer->Add(sz.x, sz.y,
-            GetLong(wxT("option")), GetStyle(wxT("flag")), GetDimension(wxT("border")));
-        return NULL;
-    }
-    
-
-    else {
-        wxSizer *sizer = NULL;
-        
-        wxXmlNode *parentNode = m_node->GetParent();
-
-        wxCHECK_MSG(m_parentSizer != NULL ||
-                (parentNode->GetType() == wxXML_ELEMENT_NODE &&
-                    m_parentAsWindow != NULL &&
-                    (m_parentAsWindow->IsKindOf(CLASSINFO(wxPanel)) ||
-                     m_parentAsWindow->IsKindOf(CLASSINFO(wxFrame)) ||
-                     m_parentAsWindow->IsKindOf(CLASSINFO(wxDialog)))
-                ), NULL,
-                wxT("Incorrect use of sizer: parent is not 'wxDialog', 'wxFrame' or 'wxPanel'."));
-
-        if (m_class == wxT("wxBoxSizer"))
-            sizer = new wxBoxSizer(GetStyle(wxT("orient"), wxHORIZONTAL));
-
-        else if (m_class == wxT("wxStaticBoxSizer"))
-        {
-            sizer = new wxStaticBoxSizer(
-                         new wxStaticBox(m_parentAsWindow,
-                                         GetID(),
-                                         GetText(wxT("label")),
-                                         wxDefaultPosition, wxDefaultSize,
-                                         0/*style*/,
-                                         GetName()),
-                         GetStyle(wxT("orient"), wxHORIZONTAL));
-        }
-        
-        else if (m_class == wxT("wxGridSizer"))
-            sizer = new wxGridSizer(GetLong(wxT("rows")), GetLong(wxT("cols")),
-                                    GetDimension(wxT("vgap")), GetDimension(wxT("hgap")));
-                                    
-        else if (m_class == wxT("wxFlexGridSizer"))
-        {
-            wxFlexGridSizer *fsizer = 
-                  new wxFlexGridSizer(GetLong(wxT("rows")), GetLong(wxT("cols")),
-                      GetDimension(wxT("vgap")), GetDimension(wxT("hgap")));
-            sizer = fsizer;
-            wxStringTokenizer tkn;
-            unsigned long l;
-            tkn.SetString(GetParamValue(wxT("growablerows")), wxT(","));
-            while (tkn.HasMoreTokens())
-            {
-                if (!tkn.GetNextToken().ToULong(&l))
-                    wxLogError(wxT("growablerows must be comma-separated list of row numbers"));
-                else
-                    fsizer->AddGrowableRow(l);
-            }
-            tkn.SetString(GetParamValue(wxT("growablecols")), wxT(","));
-            while (tkn.HasMoreTokens())
-            {
-                if (!tkn.GetNextToken().ToULong(&l))
-                    wxLogError(wxT("growablecols must be comma-separated list of column numbers"));
-                else
-                    fsizer->AddGrowableCol(l);
-            }
-        }
-
-        wxSize minsize = GetSize(wxT("minsize"));
-        if (!(minsize == wxDefaultSize))
-            sizer->SetMinSize(minsize);
-
-        wxSizer *old_par = m_parentSizer;
-        m_parentSizer = sizer;
-        bool old_ins = m_isInside;
-        m_isInside = TRUE;
-        CreateChildren(m_parent, TRUE/*only this handler*/);
-        m_isInside = old_ins;
-        m_parentSizer = old_par;
-        
-        if (m_parentSizer == NULL) // setup window:
-        {
-            m_parentAsWindow->SetAutoLayout(TRUE);
-            m_parentAsWindow->SetSizer(sizer);
-
-            wxXmlNode *nd = m_node;
-            m_node = parentNode;
-            if (GetSize() == wxDefaultSize)
-                sizer->Fit(m_parentAsWindow);
-            m_node = nd;
-
-            if (m_parentAsWindow->GetWindowStyle() & (wxRESIZE_BOX | wxRESIZE_BORDER))
-                sizer->SetSizeHints(m_parentAsWindow);
-        }
-        
-        return sizer;
-    }
-}
-
-
-
 bool wxSizerXmlHandler::CanHandle(wxXmlNode *node)
 {
-    return ((!m_isInside && IsSizerNode(node)) ||
+    return ( (!m_isInside && IsSizerNode(node)) ||
-            (m_isInside && IsOfClass(node, wxT("sizeritem"))) ||
+             (m_isInside && IsOfClass(node, wxT("sizeritem"))) ||
-            (m_isInside && IsOfClass(node, wxT("spacer"))));
+             (m_isInside && IsOfClass(node, wxT("spacer"))) 
+        );
 }
+
+    
+wxObject* wxSizerXmlHandler::DoCreateResource()
+{ 
+    if (m_class == wxT("sizeritem"))
+        return Handle_sizeritem();
+    
+    else if (m_class == wxT("spacer"))
+        return Handle_spacer();
+
+    else
+        return Handle_sizer();
+}
+
+
+
+
+bool wxSizerXmlHandler::IsSizerNode(wxXmlNode *node)
+{
+    return (IsOfClass(node, wxT("wxBoxSizer"))) ||
+           (IsOfClass(node, wxT("wxStaticBoxSizer"))) ||
+           (IsOfClass(node, wxT("wxGridSizer"))) ||
+           (IsOfClass(node, wxT("wxFlexGridSizer"))) ||
+           (IsOfClass(node, wxT("wxGridBagSizer")));
+}
+
+
+wxObject* wxSizerXmlHandler::Handle_sizeritem()
+{
+    // find the item to be managed by this sizeritem
+    wxXmlNode *n = GetParamNode(wxT("object"));
+    if ( !n )
+        n = GetParamNode(wxT("object_ref"));
+
+    // did we find one?
+    if (n)
+    {
+        // create a sizer item for it
+        wxSizerItem* sitem = MakeSizerItem();
+        SetSizerItemAttributes(sitem);
+        
+        // now fetch the item to be managed
+        bool old_gbs = m_isGBS;
+        bool old_ins = m_isInside;
+        wxSizer *old_par = m_parentSizer;
+        m_isInside = FALSE;
+        if (!IsSizerNode(n)) m_parentSizer = NULL;        
+        wxObject *item = CreateResFromNode(n, m_parent, NULL);
+        m_isInside = old_ins;
+        m_parentSizer = old_par;
+        m_isGBS = old_gbs;
+
+        // and figure out what type it is
+        wxSizer *sizer = wxDynamicCast(item, wxSizer);
+        wxWindow *wnd = wxDynamicCast(item, wxWindow);
+        
+        if (sizer)
+            sitem->SetSizer(sizer);
+        else if (wnd)
+            sitem->SetWindow(wnd);
+        else 
+            wxLogError(wxT("Error in resource."));
+
+        AddSizerItem(sitem);
+        return item;
+    }
+    else /*n == NULL*/
+    {
+        wxLogError(wxT("Error in resource: no window/sizer/spacer within sizeritem object."));
+        return NULL;
+    }
+}
+
+
+wxObject* wxSizerXmlHandler::Handle_spacer()
+{
+    wxCHECK_MSG(m_parentSizer, NULL, wxT("Incorrect syntax of XRC resource: spacer not within sizer!"));
+
+    wxSizerItem* sitem = MakeSizerItem();
+    SetSizerItemAttributes(sitem);
+    sitem->SetSpacer(GetSize());
+    AddSizerItem(sitem);    
+    return NULL;
+}
+
+
+wxObject* wxSizerXmlHandler::Handle_sizer()
+{
+    wxSizer *sizer = NULL;
+        
+    wxXmlNode *parentNode = m_node->GetParent();
+
+    wxCHECK_MSG(m_parentSizer != NULL ||
+                (parentNode->GetType() == wxXML_ELEMENT_NODE &&
+                 m_parentAsWindow != NULL &&
+                 (m_parentAsWindow->IsKindOf(CLASSINFO(wxPanel)) ||
+                  m_parentAsWindow->IsKindOf(CLASSINFO(wxFrame)) ||
+                  m_parentAsWindow->IsKindOf(CLASSINFO(wxDialog)))
+                    ), NULL,
+                wxT("Incorrect use of sizer: parent is not 'wxDialog', 'wxFrame' or 'wxPanel'."));
+
+    if (m_class == wxT("wxBoxSizer"))
+        sizer = Handle_wxBoxSizer();
+
+    else if (m_class == wxT("wxStaticBoxSizer"))
+        sizer = Handle_wxStaticBoxSizer();
+        
+    else if (m_class == wxT("wxGridSizer"))
+        sizer = Handle_wxGridSizer();
+                                    
+    else if (m_class == wxT("wxFlexGridSizer"))
+        sizer = Handle_wxFlexGridSizer();
+
+    else if (m_class == wxT("wxGridBagSizer"))
+        sizer = Handle_wxGridBagSizer();
+
+    
+    wxSize minsize = GetSize(wxT("minsize"));
+    if (!(minsize == wxDefaultSize))
+        sizer->SetMinSize(minsize);
+
+    // save state
+    wxSizer *old_par = m_parentSizer;
+    bool old_ins = m_isInside;
+    bool old_gbs = m_isGBS;
+
+    // set new state
+    m_parentSizer = sizer;
+    m_isInside = TRUE;
+    m_isGBS = (m_class == wxT("wxGridBagSizer"));
+    
+    CreateChildren(m_parent, TRUE/*only this handler*/);
+
+    // restore state
+    old_gbs = m_isGBS;    
+    m_isInside = old_ins;
+    m_parentSizer = old_par;
+
+    if (m_parentSizer == NULL) // setup window:
+    {
+        m_parentAsWindow->SetAutoLayout(TRUE);
+        m_parentAsWindow->SetSizer(sizer);
+
+        wxXmlNode *nd = m_node;
+        m_node = parentNode;
+        if (GetSize() == wxDefaultSize)
+            sizer->Fit(m_parentAsWindow);
+        m_node = nd;
+
+        if (m_parentAsWindow->GetWindowStyle() & (wxRESIZE_BOX | wxRESIZE_BORDER))
+            sizer->SetSizeHints(m_parentAsWindow);
+    }
+        
+    return sizer;
+}
+
+
+wxSizer*  wxSizerXmlHandler::Handle_wxBoxSizer()
+{
+    return new wxBoxSizer(GetStyle(wxT("orient"), wxHORIZONTAL));
+}        
+    
+wxSizer*  wxSizerXmlHandler::Handle_wxStaticBoxSizer()
+{
+    return new wxStaticBoxSizer(
+            new wxStaticBox(m_parentAsWindow,
+                            GetID(),
+                            GetText(wxT("label")),
+                            wxDefaultPosition, wxDefaultSize,
+                            0/*style*/,
+                            GetName()),
+            GetStyle(wxT("orient"), wxHORIZONTAL));
+}
+    
+wxSizer*  wxSizerXmlHandler::Handle_wxGridSizer()
+{
+    return new wxGridSizer(GetLong(wxT("rows")), GetLong(wxT("cols")),
+                           GetDimension(wxT("vgap")), GetDimension(wxT("hgap")));
+}
+
+
+wxSizer*  wxSizerXmlHandler::Handle_wxFlexGridSizer()
+{
+    wxFlexGridSizer *sizer = 
+        new wxFlexGridSizer(GetLong(wxT("rows")), GetLong(wxT("cols")),
+                            GetDimension(wxT("vgap")), GetDimension(wxT("hgap")));
+    SetGrowables(sizer, wxT("growablerows"), true);
+    SetGrowables(sizer, wxT("growablecols"), false);
+    return sizer;
+}
+
+
+wxSizer*  wxSizerXmlHandler::Handle_wxGridBagSizer()
+{
+    wxGridBagSizer *sizer = 
+        new wxGridBagSizer(GetDimension(wxT("vgap")), GetDimension(wxT("hgap")));
+    SetGrowables(sizer, wxT("growablerows"), true);
+    SetGrowables(sizer, wxT("growablecols"), false);
+    return sizer;
+}
+
+
+
+
+void wxSizerXmlHandler::SetGrowables(wxFlexGridSizer* sizer,
+                                     const wxChar* param,
+                                     bool rows)
+{
+    wxStringTokenizer tkn;
+    unsigned long l;
+    tkn.SetString(GetParamValue(param), wxT(","));
+    while (tkn.HasMoreTokens())
+    {
+        if (!tkn.GetNextToken().ToULong(&l))
+            wxLogError(wxT("growable[rows|cols] must be comma-separated list of row numbers"));
+        else {
+            if (rows)
+                sizer->AddGrowableRow(l);
+            else
+                sizer->AddGrowableCol(l);
+        }
+    }
+}
+
+
+wxGBPosition wxSizerXmlHandler::GetGBPos(const wxString& param)
+{
+    wxSize sz = GetSize(param);
+    if (sz.x < 0) sz.x = 0;
+    if (sz.y < 0) sz.y = 0;
+    return wxGBPosition(sz.x, sz.y);
+}
+
+wxGBSpan wxSizerXmlHandler::GetGBSpan(const wxString& param)
+{
+    wxSize sz = GetSize(param);
+    if (sz.x < 1) sz.x = 1;
+    if (sz.y < 1) sz.y = 1;
+    return wxGBSpan(sz.x, sz.y);
+}
+
+
+
+wxSizerItem* wxSizerXmlHandler::MakeSizerItem()
+{
+    if (m_isGBS)
+        return new wxGBSizerItem();
+    else
+        return new wxSizerItem();
+}
+
+void wxSizerXmlHandler::SetSizerItemAttributes(wxSizerItem* sitem)
+{
+    sitem->SetProportion(GetLong(wxT("option")));  // Should this check for "proportion" too?
+    sitem->SetFlag(GetStyle(wxT("flag")));
+    sitem->SetBorder(GetDimension(wxT("border")));
+    wxSize sz = GetSize(wxT("minsize"));
+    if (!(sz == wxDefaultSize))
+        sitem->SetInitSize(sz.x, sz.y);
+    sz = GetSize(wxT("ratio"));
+    if (!(sz == wxDefaultSize))
+        sitem->SetRatio(sz);
+    
+    if (m_isGBS)
+    {
+        wxGBSizerItem* gbsitem = (wxGBSizerItem*)sitem;
+        gbsitem->SetPos(GetGBPos(wxT("pos")));
+        gbsitem->SetSpan(GetGBSpan(wxT("span")));
+    }    
+}
+
+void wxSizerXmlHandler::AddSizerItem(wxSizerItem* sitem)
+{
+    if (m_isGBS)
+        ((wxGridBagSizer*)m_parentSizer)->Add((wxGBSizerItem*)sitem);
+    else
+        m_parentSizer->Add(sitem);
+}
+   
+
+
+
+
+
+
+
+
+