修正使用空格键执行时,再次弹出程序程序时输入框的空格问题.

chenall · Jan 25, 2015 · e8afe35 · e8afe35
1 parent 7485b31
commit e8afe35
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/doc/update.log b/doc/update.log
@@ -1,3 +1,4 @@
+	2015-01-25 修正使用空格键执行时,再次弹出程序程序时输入框的空格问题.
 	2015-01-25 使用新的方法激活窗口(唯一进程功能更稳定).
 	2015-01-23 在x86系统运行时自动过滤x64的软件(根据文件名识别,有包含x64的自动过滤)
 

diff --git a/src/MerryFrame.cpp b/src/MerryFrame.cpp
@@ -219,12 +219,13 @@ void MerryFrame::OnShowEvent(wxShowEvent& e)
 	{
 		if (g_config->get(PlayPopupNotify))//是否播放提示音
 			wxSound("Popup.wav").Play();
+		textCtrl->ChangeValue(wxT(""));
 		this->CentreOnce();
 		m_listBoxPanel->Dismiss();
 		this->Raise();
-
 		g_controller->SetWindowPos(this->GetHWND(),HWND_TOPMOST,0,0,0,0,SWP_NOMOVE | SWP_NOSIZE);
-		textCtrl->SetFocus();
+		ActiveWindow(this->GetHWND());
+//		textCtrl->SetFocus();
 #ifdef __WXMSW__
 		textCtrl->SetEnInputMode();
 #endif