/////////////////////////////////////////////////////////////////////////////
// Name: xh_menu.cpp
-// Purpose: XML resource for menus and menubars
+// Purpose: XRC resource for menus and menubars
// Author: Vaclav Slavik
// Created: 2000/03/05
// RCS-ID: $Id$
#include "wx/xrc/xh_menu.h"
#include "wx/menu.h"
+#include "wx/frame.h"
wxMenuXmlHandler::wxMenuXmlHandler() :
wxXmlResourceHandler(), m_insideMenu(FALSE)
{
- ADD_STYLE(wxMENU_TEAROFF);
+ XRC_ADD_STYLE(wxMENU_TEAROFF);
}
-
-
wxObject *wxMenuXmlHandler::DoCreateResource()
{
if (m_class == wxT("wxMenu"))
int id = GetID();
bool checkable = GetBool(wxT("checkable"));
wxString label = GetText(wxT("label"));
- wxString accel = GetText(wxT("accel"));
+ wxString accel = GetText(wxT("accel"), FALSE);
wxString fullLabel = label;
if (!accel.IsEmpty())
fullLabel << wxT("\t") << accel;
);
}
-
-
-
-
-
-
-
-
-
-
wxMenuBarXmlHandler::wxMenuBarXmlHandler() : wxXmlResourceHandler()
{
- ADD_STYLE(wxMB_DOCKABLE);
+ XRC_ADD_STYLE(wxMB_DOCKABLE);
}
-
-
wxObject *wxMenuBarXmlHandler::DoCreateResource()
{
wxMenuBar *menubar = new wxMenuBar(GetStyle());
CreateChildren(menubar);
+
+ if (m_parentAsWindow)
+ {
+ wxFrame *parentFrame = wxDynamicCast(m_parent, wxFrame);
+ if (parentFrame)
+ parentFrame->SetMenuBar(menubar);
+ }
+
return menubar;
}
{
return IsOfClass(node, wxT("wxMenuBar"));
}
-