From: <kr_...@us...> - 2003-10-04 14:09:14
|
Update of /cvsroot/htoolkit/port/src/cbits/Win32 In directory sc8-pr-cvs1:/tmp/cvs-serv17605/src/cbits/Win32 Modified Files: Window.c Log Message: Bugfix Index: Window.c =================================================================== RCS file: /cvsroot/htoolkit/port/src/cbits/Win32/Window.c,v retrieving revision 1.47 retrieving revision 1.48 diff -C2 -d -r1.47 -r1.48 *** Window.c 1 Sep 2003 20:27:49 -0000 1.47 --- Window.c 4 Oct 2003 14:09:10 -0000 1.48 *************** *** 1319,1343 **** RECT rc; LONG style; FrameData *pFrameData = (FrameData *) GetWindowLong(ghWndFrame,GWL_USERDATA); ! if (pFrameData->DocumentInterface == 1) ! hwnd = ghWndFrame; ! style = GetWindowLong(hwnd, GWL_STYLE ); if (resizeable) style |= WS_THICKFRAME; else style &= ~WS_THICKFRAME; ! SetWindowLong(hwnd, GWL_STYLE, style ); ! if (hwnd == ghWndFrame) ! { ! GetWindowRect(hwnd,&rc); ! SetWindowPos(ghWndFrame,NULL,rc.left,rc.top,rc.right-rc.left,rc.bottom-rc.top,SWP_NOZORDER | SWP_FRAMECHANGED); ! } ! else ! { ! GetClientRect(hwnd,&rc); ! handleWindowResize(hwnd,rc.right-rc.left,rc.bottom-rc.top); ! handleContainerReLayout(hwnd); ! } } --- 1319,1340 ---- RECT rc; LONG style; + HWND hTargetWnd; FrameData *pFrameData = (FrameData *) GetWindowLong(ghWndFrame,GWL_USERDATA); ! hTargetWnd = hwnd; ! if (pFrameData->DocumentInterface == 1 && GetParent(hwnd) == ghWndFrame) ! hTargetWnd = ghWndFrame; ! style = GetWindowLong(hTargetWnd, GWL_STYLE); if (resizeable) style |= WS_THICKFRAME; else style &= ~WS_THICKFRAME; ! SetWindowLong(hTargetWnd, GWL_STYLE, style); ! GetWindowRect(hTargetWnd,&rc); ! SetWindowPos(hTargetWnd,NULL,rc.left,rc.top,rc.right-rc.left,rc.bottom-rc.top,SWP_NOZORDER | SWP_FRAMECHANGED); ! ! GetClientRect(hwnd,&rc); ! handleWindowResize(hwnd,rc.right-rc.left,rc.bottom-rc.top); ! handleContainerReLayout(hwnd); } |