AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Translate menu accelerators from XRC

Browse Source 
The content of <accel> property was taken verbatim and appended to the
(translated) label; this bypassed wx's internal accelerators translation
mechanism, because wxMenuItem code quite reasonably assumes that the
string passed to it is translated.

Explicitly use SetAccel() instead, to force translation. This matters
for languages such as German where e.g. Ctrl+ is translated as Strg+.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@78179 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík 2014-11-25 19:04:26 +00:00
parent 541a460f7b
commit cfc3dc874f
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/xrc/xh_menu.cpp
View File

@ -79,9 +79,6 @@ wxObject *wxMenuXmlHandler::DoCreateResource()
int id = GetID();
wxString label = GetText(wxT("label"));
wxString accel = GetText(wxT("accel"), false);
wxString fullLabel = label;
if (!accel.empty())
fullLabel << wxT("\t") << accel;
wxItemKind kind = wxITEM_NORMAL;
if (GetBool(wxT("radio")))
@ -100,8 +97,16 @@ wxObject *wxMenuXmlHandler::DoCreateResource()
kind = wxITEM_CHECK;
}
wxMenuItem *mitem = new wxMenuItem(p_menu, id, fullLabel,
wxMenuItem *mitem = new wxMenuItem(p_menu, id, label,
GetText(wxT("help")), kind);
if (!accel.empty())
{
wxAcceleratorEntry *entry = new wxAcceleratorEntry();
if (entry->FromString(accel))
mitem->SetAccel(entry);
else
delete entry;
}
#if !defined(__WXMSW__) || wxUSE_OWNER_DRAWN
if (HasParam(wxT("bitmap")))