[Win32forth-cvs] win32forth/src Window.f,1.4,1.5

[George H. <geo...@us...>]

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

Modified Files:
	Window.f 
Log Message:
gah: fixed bug in defaulticon: for w32F w/o icons

Index: Window.f
===================================================================
RCS file: /cvsroot/win32forth/win32forth/src/Window.f,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** Window.f	29 Aug 2005 15:56:28 -0000	1.4
--- Window.f	5 Sep 2005 15:51:46 -0000	1.5
***************
*** 3,7 ****
  cr .( Loading Window Class...)
  
! \ Window class         
  
  only forth also definitions
--- 3,7 ----
  cr .( Loading Window Class...)
  
! \ Window class
  
  only forth also definitions
***************
*** 193,197 ****
  \ Temporarily moved here to overcome problem with offset of ints
  : +DialogList  ( -- )           \ link into dialog list
!         (dialoglock) Dialog-link link,        
          self , Dialog-link @ (dialogunlock) to mydialoglink ;
  
--- 193,197 ----
  \ Temporarily moved here to overcome problem with offset of ints
  : +DialogList  ( -- )           \ link into dialog list
!         (dialoglock) Dialog-link link,
          self , Dialog-link @ (dialogunlock) to mydialoglink ;
  
***************
*** 362,366 ****
          4                                                       to wndExtra
          appInst                                                 to hInstance
! 	DefaultIcon:   [ self ]                                 to hIcon 
          DefaultCursor: [ self ] NULL Call LoadCursor            to hCursor
          WHITE_BRUSH                  Call GetStockObject        to hbrBackground
--- 362,366 ----
          4                                                       to wndExtra
          appInst                                                 to hInstance
! 	DefaultIcon:   [ self ]                                 to hIcon
          DefaultCursor: [ self ] NULL Call LoadCursor            to hCursor
          WHITE_BRUSH                  Call GetStockObject        to hbrBackground
***************
*** 423,427 ****
  :M DefaultIcon: ( -- hIcon )            \ return the default icon handle for window
                  101 appInst Call LoadIcon dup 0=
!                 if   100 z" w32fConsole.dll" Call GetModuleHandle Call LoadIcon
                  then ;M
  
--- 423,427 ----
  :M DefaultIcon: ( -- hIcon )            \ return the default icon handle for window
                  101 appInst Call LoadIcon dup 0=
!                 if  drop 100 z" w32fConsole.dll" Call GetModuleHandle Call LoadIcon
                  then ;M