[htoolkit-cvs] port/src/cbits/Win32 Menu.c,1.9,1.10 Util.c,1.14,1.15 Window.c,1.32,1.33

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

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

Modified Files:
	Menu.c Util.c Window.c 
Log Message:
bugfix


Index: Menu.c
===================================================================
RCS file: /cvsroot/htoolkit/port/src/cbits/Win32/Menu.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** Menu.c	8 Jun 2003 11:10:02 -0000	1.9
--- Menu.c	12 Jul 2003 13:49:41 -0000	1.10
***************
*** 98,102 ****
  		
  		GetClientRect(ghWndFrame, &rc);
! 		SetWindowPos(pFrameData->hClientWnd,NULL,rc.left,rc.top,rc.right,rc.bottom,SWP_NOZORDER);
  		DrawMenuBar(ghWndFrame);
  	}
--- 98,102 ----
  		
  		GetClientRect(ghWndFrame, &rc);
! 		SetWindowPos(pFrameData->hClientWnd,NULL,rc.left,rc.top,rc.right-rc.left,rc.bottom-rc.top,SWP_NOZORDER);
  		DrawMenuBar(ghWndFrame);
  	}

Index: Util.c
===================================================================
RCS file: /cvsroot/htoolkit/port/src/cbits/Win32/Util.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** Util.c	1 Jul 2003 20:08:18 -0000	1.14
--- Util.c	12 Jul 2003 13:49:41 -0000	1.15
***************
*** 1,4 ****
- #define _WIN32_IE 0x0400
- 
  #include "RtsAPI.h"
  #include "Types.h"
--- 1,2 ----

Index: Window.c
===================================================================
RCS file: /cvsroot/htoolkit/port/src/cbits/Win32/Window.c,v
retrieving revision 1.32
retrieving revision 1.33
diff -C2 -d -r1.32 -r1.33
*** Window.c	2 Jul 2003 18:09:47 -0000	1.32
--- Window.c	12 Jul 2003 13:49:41 -0000	1.33
***************
*** 1,4 ****
- #define _WIN32_IE 0x0400
- 
  #include "Window.h"
  #include "Internals.h"
--- 1,2 ----
***************
*** 1382,1388 ****
  }
  
! void osSetWindowResizeable(WindowHandle hwnd, int resizeable )
  {
!   RECT rect;
    LONG style;
    FrameData *pFrameData = (FrameData *) GetWindowLong(ghWndFrame,GWL_USERDATA);
--- 1380,1386 ----
  }
  
! void osSetWindowResizeable(WindowHandle hwnd, int resizeable)
  {
!   RECT rc;
    LONG style;
    FrameData *pFrameData = (FrameData *) GetWindowLong(ghWndFrame,GWL_USERDATA);
***************
*** 1396,1401 ****
    SetWindowLong(hwnd, GWL_STYLE, style );
  
!   GetClientRect(hwnd,&rect);
!   handleWindowResize(hwnd,rect.right-rect.left,rect.bottom-rect.top);
!   handleWindowReLayout(hwnd);
  }
--- 1394,1407 ----
    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);
!   	handleWindowReLayout(hwnd);
!   }
  }