[htoolkit-cvs] port/src/cbits/Win32 Window.c,1.52,1.53

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

Update of /cvsroot/htoolkit/port/src/cbits/Win32
In directory sc8-pr-cvs1:/tmp/cvs-serv19957/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.52
retrieving revision 1.53
diff -C2 -d -r1.52 -r1.53
*** Window.c	9 Oct 2003 07:56:45 -0000	1.52
--- Window.c	10 Oct 2003 13:15:30 -0000	1.53
***************
*** 40,48 ****
      while (hCtrl)
      {
!         GetWindowRect(hCtrl,&rect);
!         origin.x = rect.left;
!         origin.y = rect.top;
!         ScreenToClient(hWnd,&origin);
!         SetWindowPos(hCtrl,NULL,origin.x+dx,origin.y+dy,0,0,SWP_NOSIZE|SWP_NOZORDER);
          hCtrl = GetNextWindow(hCtrl,GW_HWNDNEXT);
      }
--- 40,52 ----
      while (hCtrl)
      {
! 		if (GetWindowLong(hWnd,GWL_STYLE) & WS_VISIBLE)
! 		{
! 			GetWindowRect(hCtrl,&rect);
! 			origin.x = rect.left;
! 			origin.y = rect.top;
! 			ScreenToClient(hWnd,&origin);
! 			SetWindowPos(hCtrl,NULL,origin.x+dx,origin.y+dy,0,0,SWP_NOSIZE|SWP_NOZORDER);
! 		}
! 
          hCtrl = GetNextWindow(hCtrl,GW_HWNDNEXT);
      }
***************
*** 64,68 ****
  		
  		// fill background for all windows except GroupBox
! 		if (_stricmp(buffer, "HGROUPBOX") != 0)
  		{                    
  			GetWindowRect(hCtrl,&rect);
--- 68,72 ----
  		
  		// fill background for all windows except GroupBox
! 		if (_stricmp(buffer, "HGROUPBOX") != 0 && (GetWindowLong(hWnd,GWL_STYLE) & WS_VISIBLE))
  		{                    
  			GetWindowRect(hCtrl,&rect);
***************
*** 1213,1217 ****
  void osSetControlVisible(WindowHandle ctrl, BOOL visible)
  {
!     ShowWindow(ctrl, visible ? SW_SHOW : SW_HIDE);
  }
  
--- 1217,1221 ----
  void osSetControlVisible(WindowHandle ctrl, BOOL visible)
  {
! 	SetWindowLong(ctrl, GWL_STYLE, GetWindowLong(ctrl, GWL_STYLE) | WS_VISIBLE);
  }