From 79c1716ccd22aac40ee29a8f833f27d8cddf42ef Mon Sep 17 00:00:00 2001
From: Amar Takhar <verm@aegisub.org>
Date: Thu, 21 Jan 2010 00:01:46 +0000
Subject: [PATCH] merge r3982.

Originally committed to SVN as r4017.
---
 aegisub/src/frame_main.cpp | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/aegisub/src/frame_main.cpp b/aegisub/src/frame_main.cpp
index b4f1d23d5..c67484f57 100644
--- a/aegisub/src/frame_main.cpp
+++ b/aegisub/src/frame_main.cpp
@@ -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