X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/52de92a8e9aa2e2aeddcfc68445b11529fc29e1b..9968f7b4cd6752ead5744d4895ed392458d83abd:/src/xrc/xh_sizer.cpp?ds=sidebyside diff --git a/src/xrc/xh_sizer.cpp b/src/xrc/xh_sizer.cpp index eaeec961c2..ea64786b64 100644 --- a/src/xrc/xh_sizer.cpp +++ b/src/xrc/xh_sizer.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: xh_sizer.cpp +// Name: src/xrc/xh_sizer.cpp // Purpose: XRC resource for wxBoxSizer // Author: Vaclav Slavik // Created: 2000/03/21 @@ -7,10 +7,6 @@ // Copyright: (c) 2000 Vaclav Slavik // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// - -#ifdef __GNUG__ -#pragma implementation "xh_sizer.h" -#endif // For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" @@ -19,28 +15,38 @@ #pragma hdrstop #endif +#if wxUSE_XRC + #include "wx/xrc/xh_sizer.h" -#include "wx/sizer.h" -#include "wx/log.h" -#include "wx/statbox.h" + +#ifndef WX_PRECOMP + #include "wx/log.h" + #include "wx/panel.h" + #include "wx/statbox.h" + #include "wx/sizer.h" + #include "wx/frame.h" + #include "wx/dialog.h" + #include "wx/button.h" + #include "wx/scrolwin.h" +#endif + +#include "wx/gbsizer.h" +#include "wx/wrapsizer.h" #include "wx/notebook.h" -#include "wx/panel.h" #include "wx/tokenzr.h" -IMPLEMENT_DYNAMIC_CLASS(wxSizerXmlHandler, wxXmlResourceHandler) - -bool wxSizerXmlHandler::IsSizerNode(wxXmlNode *node) -{ - return (IsOfClass(node, wxT("wxBoxSizer"))) || - (IsOfClass(node, wxT("wxStaticBoxSizer"))) || - (IsOfClass(node, wxT("wxGridSizer"))) || - (IsOfClass(node, wxT("wxFlexGridSizer"))); -} +//----------------------------------------------------------------------------- +// wxSizerXmlHandler +//----------------------------------------------------------------------------- +IMPLEMENT_DYNAMIC_CLASS(wxSizerXmlHandler, wxXmlResourceHandler) -wxSizerXmlHandler::wxSizerXmlHandler() -: wxXmlResourceHandler(), m_isInside(FALSE), m_parentSizer(NULL) +wxSizerXmlHandler::wxSizerXmlHandler() + :wxXmlResourceHandler(), + m_isInside(false), + m_isGBS(false), + m_parentSizer(NULL) { XRC_ADD_STYLE(wxHORIZONTAL); XRC_ADD_STYLE(wxVERTICAL); @@ -71,165 +77,410 @@ wxSizerXmlHandler::wxSizerXmlHandler() XRC_ADD_STYLE(wxALIGN_CENTRE_HORIZONTAL); XRC_ADD_STYLE(wxALIGN_CENTER_VERTICAL); XRC_ADD_STYLE(wxALIGN_CENTRE_VERTICAL); - - XRC_ADD_STYLE(wxADJUST_MINSIZE); + + XRC_ADD_STYLE(wxFIXED_MINSIZE); + XRC_ADD_STYLE(wxRESERVE_SPACE_EVEN_IF_HIDDEN); + + // this flag doesn't do anything any more but we can just ignore its + // occurrences in the old resource files instead of raising a fuss because + // of it + AddStyle("wxADJUST_MINSIZE", 0); + + // wxWrapSizer-specific flags + XRC_ADD_STYLE(wxEXTEND_LAST_ON_EACH_LINE); + XRC_ADD_STYLE(wxREMOVE_LEADING_SPACES); } -wxObject *wxSizerXmlHandler::DoCreateResource() -{ +bool wxSizerXmlHandler::CanHandle(wxXmlNode *node) +{ + return ( (!m_isInside && IsSizerNode(node)) || + (m_isInside && IsOfClass(node, wxT("sizeritem"))) || + (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"))) || + (IsOfClass(node, wxT("wxWrapSizer"))); +} + + +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) { - wxXmlNode *n = GetParamNode(wxT("object")); + // create a sizer item for it + wxSizerItem* sitem = MakeSizerItem(); - if ( !n ) - n = GetParamNode(wxT("object_ref")); + // 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; - 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")); + // and figure out what type it is + wxSizer *sizer = wxDynamicCast(item, wxSizer); + wxWindow *wnd = wxDynamicCast(item, wxWindow); - 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.")); + if (sizer) + sitem->AssignSizer(sizer); + else if (wnd) + sitem->AssignWindow(wnd); + else + wxLogError(wxT("Error in resource.")); - return item; - } - else /*n == NULL*/ - { - wxLogError(wxT("Error in resource: no control/sizer within sizer's tag.")); - return NULL; - } + // finally, set other wxSizerItem attributes + SetSizerItemAttributes(sitem); + + AddSizerItem(sitem); + return item; } - - else if (m_class == wxT("spacer")) + else /*n == NULL*/ { - 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"))); + wxLogError(wxT("Error in resource: no window/sizer/spacer within sizeritem object.")); 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")) +} + + +wxObject* wxSizerXmlHandler::Handle_spacer() +{ + if ( !m_parentSizer ) + { + wxLogError(_("XRC syntax error: \"spacer\" only allowed inside a " + "sizer")); + return NULL; + } + + wxSizerItem* sitem = MakeSizerItem(); + SetSizerItemAttributes(sitem); + sitem->AssignSpacer(GetSize()); + AddSizerItem(sitem); + return NULL; +} + + +wxObject* wxSizerXmlHandler::Handle_sizer() +{ + wxSizer *sizer = NULL; + + wxXmlNode *parentNode = m_node->GetParent(); + + if ( !m_parentSizer && + (!parentNode || parentNode->GetType() != wxXML_ELEMENT_NODE || + !m_parentAsWindow) ) + { + wxLogError(_("XRC syntax error: sizer must have a window parent.")); + 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")) + sizer = Handle_wxGridSizer(); + + else if (m_class == wxT("wxFlexGridSizer")) + sizer = Handle_wxFlexGridSizer(); + + else if (m_class == wxT("wxGridBagSizer")) + sizer = Handle_wxGridBagSizer(); + + else if (m_class == wxT("wxWrapSizer")) + sizer = Handle_wxWrapSizer(); + + if ( !sizer ) + { + wxLogError(_T("Failed to create size of class \"%s\""), m_class.c_str()); + return NULL; + } + + wxSize minsize = GetSize(wxT("minsize")); + if (!(minsize == wxDefaultSize)) + sizer->SetMinSize(minsize); + + // save state + wxSizer *old_par = m_parentSizer; + bool old_ins = m_isInside; + + // set new state + m_parentSizer = sizer; + m_isInside = true; + m_isGBS = (m_class == wxT("wxGridBagSizer")); + + CreateChildren(m_parent, true/*only this handler*/); + + // restore state + m_isInside = old_ins; + m_parentSizer = old_par; + + if (m_parentSizer == NULL) // setup window: + { + m_parentAsWindow->SetSizer(sizer); + + wxXmlNode *nd = m_node; + m_node = parentNode; + if (GetSize() == wxDefaultSize) { - 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 ( wxDynamicCast(m_parentAsWindow, wxScrolledWindow) != NULL ) { - if (!tkn.GetNextToken().ToULong(&l)) - wxLogError(wxT("growablerows must be comma-separated list of row numbers")); - else - fsizer->AddGrowableRow(l); + sizer->FitInside(m_parentAsWindow); } - tkn.SetString(GetParamValue(wxT("growablecols")), wxT(",")); - while (tkn.HasMoreTokens()) + else { - if (!tkn.GetNextToken().ToULong(&l)) - wxLogError(wxT("growablecols must be comma-separated list of column numbers")); - else - fsizer->AddGrowableCol(l); + sizer->Fit(m_parentAsWindow); } } + m_node = nd; - 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: + if (m_parentAsWindow->IsTopLevel()) { - m_parentAsWindow->SetAutoLayout(TRUE); - m_parentAsWindow->SetSizer(sizer); + sizer->SetSizeHints(m_parentAsWindow); + } + } - wxXmlNode *nd = m_node; - m_node = parentNode; - if (GetSize() == wxDefaultSize) - sizer->Fit(m_parentAsWindow); - m_node = nd; + return sizer; +} + + +wxSizer* wxSizerXmlHandler::Handle_wxBoxSizer() +{ + return new wxBoxSizer(GetStyle(wxT("orient"), wxHORIZONTAL)); +} + +#if wxUSE_STATBOX +wxSizer* wxSizerXmlHandler::Handle_wxStaticBoxSizer() +{ + return new wxStaticBoxSizer( + new wxStaticBox(m_parentAsWindow, + GetID(), + GetText(wxT("label")), + wxDefaultPosition, wxDefaultSize, + 0/*style*/, + GetName()), + GetStyle(wxT("orient"), wxHORIZONTAL)); +} +#endif // wxUSE_STATBOX + +wxSizer* wxSizerXmlHandler::Handle_wxGridSizer() +{ + return new wxGridSizer(GetLong(wxT("rows")), GetLong(wxT("cols")), + GetDimension(wxT("vgap")), GetDimension(wxT("hgap"))); +} - if (m_parentAsWindow->GetWindowStyle() & (wxRESIZE_BOX | wxRESIZE_BORDER)) - sizer->SetSizeHints(m_parentAsWindow); + +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; +} + +wxSizer* wxSizerXmlHandler::Handle_wxWrapSizer() +{ + wxWrapSizer *sizer = new wxWrapSizer(GetStyle("orient"), GetStyle("flag")); + 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); } - - return sizer; } } +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); +} -bool wxSizerXmlHandler::CanHandle(wxXmlNode *node) +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() { - return ((!m_isInside && IsSizerNode(node)) || - (m_isInside && IsOfClass(node, wxT("sizeritem"))) || - (m_isInside && IsOfClass(node, wxT("spacer")))); + 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->SetMinSize(sz); + sz = GetSize(wxT("ratio")); + if (!(sz == wxDefaultSize)) + sitem->SetRatio(sz); + + if (m_isGBS) + { + wxGBSizerItem* gbsitem = (wxGBSizerItem*)sitem; + gbsitem->SetPos(GetGBPos(wxT("cellpos"))); + gbsitem->SetSpan(GetGBSpan(wxT("cellspan"))); + } + + // record the id of the item, if any, for use by XRCSIZERITEM() + sitem->SetId(GetID()); +} + +void wxSizerXmlHandler::AddSizerItem(wxSizerItem* sitem) +{ + if (m_isGBS) + ((wxGridBagSizer*)m_parentSizer)->Add((wxGBSizerItem*)sitem); + else + m_parentSizer->Add(sitem); +} + + + +//----------------------------------------------------------------------------- +// wxStdDialogButtonSizerXmlHandler +//----------------------------------------------------------------------------- +#if wxUSE_BUTTON + +IMPLEMENT_DYNAMIC_CLASS(wxStdDialogButtonSizerXmlHandler, wxXmlResourceHandler) + +wxStdDialogButtonSizerXmlHandler::wxStdDialogButtonSizerXmlHandler() + : m_isInside(false), m_parentSizer(NULL) +{ +} + +wxObject *wxStdDialogButtonSizerXmlHandler::DoCreateResource() +{ + if (m_class == wxT("wxStdDialogButtonSizer")) + { + wxASSERT( !m_parentSizer ); + + wxSizer *s = m_parentSizer = new wxStdDialogButtonSizer; + m_isInside = true; + + CreateChildren(m_parent, true/*only this handler*/); + + m_parentSizer->Realize(); + + m_isInside = false; + m_parentSizer = NULL; + + return s; + } + else // m_class == "button" + { + wxASSERT( m_parentSizer ); + + // 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) + { + wxObject *item = CreateResFromNode(n, m_parent, NULL); + wxButton *button = wxDynamicCast(item, wxButton); + + if (button) + m_parentSizer->AddButton(button); + else + wxLogError(wxT("Error in resource - expected button.")); + + return item; + } + else /*n == NULL*/ + { + wxLogError(wxT("Error in resource: no button within wxStdDialogButtonSizer.")); + return NULL; + } + } +} + +bool wxStdDialogButtonSizerXmlHandler::CanHandle(wxXmlNode *node) +{ + return (!m_isInside && IsOfClass(node, wxT("wxStdDialogButtonSizer"))) || + (m_isInside && IsOfClass(node, wxT("button"))); +} +#endif // wxUSE_BUTTON + +#endif // wxUSE_XRC