#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/tokenzr.h"
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);
}
(IsOfClass(node, wxT("wxStaticBoxSizer"))) ||
(IsOfClass(node, wxT("wxGridSizer"))) ||
(IsOfClass(node, wxT("wxFlexGridSizer"))) ||
- (IsOfClass(node, wxT("wxGridBagSizer")));
+ (IsOfClass(node, wxT("wxGridBagSizer"))) ||
+ (IsOfClass(node, wxT("wxWrapSizer")));
}
wxWindow *wnd = wxDynamicCast(item, wxWindow);
if (sizer)
- sitem->SetSizer(sizer);
+ sitem->AssignSizer(sizer);
else if (wnd)
- sitem->SetWindow(wnd);
+ sitem->AssignWindow(wnd);
else
wxLogError(wxT("Error in resource."));
wxObject* wxSizerXmlHandler::Handle_spacer()
{
- wxCHECK_MSG(m_parentSizer, NULL, wxT("Incorrect syntax of XRC resource: spacer not within sizer!"));
+ if ( !m_parentSizer )
+ {
+ wxLogError(_("XRC syntax error: \"spacer\" only allowed inside a "
+ "sizer"));
+ return NULL;
+ }
wxSizerItem* sitem = MakeSizerItem();
SetSizerItemAttributes(sitem);
- sitem->SetSpacer(GetSize());
+ sitem->AssignSpacer(GetSize());
AddSizerItem(sitem);
return NULL;
}
wxObject* wxSizerXmlHandler::Handle_sizer()
{
wxSizer *sizer = NULL;
+ wxFlexGridSizer *flexsizer = NULL;
wxXmlNode *parentNode = m_node->GetParent();
- wxCHECK_MSG(m_parentSizer != NULL ||
- (parentNode && 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_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();
-
+ {
+ flexsizer = Handle_wxFlexGridSizer();
+ sizer = flexsizer;
+ }
else if (m_class == wxT("wxGridBagSizer"))
- sizer = Handle_wxGridBagSizer();
+ {
+ flexsizer = Handle_wxGridBagSizer();
+ sizer = flexsizer;
+ }
+ else if (m_class == wxT("wxWrapSizer"))
+ sizer = Handle_wxWrapSizer();
if ( !sizer )
{
CreateChildren(m_parent, true/*only this handler*/);
+ // set growable rows and cols for sizers which support this
+ if ( flexsizer )
+ {
+ SetGrowables(flexsizer, wxT("growablerows"), true);
+ SetGrowables(flexsizer, wxT("growablecols"), false);
+ }
+
// restore state
m_isInside = old_ins;
m_parentSizer = old_par;
wxXmlNode *nd = m_node;
m_node = parentNode;
if (GetSize() == wxDefaultSize)
- sizer->Fit(m_parentAsWindow);
+ {
+ if ( wxDynamicCast(m_parentAsWindow, wxScrolledWindow) != NULL )
+ {
+ sizer->FitInside(m_parentAsWindow);
+ }
+ else
+ {
+ sizer->Fit(m_parentAsWindow);
+ }
+ }
m_node = nd;
- if (m_parentAsWindow->GetWindowStyle() & (wxMAXIMIZE_BOX | wxRESIZE_BORDER))
+ if (m_parentAsWindow->IsTopLevel())
+ {
sizer->SetSizeHints(m_parentAsWindow);
+ }
}
return sizer;
return new wxBoxSizer(GetStyle(wxT("orient"), wxHORIZONTAL));
}
+#if wxUSE_STATBOX
wxSizer* wxSizerXmlHandler::Handle_wxStaticBoxSizer()
{
return new wxStaticBoxSizer(
GetName()),
GetStyle(wxT("orient"), wxHORIZONTAL));
}
+#endif // wxUSE_STATBOX
wxSizer* wxSizerXmlHandler::Handle_wxGridSizer()
{
}
-wxSizer* wxSizerXmlHandler::Handle_wxFlexGridSizer()
+wxFlexGridSizer* 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;
+ return new wxFlexGridSizer(GetLong(wxT("rows")), GetLong(wxT("cols")),
+ GetDimension(wxT("vgap")), GetDimension(wxT("hgap")));
}
-wxSizer* wxSizerXmlHandler::Handle_wxGridBagSizer()
+wxGridBagSizer* 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;
+ return new wxGridBagSizer(GetDimension(wxT("vgap")), GetDimension(wxT("hgap")));
}
+wxSizer* wxSizerXmlHandler::Handle_wxWrapSizer()
+{
+ wxWrapSizer *sizer = new wxWrapSizer(GetStyle("orient"), GetStyle("flag"));
+ return sizer;
+}
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);
+ break;
}
+
+ if (rows)
+ sizer->AddGrowableRow(l);
+ else
+ sizer->AddGrowableCol(l);
}
}
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)
//-----------------------------------------------------------------------------
// wxStdDialogButtonSizerXmlHandler
//-----------------------------------------------------------------------------
+#if wxUSE_BUTTON
IMPLEMENT_DYNAMIC_CLASS(wxStdDialogButtonSizerXmlHandler, wxXmlResourceHandler)
return (!m_isInside && IsOfClass(node, wxT("wxStdDialogButtonSizer"))) ||
(m_isInside && IsOfClass(node, wxT("button")));
}
+#endif // wxUSE_BUTTON
#endif // wxUSE_XRC
projects / wxWidgets.git / blobdiff