/////////////////////////////////////////////////////////////////////////////
-// Name: xh_toolb.cpp
+// Name: src/xrc/xh_toolb.cpp
// Purpose: XRC resource for wxBoxSizer
// Author: Vaclav Slavik
// Created: 2000/08/11
// Copyright: (c) 2000 Vaclav Slavik
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
-
-#ifdef __GNUG__
-#pragma implementation "xh_toolb.h"
-#endif
// For compilers that support precompilation, includes "wx.h".
#include "wx/wxprec.h"
#pragma hdrstop
#endif
+#if wxUSE_XRC && wxUSE_TOOLBAR
+
#include "wx/xrc/xh_toolb.h"
-#include "wx/toolbar.h"
-#include "wx/frame.h"
-#if wxUSE_TOOLBAR
+#ifndef WX_PRECOMP
+ #include "wx/frame.h"
+#endif
+
+#include "wx/toolbar.h"
IMPLEMENT_DYNAMIC_CLASS(wxToolBarXmlHandler, wxXmlResourceHandler)
-wxToolBarXmlHandler::wxToolBarXmlHandler()
-: wxXmlResourceHandler(), m_isInside(FALSE), m_toolbar(NULL)
+wxToolBarXmlHandler::wxToolBarXmlHandler()
+: wxXmlResourceHandler(), m_isInside(false), m_toolbar(NULL)
{
XRC_ADD_STYLE(wxTB_FLAT);
XRC_ADD_STYLE(wxTB_DOCKABLE);
XRC_ADD_STYLE(wxTB_NOICONS);
XRC_ADD_STYLE(wxTB_NODIVIDER);
XRC_ADD_STYLE(wxTB_NOALIGN);
+ XRC_ADD_STYLE(wxTB_HORZ_LAYOUT);
+ XRC_ADD_STYLE(wxTB_HORZ_TEXT);
+ AddWindowStyles();
}
wxObject *wxToolBarXmlHandler::DoCreateResource()
-{
+{
if (m_class == wxT("tool"))
{
wxCHECK_MSG(m_toolbar, NULL, wxT("Incorrect syntax of XRC resource: tool not within a toolbar!"));
-
+
if (GetPosition() != wxDefaultPosition)
{
m_toolbar->AddTool(GetID(),
GetText(wxT("longhelp")));
}
else
- {
+ {
wxItemKind kind = wxITEM_NORMAL;
if (GetBool(wxT("radio")))
kind = wxITEM_RADIO;
wxASSERT_MSG( kind == wxITEM_NORMAL,
_T("can't have both toggleable and radion button at once") );
kind = wxITEM_CHECK;
- }
+ }
m_toolbar->AddTool(GetID(),
GetText(wxT("label")),
GetBitmap(wxT("bitmap"), wxART_TOOLBAR),
kind,
GetText(wxT("tooltip")),
GetText(wxT("longhelp")));
+
+ if ( GetBool(wxT("disabled")) )
+ m_toolbar->EnableTool(GetID(), false);
}
return m_toolbar; // must return non-NULL
}
-
+
else if (m_class == wxT("separator"))
{
wxCHECK_MSG(m_toolbar, NULL, wxT("Incorrect syntax of XRC resource: separator not within a toolbar!"));
m_toolbar->AddSeparator();
return m_toolbar; // must return non-NULL
}
-
+
else /*<object class="wxToolBar">*/
{
int style = GetStyle(wxT("style"), wxNO_BORDER | wxTB_HORIZONTAL);
#endif
XRC_MAKE_INSTANCE(toolbar, wxToolBar)
-
+
toolbar->Create(m_parentAsWindow,
GetID(),
GetPosition(),
long separation = GetLong(wxT("separation"), -1);
if (separation != -1)
toolbar->SetToolSeparation(separation);
+ if (HasParam(wxT("bg")))
+ toolbar->SetBackgroundColour(GetColour(wxT("bg")));
wxXmlNode *children_node = GetParamNode(wxT("object"));
if (!children_node)
if (children_node == NULL) return toolbar;
- m_isInside = TRUE;
+ m_isInside = true;
m_toolbar = toolbar;
wxXmlNode *n = children_node;
while (n)
{
- if ((n->GetType() == wxXML_ELEMENT_NODE) &&
+ if ((n->GetType() == wxXML_ELEMENT_NODE) &&
(n->GetName() == wxT("object") || n->GetName() == wxT("object_ref")))
{
wxObject *created = CreateResFromNode(n, toolbar, NULL);
n = n->GetNext();
}
- m_isInside = FALSE;
+ m_isInside = false;
m_toolbar = NULL;
toolbar->Realize();
bool wxToolBarXmlHandler::CanHandle(wxXmlNode *node)
{
return ((!m_isInside && IsOfClass(node, wxT("wxToolBar"))) ||
- (m_isInside && IsOfClass(node, wxT("tool"))) ||
+ (m_isInside && IsOfClass(node, wxT("tool"))) ||
(m_isInside && IsOfClass(node, wxT("separator"))));
}
-#endif
+#endif // wxUSE_XRC && wxUSE_TOOLBAR