①BUG修复:修复按一次ESC导致多个窗口关闭的问题 ②上次提交不小心在UIManager里面引入了一个新的BUG,已修复

movsb · Jul 1, 2014 · 5927b28 · 5927b28
1 parent 470efa8
commit 5927b28
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/Duilib/Core/UIManager.cpp b/Duilib/Core/UIManager.cpp
@@ -1330,7 +1330,8 @@ void CPaintManagerUI::SetFocus(CControlUI* pControl)
 	if( pControl == m_pFocus ) return;
 
 	HWND hFocusWnd = ::GetFocus();
-	if( hFocusWnd != m_hWndPaint && !pControl->GetInterface("HWND")) ::SetFocus(m_hWndPaint);
+	if( hFocusWnd != m_hWndPaint && (!pControl || !pControl->GetInterface("HWND"))) 
+		::SetFocus(m_hWndPaint);
 
     // Remove focus from old control
     if( m_pFocus != NULL ) 

diff --git a/Duilib/Utils/WinImplBase.cpp b/Duilib/Utils/WinImplBase.cpp
@@ -76,15 +76,16 @@ CControlUI* WindowImplBase::CreateControl(LPCTSTR pstrClass)
 	return NULL;
 }
 
-LRESULT WindowImplBase::MessageHandler(UINT uMsg, WPARAM wParam, LPARAM /*lParam*/, bool& /*bHandled*/)
+LRESULT WindowImplBase::MessageHandler(UINT uMsg, WPARAM wParam, LPARAM /*lParam*/, bool& bHandled)
 {
 	if (uMsg == WM_KEYDOWN)
 	{
 		switch (wParam)
 		{
 		case VK_RETURN:
 		case VK_ESCAPE:
-			return ResponseDefaultKeyEvent(wParam);
+			bHandled = !!ResponseDefaultKeyEvent(wParam);
+			return 0;
 		default:
 			break;
 		}

diff --git a/Duilib/Utils/WinImplBase.h b/Duilib/Utils/WinImplBase.h
@@ -49,7 +49,7 @@ namespace DuiLib
 		virtual CDuiString GetZIPFileName() const;
 		virtual LPCTSTR GetResourceID() const;
 		virtual CControlUI* CreateControl(LPCTSTR pstrClass);
-		virtual LRESULT MessageHandler(UINT uMsg, WPARAM wParam, LPARAM /*lParam*/, bool& /*bHandled*/);
+		virtual LRESULT MessageHandler(UINT uMsg, WPARAM wParam, LPARAM /*lParam*/, bool& bHandled);
 		virtual LRESULT OnClose(UINT /*uMsg*/, WPARAM /*wParam*/, LPARAM /*lParam*/, BOOL& bHandled);
 		virtual LRESULT OnDestroy(UINT /*uMsg*/, WPARAM /*wParam*/, LPARAM /*lParam*/, BOOL& bHandled);