[Win32forth-cvs] win32forth/src Window.f,1.1,1.2

[Dirk B. <db...@us...>]

Update of /cvsroot/win32forth/win32forth/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17696/src

Modified Files:
	Window.f 
Log Message:
dbu: some cosmetic changes

Index: Window.f
===================================================================
RCS file: /cvsroot/win32forth/win32forth/src/Window.f,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Window.f	21 Dec 2004 00:19:09 -0000	1.1
--- Window.f	8 Jan 2005 14:03:48 -0000	1.2
***************
*** 374,391 ****
  
  : create-frame-window  ( -- hwnd )
          0 0                                     \ adjust x,y relative to 0,0
          StartSize:     [ self ]                 \ width, height
          SetRect: WinRect
!         ExWindowStyle: [ self ]
          WindowHasMenu: [ self ]                 \ have menu flag?
!         WindowStyle:   [ self ]                 \ the window style
!         AddrOf: WinRect                      \ make a new rectangle
          call AdjustWindowRectEx ?win-error      \ adjust the window
          ^base                                   \ creation parameters
          appInst                                 \ program instance
          NULL LoadMenu: [ self ]                 \ menu
          ParentWindow:  [ self ]                 \ parent window handle
!         Bottom: WinRect  Top: WinRect -   \ adjusted height
!          Right: WinRect Left: WinRect -   \ adjusted  width
          StartPos:      [ self ] swap            \ y, x starting position
          WindowStyle:   [ self ]                 \ the window style
--- 374,396 ----
  
  : create-frame-window  ( -- hwnd )
+ 
+ 	\ calc window rect
          0 0                                     \ adjust x,y relative to 0,0
          StartSize:     [ self ]                 \ width, height
          SetRect: WinRect
! 
!         ExWindowStyle: [ self ]                 \ extended window style
          WindowHasMenu: [ self ]                 \ have menu flag?
!         WindowStyle:   [ self ]                 \ window style
!         AddrOf: WinRect                         \ make a new rectangle
          call AdjustWindowRectEx ?win-error      \ adjust the window
+ 
+ 	\ create the window
          ^base                                   \ creation parameters
          appInst                                 \ program instance
          NULL LoadMenu: [ self ]                 \ menu
          ParentWindow:  [ self ]                 \ parent window handle
!         Bottom: WinRect  Top: WinRect -         \ adjusted height
!          Right: WinRect Left: WinRect -         \ adjusted  width
          StartPos:      [ self ] swap            \ y, x starting position
          WindowStyle:   [ self ]                 \ the window style
***************
*** 394,398 ****
          ExWindowStyle: [ self ]                 \ extended window style
          Call CreateWindowEx
!         EraseRect: WinRect ;
  
  :M SetClassName: ( adr len -- )
--- 399,404 ----
          ExWindowStyle: [ self ]                 \ extended window style
          Call CreateWindowEx
!         EraseRect: WinRect
! 	;
  
  :M SetClassName: ( adr len -- )
***************
*** 511,521 ****
  :M Start:       ( -- )         \ create a new window object
                  hWnd 0=
!                 if      register-frame-window drop
!                         create-frame-window to hWnd
!                         SW_SHOWNORMAL Show: self
!                         Update: self
!                 else    SetFocus: self
!                 then
!                 ;M
  
  :M Enable:      ( f1 -- )
--- 517,526 ----
  :M Start:       ( -- )         \ create a new window object
                  hWnd 0=
!                 if   register-frame-window drop
!                      create-frame-window to hWnd
!                      SW_SHOWNORMAL Show: self
!                      Update: self
!                 else SetFocus: self
!                 then ;M
  
  :M Enable:      ( f1 -- )
***************
*** 562,566 ****
  :M WM_CREATE
                  On_Init: [ self ]
!                 0 ;M
  
  :M WM_DESTROY
--- 567,572 ----
  :M WM_CREATE
                  On_Init: [ self ]
!                 0
! 		;M
  
  :M WM_DESTROY
***************
*** 820,825 ****
  
  : LoadIconFile	( adr len -- hIcon ) \ load an icon from a ico-file
! 		asciiz >r LR_LOADFROMFILE 0 0 IMAGE_ICON r> NULL call LoadImage ; 
  
  
!  
\ No newline at end of file
--- 826,832 ----
  
  : LoadIconFile	( adr len -- hIcon ) \ load an icon from a ico-file
! 		asciiz >r LR_LOADFROMFILE 0 0 IMAGE_ICON r> NULL call LoadImage ;
  
  
! 
!