added <accel> attribute to wxMenuItem
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10025 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
parent
ccb220600d
commit
7c4878b682
@ -38,7 +38,7 @@ wxObject *wxMenuXmlHandler::DoCreateResource()
|
|||||||
wxMenu *menu = new wxMenu(GetStyle());
|
wxMenu *menu = new wxMenu(GetStyle());
|
||||||
wxString title = GetText(wxT("label"));
|
wxString title = GetText(wxT("label"));
|
||||||
wxString help = GetText(wxT("help"));
|
wxString help = GetText(wxT("help"));
|
||||||
|
|
||||||
bool oldins = m_insideMenu;
|
bool oldins = m_insideMenu;
|
||||||
m_insideMenu = TRUE;
|
m_insideMenu = TRUE;
|
||||||
CreateChildren(menu, TRUE/*only this handler*/);
|
CreateChildren(menu, TRUE/*only this handler*/);
|
||||||
@ -69,8 +69,13 @@ wxObject *wxMenuXmlHandler::DoCreateResource()
|
|||||||
{
|
{
|
||||||
int id = GetID();
|
int id = GetID();
|
||||||
bool checkable = GetBool(wxT("checkable"));
|
bool checkable = GetBool(wxT("checkable"));
|
||||||
|
wxString label = GetText(wxT("label"));
|
||||||
|
wxString accel = GetText(wxT("accel"));
|
||||||
|
wxString fullLabel = label;
|
||||||
|
if (!accel.IsEmpty())
|
||||||
|
fullLabel << wxT("\t") << accel;
|
||||||
|
|
||||||
wxMenuItem *mitem = new wxMenuItem(p_menu, id, GetText(wxT("label")),
|
wxMenuItem *mitem = new wxMenuItem(p_menu, id, fullLabel,
|
||||||
GetText(wxT("help")), checkable);
|
GetText(wxT("help")), checkable);
|
||||||
|
|
||||||
#if wxCHECK_VERSION(2,3,0) || defined(__WXMSW__)
|
#if wxCHECK_VERSION(2,3,0) || defined(__WXMSW__)
|
||||||
|
@ -2,6 +2,7 @@ node wxMenuItem
|
|||||||
type normal
|
type normal
|
||||||
icon 0
|
icon 0
|
||||||
var label of text
|
var label of text
|
||||||
|
var accel of text
|
||||||
var help of text
|
var help of text
|
||||||
var checkable of bool
|
var checkable of bool
|
||||||
var checked of bool
|
var checked of bool
|
||||||
|
Loading…
Reference in New Issue
Block a user