X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/afc0db8ca0bcae488ed7efa8ee3bcd873873a8d9..6f026b5b63fe7ccb025e84509886f74772b9df13:/src/xrc/xh_sizer.cpp?ds=inline diff --git a/src/xrc/xh_sizer.cpp b/src/xrc/xh_sizer.cpp index 30a1175b00..fa87431d3e 100644 --- a/src/xrc/xh_sizer.cpp +++ b/src/xrc/xh_sizer.cpp @@ -3,7 +3,6 @@ // Purpose: XRC resource for wxBoxSizer // Author: Vaclav Slavik // Created: 2000/03/21 -// RCS-ID: $Id$ // Copyright: (c) 2000 Vaclav Slavik // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -35,6 +34,7 @@ #include "wx/notebook.h" #include "wx/tokenzr.h" +#include "wx/xml/xml.h" //----------------------------------------------------------------------------- // wxSizerXmlHandler @@ -115,9 +115,40 @@ wxObject* wxSizerXmlHandler::DoCreateResource() } +wxSizer* wxSizerXmlHandler::DoCreateSizer(const wxString& name) +{ + if (name == wxT("wxBoxSizer")) + return Handle_wxBoxSizer(); +#if wxUSE_STATBOX + else if (name == wxT("wxStaticBoxSizer")) + return Handle_wxStaticBoxSizer(); +#endif + else if (name == wxT("wxGridSizer")) + { + if ( !ValidateGridSizerChildren() ) + return NULL; + return Handle_wxGridSizer(); + } + else if (name == wxT("wxFlexGridSizer")) + { + return Handle_wxFlexGridSizer(); + } + else if (name == wxT("wxGridBagSizer")) + { + return Handle_wxGridBagSizer(); + } + else if (name == wxT("wxWrapSizer")) + { + return Handle_wxWrapSizer(); + } + + ReportError(wxString::Format("unknown sizer class \"%s\"", name)); + return NULL; +} -bool wxSizerXmlHandler::IsSizerNode(wxXmlNode *node) + +bool wxSizerXmlHandler::IsSizerNode(wxXmlNode *node) const { return (IsOfClass(node, wxT("wxBoxSizer"))) || (IsOfClass(node, wxT("wxStaticBoxSizer"))) || @@ -195,9 +226,6 @@ wxObject* wxSizerXmlHandler::Handle_spacer() wxObject* wxSizerXmlHandler::Handle_sizer() { - wxSizer *sizer = NULL; - wxFlexGridSizer *flexsizer = NULL; - wxXmlNode *parentNode = m_node->GetParent(); if ( !m_parentSizer && @@ -208,36 +236,8 @@ wxObject* wxSizerXmlHandler::Handle_sizer() return NULL; } - if (m_class == wxT("wxBoxSizer")) - sizer = Handle_wxBoxSizer(); -#if wxUSE_STATBOX - else if (m_class == wxT("wxStaticBoxSizer")) - sizer = Handle_wxStaticBoxSizer(); -#endif - else if (m_class == wxT("wxGridSizer")) - { - if ( !ValidateGridSizerChildren() ) - return NULL; - sizer = Handle_wxGridSizer(); - } - else if (m_class == wxT("wxFlexGridSizer")) - { - flexsizer = Handle_wxFlexGridSizer(); - sizer = flexsizer; - } - else if (m_class == wxT("wxGridBagSizer")) - { - flexsizer = Handle_wxGridBagSizer(); - sizer = flexsizer; - } - else if (m_class == wxT("wxWrapSizer")) - { - sizer = Handle_wxWrapSizer(); - } - else - { - ReportError(wxString::Format("unknown sizer class \"%s\"", m_class)); - } + // Create the sizer of the appropriate class. + wxSizer * const sizer = DoCreateSizer(m_class); // creation of sizer failed for some (already reported) reason, so exit: if ( !sizer ) @@ -256,11 +256,21 @@ wxObject* wxSizerXmlHandler::Handle_sizer() m_isInside = true; m_isGBS = (m_class == wxT("wxGridBagSizer")); - CreateChildren(m_parent, true/*only this handler*/); + wxObject* parent = m_parent; +#if wxUSE_STATBOX + // wxStaticBoxSizer's child controls should be parented by the box itself, + // not its parent. + wxStaticBoxSizer* const stsizer = wxDynamicCast(sizer, wxStaticBoxSizer); + if ( stsizer ) + parent = stsizer->GetStaticBox(); +#endif // wxUSE_STATBOX + + CreateChildren(parent, true/*only this handler*/); // set growable rows and cols for sizers which support this - if ( flexsizer ) + if ( wxFlexGridSizer *flexsizer = wxDynamicCast(sizer, wxFlexGridSizer) ) { + SetFlexibleMode(flexsizer); SetGrowables(flexsizer, wxT("growablerows"), true); SetGrowables(flexsizer, wxT("growablecols"), false); } @@ -386,6 +396,50 @@ bool wxSizerXmlHandler::ValidateGridSizerChildren() } +void wxSizerXmlHandler::SetFlexibleMode(wxFlexGridSizer* fsizer) +{ + if (HasParam(wxT("flexibledirection"))) + { + wxString dir = GetParamValue(wxT("flexibledirection")); + + if (dir == wxT("wxVERTICAL")) + fsizer->SetFlexibleDirection(wxVERTICAL); + else if (dir == wxT("wxHORIZONTAL")) + fsizer->SetFlexibleDirection(wxHORIZONTAL); + else if (dir == wxT("wxBOTH")) + fsizer->SetFlexibleDirection(wxBOTH); + else + { + ReportParamError + ( + wxT("flexibledirection"), + wxString::Format("unknown direction \"%s\"", dir) + ); + } + } + + if (HasParam(wxT("nonflexiblegrowmode"))) + { + wxString mode = GetParamValue(wxT("nonflexiblegrowmode")); + + if (mode == wxT("wxFLEX_GROWMODE_NONE")) + fsizer->SetNonFlexibleGrowMode(wxFLEX_GROWMODE_NONE); + else if (mode == wxT("wxFLEX_GROWMODE_SPECIFIED")) + fsizer->SetNonFlexibleGrowMode(wxFLEX_GROWMODE_SPECIFIED); + else if (mode == wxT("wxFLEX_GROWMODE_ALL")) + fsizer->SetNonFlexibleGrowMode(wxFLEX_GROWMODE_ALL); + else + { + ReportParamError + ( + wxT("nonflexiblegrowmode"), + wxString::Format("unknown grow mode \"%s\"", mode) + ); + } + } +} + + void wxSizerXmlHandler::SetGrowables(wxFlexGridSizer* sizer, const wxChar* param, bool rows) @@ -399,18 +453,36 @@ void wxSizerXmlHandler::SetGrowables(wxFlexGridSizer* sizer, while (tkn.HasMoreTokens()) { - unsigned long l; - if (!tkn.GetNextToken().ToULong(&l)) + wxString propStr; + wxString idxStr = tkn.GetNextToken().BeforeFirst(wxT(':'), &propStr); + + unsigned long li; + if (!idxStr.ToULong(&li)) { ReportParamError ( param, - "value must be comma-separated list of row numbers" + "value must be a comma-separated list of numbers" ); break; } - if ( (int)l >= nslots ) + unsigned long lp = 0; + if (!propStr.empty()) + { + if (!propStr.ToULong(&lp)) + { + ReportParamError + ( + param, + "value must be a comma-separated list of numbers" + ); + break; + } + } + + const int n = static_cast<int>(li); + if ( n >= nslots ) { ReportParamError ( @@ -419,7 +491,7 @@ void wxSizerXmlHandler::SetGrowables(wxFlexGridSizer* sizer, ( "invalid %s index %d: must be less than %d", rows ? "row" : "column", - l, + n, nslots ) ); @@ -429,9 +501,9 @@ void wxSizerXmlHandler::SetGrowables(wxFlexGridSizer* sizer, } if (rows) - sizer->AddGrowableRow(l); + sizer->AddGrowableRow(n, static_cast<int>(lp)); else - sizer->AddGrowableCol(l); + sizer->AddGrowableCol(n, static_cast<int>(lp)); } }