[Win32forth-cvs] win32forth/apps/PictureViewer PictureViewer.f, 1.1, 1.2

[Rod O. <rod...@us...>]

Update of /cvsroot/win32forth/win32forth/apps/PictureViewer
In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv7619/apps/PictureViewer

Modified Files:
	PictureViewer.f 
Log Message:
Rod: Fixed error when maximizing with XP style window

Index: PictureViewer.f
===================================================================
RCS file: /cvsroot/win32forth/win32forth/apps/PictureViewer/PictureViewer.f,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** PictureViewer.f	24 Jul 2006 21:22:37 -0000	1.1
--- PictureViewer.f	27 Jul 2006 20:44:03 -0000	1.2
***************
*** 88,91 ****
--- 88,104 ----
  0 value NewWindow
  Create ToolBarLayoutKey 256 allot
+ 0 value CXEDGE
+ 0 value CYEDGE
+ 0 value CXSIZEFRAME
+ 0 value CYSIZEFRAME
+ 0 value CYCAPTION
+ 0 value CYMENU
+ : GetSystemMetrics ( -- )
+         SM_CXEDGE       call GetSystemMetrics to CXEDGE
+         SM_CYEDGE       call GetSystemMetrics to CYEDGE
+         SM_CXSIZEFRAME  call GetSystemMetrics to CXSIZEFRAME
+         SM_CYSIZEFRAME  call GetSystemMetrics to CYSIZEFRAME
+         SM_CYCAPTION    call GetSystemMetrics to CYCAPTION
+         SM_CYMENU       call GetSystemMetrics to CYMENU ;
  
  
***************
*** 360,366 ****
          GetActive: self  drop and  dup to PictureRedrawn
          IF
!             dup 16 + @  8 -  >r dup 20 + @ 46 -  >r
              0  ToolbarHeight  2r> ToolbarHeight - StatusBarHeight -
!             2dup 4 - swap 4 - swap SetSize: ActiveChild
              AdjustPicture: ActiveChild
              Move: MDIClient  PAUSE
--- 373,379 ----
          GetActive: self  drop and  dup to PictureRedrawn
          IF
!             dup 16 + @  CXSIZEFRAME 2* -  >r  dup 20 + @  CYSIZEFRAME 2* - CYCAPTION - CYMENU -  >r
              0  ToolbarHeight  2r> ToolbarHeight - StatusBarHeight -
!             2dup CYEDGE 2 * - swap CXEDGE 2 * - swap SetSize: ActiveChild
              AdjustPicture: ActiveChild
              Move: MDIClient  PAUSE
***************
*** 376,380 ****
          On_Init: super
          COLOR_BTNFACE 1+ GCL_HBRBACKGROUND hWnd Call SetClassLong drop
! \        CS_DBLCLKS  GCL_STYLE hWnd  Call SetClassLong  drop   \ needed for older versions of Win32Forth
  
          self start: PVToolbar
--- 389,393 ----
          On_Init: super
          COLOR_BTNFACE 1+ GCL_HBRBACKGROUND hWnd Call SetClassLong drop
! \        CS_DBLCLKS GCL_STYLE hWnd Call SetClassLong drop   \ needed for older versions of Win32Forth
  
          self start: PVToolbar
***************
*** 1001,1005 ****
          dup to ChildRedrawn
          IF
!             dup 16 + @  8 -  over 20 + @ 27 -
              SetSize: self
              AdjustPicture: self
--- 1014,1018 ----
          dup to ChildRedrawn
          IF
!             dup 16 + @  CXSIZEFRAME 2* -  over 20 + @  CYCAPTION - CYSIZEFRAME 2* -
              SetSize: self
              AdjustPicture: self
***************
*** 1349,1352 ****
--- 1362,1366 ----
              IF  dup Call SetForegroundWindow drop  CopyData: Frame  bye  THEN
          THEN
+         GetSystemMetrics
          zeromenu: PVMenu
          z" FreeImage.dll"  Call LoadLibrary ?dup