/////////////////////////////////////////////////////////////////////////////
-// Name: xh_toolb.cpp
-// Purpose: XRC resource for wxBoxSizer
+// Name: src/xrc/xh_toolb.cpp
+// Purpose: XRC resource for wxToolBar
// Author: Vaclav Slavik
// Created: 2000/08/11
// RCS-ID: $Id$
// 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"
+ #include "wx/log.h"
+ #include "wx/menu.h"
+ #include "wx/toolbar.h"
+#endif
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);
+
+ XRC_ADD_STYLE(wxTB_TOP);
+ XRC_ADD_STYLE(wxTB_LEFT);
+ XRC_ADD_STYLE(wxTB_RIGHT);
+ XRC_ADD_STYLE(wxTB_BOTTOM);
+
+ 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)
+ if ( !m_toolbar )
{
- m_toolbar->AddTool(GetID(),
- GetBitmap(wxT("bitmap"), wxART_TOOLBAR),
- GetBitmap(wxT("bitmap2"), wxART_TOOLBAR),
- GetBool(wxT("toggle")),
- GetPosition().x,
- GetPosition().y,
- NULL,
- GetText(wxT("tooltip")),
- GetText(wxT("longhelp")));
+ ReportError("tool only allowed inside a wxToolBar");
+ return NULL;
}
- else
- {
- wxItemKind kind = wxITEM_NORMAL;
- if (GetBool(wxT("radio")))
- kind = wxITEM_RADIO;
- if (GetBool(wxT("toggle")))
+
+ wxItemKind kind = wxITEM_NORMAL;
+ if (GetBool(wxT("radio")))
+ kind = wxITEM_RADIO;
+
+ if (GetBool(wxT("toggle")))
+ {
+ if ( kind != wxITEM_NORMAL )
+ {
+ ReportParamError
+ (
+ "toggle",
+ "tool can't have both <radio> and <toggle> properties"
+ );
+ }
+
+ kind = wxITEM_CHECK;
+ }
+#if wxUSE_MENUS
+ // check whether we have dropdown tag inside
+ wxMenu *menu = NULL; // menu for drop down items
+ wxXmlNode * const nodeDropdown = GetParamNode("dropdown");
+ if ( nodeDropdown )
+ {
+ if ( kind != wxITEM_NORMAL )
+ {
+ ReportParamError
+ (
+ "dropdown",
+ "drop-down tool can't have neither <radio> nor <toggle> properties"
+ );
+ }
+
+ kind = wxITEM_DROPDOWN;
+
+ // also check for the menu specified inside dropdown (it is
+ // optional and may be absent for e.g. dynamically-created
+ // menus)
+ wxXmlNode * const nodeMenu = nodeDropdown->GetChildren();
+ if ( nodeMenu )
{
- 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),
- GetBitmap(wxT("bitmap2"), wxART_TOOLBAR),
- kind,
- GetText(wxT("tooltip")),
- GetText(wxT("longhelp")));
+ wxObject *res = CreateResFromNode(nodeMenu, NULL);
+ menu = wxDynamicCast(res, wxMenu);
+ if ( !menu )
+ {
+ ReportError
+ (
+ nodeMenu,
+ "drop-down tool contents can only be a wxMenu"
+ );
+ }
+
+ if ( nodeMenu->GetNext() )
+ {
+ ReportError
+ (
+ nodeMenu->GetNext(),
+ "unexpected extra contents under drop-down tool"
+ );
+ }
+ }
}
+#endif
+ wxToolBarToolBase * const tool =
+ m_toolbar->AddTool
+ (
+ GetID(),
+ GetText(wxT("label")),
+ GetBitmap(wxT("bitmap"), wxART_TOOLBAR, m_toolSize),
+ GetBitmap(wxT("bitmap2"), wxART_TOOLBAR, m_toolSize),
+ kind,
+ GetText(wxT("tooltip")),
+ GetText(wxT("longhelp"))
+ );
+
+ if ( GetBool(wxT("disabled")) )
+ m_toolbar->EnableTool(GetID(), false);
+#if wxUSE_MENUS
+ if ( menu )
+ tool->SetDropdownMenu(menu);
+#endif
+
return m_toolbar; // must return non-NULL
}
-
- else if (m_class == wxT("separator"))
+
+ else if (m_class == wxT("separator") || m_class == wxT("space"))
{
- wxCHECK_MSG(m_toolbar, NULL, wxT("Incorrect syntax of XRC resource: separator not within a toolbar!"));
- m_toolbar->AddSeparator();
+ if ( !m_toolbar )
+ {
+ ReportError("separators only allowed inside wxToolBar");
+ return NULL;
+ }
+
+ if ( m_class == wxT("separator") )
+ m_toolbar->AddSeparator();
+ else
+ m_toolbar->AddStretchableSpace();
+
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(),
GetSize(),
style,
GetName());
+ SetupWindow(toolbar);
- wxSize bmpsize = GetSize(wxT("bitmapsize"));
- if (!(bmpsize == wxDefaultSize))
- toolbar->SetToolBitmapSize(bmpsize);
+ m_toolSize = GetSize(wxT("bitmapsize"));
+ if (!(m_toolSize == wxDefaultSize))
+ toolbar->SetToolBitmapSize(m_toolSize);
wxSize margins = GetSize(wxT("margins"));
if (!(margins == wxDefaultSize))
toolbar->SetMargins(margins.x, margins.y);
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);
wxControl *control = wxDynamicCast(created, wxControl);
if (!IsOfClass(n, wxT("tool")) &&
!IsOfClass(n, wxT("separator")) &&
+ !IsOfClass(n, wxT("space")) &&
control != NULL)
toolbar->AddControl(control);
}
n = n->GetNext();
}
- m_isInside = FALSE;
+ m_isInside = false;
m_toolbar = NULL;
toolbar->Realize();
- // FIXME: how can I create a toolbar without immediately setting it to the frame?
- if (m_parentAsWindow)
+ if (m_parentAsWindow && !GetBool(wxT("dontattachtoframe")))
{
wxFrame *parentFrame = wxDynamicCast(m_parent, wxFrame);
if (parentFrame)
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("space"))) ||
(m_isInside && IsOfClass(node, wxT("separator"))));
}
-#endif
+#endif // wxUSE_XRC && wxUSE_TOOLBAR
projects / wxWidgets.git / blobdiff