[htoolkit-cvs] port/src/cbits/Win32 Window.c,1.8,1.9

[<kr_...@us...>]

Update of /cvsroot/htoolkit/port/src/cbits/Win32
In directory sc8-pr-cvs1:/tmp/cvs-serv30757/cbits/Win32

Modified Files:
	Window.c 
Log Message:
Bugfix. Proper Activate/Deactivate events for MDI windows


Index: Window.c
===================================================================
RCS file: /cvsroot/htoolkit/port/src/cbits/Win32/Window.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** Window.c	3 Mar 2003 11:20:21 -0000	1.8
--- Window.c	3 Mar 2003 21:17:16 -0000	1.9
***************
*** 666,683 ****
          gCurChar = 0;
          break;
-     case WM_ACTIVATE:
-         if (wParam == WA_INACTIVE)
-         {
-             if (gInKey)
-                 handleWindowKeyboard(hWnd, evKeyLost, gCurChar, GetModifiers());
-             gInKey = FALSE;
-             gCurChar = 0;
-             handleWindowDeactivate(hWnd);
-         }
-         else
-         {
-             handleWindowActivate(hWnd);
-         }
-         break;
      case WM_CTLCOLORSTATIC:
          {
--- 666,669 ----
***************
*** 701,704 ****
--- 687,704 ----
  		SetActiveWindow(hWnd);
  		break;
+ 	case WM_ACTIVATE:
+ 		if (wParam == WA_INACTIVE)
+ 		{
+ 			if (gInKey)
+ 				handleWindowKeyboard(hWnd, evKeyLost, gCurChar, GetModifiers());
+ 			gInKey = FALSE;
+ 			gCurChar = 0;
+ 			handleWindowDeactivate(hWnd);
+ 		}
+ 		else
+ 		{
+ 			handleWindowActivate(hWnd);
+ 		}
+         break;
  	}
  
***************
*** 751,754 ****
--- 751,760 ----
  			strcat(title, "]");
  			SetWindowText(ghWndFrame, title);
+ 
+ 			if (hWnd == (HWND) lParam)
+ 				handleWindowActivate(hWnd);
+ 			else
+ 				if (hWnd == (HWND) wParam)
+ 					handleWindowDeactivate(hWnd);
  		}
  		break;