iqbalrifai
/
Aegisub
mirror of https://github.com/odrling/Aegisub
1
0
Fork 0
Code Issues Releases Wiki Activity

merge r3982. 

Originally committed to SVN as r4017.
This commit is contained in:
Amar Takhar 2010-01-21 00:01:46 +00:00
parent e76cfae9bb
commit 79c1716ccd
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
aegisub/src/frame_main.cpp
View File

@ -321,15 +321,14 @@ void FrameMain::InitToolbar () {
}
/// @brief DOCME
/// @param item_text
/// @param hotkey_name
/// @return
///
wxString MakeHotkeyText(const wxChar *item_text, const wxChar *hotkey_name) {
return wxString::Format(_T("%s\t%s"), item_text, Hotkeys.GetText(hotkey_name).c_str());
}
wxString MakeHotkeyText(const wxString &item_text, const wxString &hotkey_name) {
return item_text + wxString(_T("\t")) + Hotkeys.GetText(hotkey_name);
}
/// @brief Initialize menu bar