/////////////////////////////////////////////////////////////////////////////
-// Name: xh_sizer.cpp
+// Name: src/xrc/xh_sizer.cpp
// Purpose: XRC resource for wxBoxSizer
// Author: Vaclav Slavik
// Created: 2000/03/21
// 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"
#pragma hdrstop
#endif
+#if wxUSE_XRC
+
#include "wx/xrc/xh_sizer.h"
-#include "wx/sizer.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"
+#endif
+
#include "wx/gbsizer.h"
-#include "wx/log.h"
-#include "wx/statbox.h"
#include "wx/notebook.h"
-#include "wx/panel.h"
#include "wx/tokenzr.h"
+//-----------------------------------------------------------------------------
+// wxSizerXmlHandler
+//-----------------------------------------------------------------------------
IMPLEMENT_DYNAMIC_CLASS(wxSizerXmlHandler, wxXmlResourceHandler)
-
-
-wxSizerXmlHandler::wxSizerXmlHandler()
- : wxXmlResourceHandler(),
- m_isInside(FALSE),
- m_isGBS(FALSE),
- m_parentSizer(NULL)
+wxSizerXmlHandler::wxSizerXmlHandler()
+ :wxXmlResourceHandler(),
+ m_isInside(false),
+ m_isGBS(false),
+ m_parentSizer(NULL)
{
XRC_ADD_STYLE(wxHORIZONTAL);
XRC_ADD_STYLE(wxVERTICAL);
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);
}
{
return ( (!m_isInside && IsSizerNode(node)) ||
(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();
{
// 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;
+ m_isInside = false;
+ if (!IsSizerNode(n)) m_parentSizer = NULL;
wxObject *item = CreateResFromNode(n, m_parent, NULL);
m_isInside = old_ins;
m_parentSizer = old_par;
// and figure out what type it is
wxSizer *sizer = wxDynamicCast(item, wxSizer);
wxWindow *wnd = wxDynamicCast(item, wxWindow);
-
+
if (sizer)
- sitem->SetSizer(sizer);
+ sitem->AssignSizer(sizer);
else if (wnd)
- sitem->SetWindow(wnd);
- else
+ sitem->AssignWindow(wnd);
+ else
wxLogError(wxT("Error in resource."));
+ // finally, set other wxSizerItem attributes
+ SetSizerItemAttributes(sitem);
+
AddSizerItem(sitem);
return item;
}
wxSizerItem* sitem = MakeSizerItem();
SetSizerItemAttributes(sitem);
- sitem->SetSpacer(GetSize());
- AddSizerItem(sitem);
+ sitem->AssignSpacer(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'."));
+ (parentNode && parentNode->GetType() == wxXML_ELEMENT_NODE &&
+ m_parentAsWindow), NULL,
+ wxT("Sizer must have a window parent node"));
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();
-
+ 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;
- bool old_gbs = m_isGBS;
// set new state
m_parentSizer = sizer;
- m_isInside = TRUE;
+ m_isInside = true;
m_isGBS = (m_class == wxT("wxGridBagSizer"));
-
- CreateChildren(m_parent, TRUE/*only this handler*/);
+
+ 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;
sizer->Fit(m_parentAsWindow);
m_node = nd;
- if (m_parentAsWindow->GetWindowStyle() & (wxRESIZE_BOX | wxRESIZE_BORDER))
+ if (m_parentAsWindow->GetWindowStyle() & (wxMAXIMIZE_BOX | wxRESIZE_BORDER))
sizer->SetSizeHints(m_parentAsWindow);
}
-
+
return sizer;
}
wxSizer* wxSizerXmlHandler::Handle_wxBoxSizer()
{
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()
{
return new wxGridSizer(GetLong(wxT("rows")), GetLong(wxT("cols")),
wxSizer* wxSizerXmlHandler::Handle_wxFlexGridSizer()
{
- wxFlexGridSizer *sizer =
+ wxFlexGridSizer *sizer =
new wxFlexGridSizer(GetLong(wxT("rows")), GetLong(wxT("cols")),
GetDimension(wxT("vgap")), GetDimension(wxT("hgap")));
SetGrowables(sizer, wxT("growablerows"), true);
wxSizer* wxSizerXmlHandler::Handle_wxGridBagSizer()
{
- wxGridBagSizer *sizer =
+ wxGridBagSizer *sizer =
new wxGridBagSizer(GetDimension(wxT("vgap")), GetDimension(wxT("hgap")));
SetGrowables(sizer, wxT("growablerows"), true);
SetGrowables(sizer, wxT("growablecols"), false);
sitem->SetBorder(GetDimension(wxT("border")));
wxSize sz = GetSize(wxT("minsize"));
if (!(sz == wxDefaultSize))
- sitem->SetInitSize(sz.x, sz.y);
+ sitem->SetMinSize(sz);
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")));
- }
+ 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)
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
projects / wxWidgets.git / blobdiff