Gregor Brunmar : comctl32: Monthcal lost focus fix.

Alexandre Julliard julliard at winehq.org
Tue Dec 11 11:37:23 CST 2007


Module: wine
Branch: master
Commit: d055cb8d5c665a1681ab944629456bd6ce342e75
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=d055cb8d5c665a1681ab944629456bd6ce342e75

Author: Gregor Brunmar <gregor.brunmar at home.se>
Date:   Mon Dec 10 19:21:36 2007 +0100

comctl32: Monthcal lost focus fix.

---

 dlls/comctl32/monthcal.c |    9 ++++++---
 1 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/dlls/comctl32/monthcal.c b/dlls/comctl32/monthcal.c
index 8a92d42..0144df5 100644
--- a/dlls/comctl32/monthcal.c
+++ b/dlls/comctl32/monthcal.c
@@ -1719,11 +1719,14 @@ MONTHCAL_Paint(MONTHCAL_INFO *infoPtr, WPARAM wParam)
 
 
 static LRESULT
-MONTHCAL_KillFocus(const MONTHCAL_INFO *infoPtr)
+MONTHCAL_KillFocus(const MONTHCAL_INFO *infoPtr, HWND hFocusWnd)
 {
   TRACE("\n");
 
-  InvalidateRect(infoPtr->hwndSelf, NULL, TRUE);
+  if (infoPtr->hwndNotify != hFocusWnd)
+    ShowWindow(infoPtr->hwndSelf, SW_HIDE);
+  else
+    InvalidateRect(infoPtr->hwndSelf, NULL, TRUE);
 
   return 0;
 }
@@ -2031,7 +2034,7 @@ MONTHCAL_WindowProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
     return DLGC_WANTARROWS | DLGC_WANTCHARS;
 
   case WM_KILLFOCUS:
-    return MONTHCAL_KillFocus(infoPtr);
+    return MONTHCAL_KillFocus(infoPtr, (HWND)wParam);
 
   case WM_RBUTTONDOWN:
     return MONTHCAL_RButtonDown(infoPtr, lParam);




More information about the wine-cvs mailing list