forked from mia/Aegisub
merge r3982.
Originally committed to SVN as r4017.
This commit is contained in:
parent
e76cfae9bb
commit
79c1716ccd
1 changed files with 3 additions and 4 deletions
|
@ -321,15 +321,14 @@ void FrameMain::InitToolbar () {
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
/// @brief DOCME
|
/// @brief DOCME
|
||||||
/// @param item_text
|
/// @param item_text
|
||||||
/// @param hotkey_name
|
/// @param hotkey_name
|
||||||
/// @return
|
/// @return
|
||||||
///
|
///
|
||||||
wxString MakeHotkeyText(const wxChar *item_text, const wxChar *hotkey_name) {
|
wxString MakeHotkeyText(const wxString &item_text, const wxString &hotkey_name) {
|
||||||
return wxString::Format(_T("%s\t%s"), item_text, Hotkeys.GetText(hotkey_name).c_str());
|
return item_text + wxString(_T("\t")) + Hotkeys.GetText(hotkey_name);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
/// @brief Initialize menu bar
|
/// @brief Initialize menu bar
|
||||||
|
|
Loading…
Reference in a new issue