[Win32forth-cvs] win32forth/src GENERIC.F,1.6,1.7 Window.f,1.9,1.10

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

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

Modified Files:
	GENERIC.F Window.f 
Log Message:
gah: Some optimizations and documenting

Index: Window.f
===================================================================
RCS file: /cvsroot/win32forth/win32forth/src/Window.f,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** Window.f	25 Jan 2006 11:10:53 -0000	1.9
--- Window.f	26 Jan 2006 11:20:49 -0000	1.10
***************
*** 469,473 ****
  \ ** (&PS ivar) and the window device context (DC ivar) are initialized. \n
  \ ** Check ps_fErase in your method to see if the background of the window should
! \ ** be drawn and use ps_left, ps_top, ps_right and ps_bottom to see whitch part of
  \ ** the window should be painted. \n
  \ ** Default does nothing.
--- 469,473 ----
  \ ** (&PS ivar) and the window device context (DC ivar) are initialized. \n
  \ ** Check ps_fErase in your method to see if the background of the window should
! \ ** be drawn and use ps_left, ps_top, ps_right and ps_bottom to see which part of
  \ ** the window should be painted. \n
  \ ** Default does nothing.
***************
*** 863,867 ****

  : LoadIconFile  ( adr len -- hIcon ) \ w32f
! \ *G Load an icon from a icon file.
          asciiz >r LR_LOADFROMFILE 0 0 IMAGE_ICON r>
          NULL call LoadImage ;
--- 863,867 ----

  : LoadIconFile  ( adr len -- hIcon ) \ w32f
! \ *G Load an icon from an icon file.
          asciiz >r LR_LOADFROMFILE 0 0 IMAGE_ICON r>
          NULL call LoadImage ;

Index: GENERIC.F
===================================================================
RCS file: /cvsroot/win32forth/win32forth/src/GENERIC.F,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** GENERIC.F	26 Dec 2005 09:28:23 -0000	1.6
--- GENERIC.F	26 Jan 2006 11:20:49 -0000	1.7
***************
*** 40,53 ****
  in-application

! \ Linked list, to hold all window objects
  VARIABLE windows-link
           windows-link OFF

! \ Linked list, to hold all dialog objects
  VARIABLE dialog-link
           dialog-link  OFF

  \ Normally wRect is called by methods and : definitions inside generic-window, however the
! \ original global object is used by ResgistryWindowPos.f in the Libs folder so we define it
  \ as an alias for backward compatibility.
  ' TempRect Alias wRect
--- 40,54 ----
  in-application

! \ Linked list, to hold all dictionary window objects.
  VARIABLE windows-link
           windows-link OFF

! \ Linked list, to hold all modeless dialog, Frame window and MDI child window objects
! \ that respond to dialog messages.
  VARIABLE dialog-link
           dialog-link  OFF

  \ Normally wRect is called by methods and : definitions inside generic-window, however the
! \ original global object is used by Lib\RegistryWindowPos.f so we define it
  \ as an alias for backward compatibility.
  ' TempRect Alias wRect
***************
*** 116,120 ****

  :M Classinit:   ( -- )
! \ *G Init the class
                  ClassInit: super
                  0 to hWnd turnkeyed? 0=  \ only dynamic windows can be used in a
--- 117,121 ----

  :M Classinit:   ( -- )
! \ *G Initialise the class.
                  ClassInit: super
                  0 to hWnd turnkeyed? 0=  \ only dynamic windows can be used in a
***************
*** 123,139 ****

  :M GetHandle:   ( -- hWnd )
! \ *G Get the window handle
                  hWnd ;M

  :M PutHandle:   ( hWnd -- )
! \ *G Set the window handle
                  to hWnd ;M

  :M ZeroWindow:  ( -- )
! \ *G Clear the window handle
                  0 to hWnd ;M

  :M DestroyWindow: ( -- )
! \ *G Destroy the window
                  hWnd
                  if   hWnd Call DestroyWindow ?win-error
--- 124,141 ----

  :M GetHandle:   ( -- hWnd )
! \ *G Get the window handle.
                  hWnd ;M

  :M PutHandle:   ( hWnd -- )
! \ *G Set the window handle. Normally handled by the system.
                  to hWnd ;M

  :M ZeroWindow:  ( -- )
! \ *G Clear the window handle. Normally handled by the system. At start-up all window
! \ ** objects are zeroed automatically.
                  0 to hWnd ;M

  :M DestroyWindow: ( -- )
! \ *G Destroy the window. The handle is always zero after executing this method.
                  hWnd
                  if   hWnd Call DestroyWindow ?win-error
***************
*** 142,150 ****

  :M Close:       ( -- )
! \ *G Close the window
                  DestroyWindow: self ;M

  :M Paint:       ( -- )
! \ *G force window repaint
                  hWnd
                  if   1 0 hWnd Call InvalidateRect ?win-error
--- 144,152 ----

  :M Close:       ( -- )
! \ *G Close the window.
                  DestroyWindow: self ;M

  :M Paint:       ( -- )
! \ *G Force window repaint. A WM_PAINT message is posted to the message queue.
                  hWnd
                  if   1 0 hWnd Call InvalidateRect ?win-error
***************
*** 467,471 ****

  :M SetDlgItemFocus: ( id -- )
! \ *G Set the focus to the control (id) in the window
                  GetDlgItem: self Call SetFocus drop ;M

--- 469,473 ----

  :M SetDlgItemFocus: ( id -- )
! \ *G Set the focus to the control (id) in the window.
                  GetDlgItem: self Call SetFocus drop ;M

***************
*** 501,505 ****

  :M SetAlign:    ( flag id -- )          \ DEPRECATED
! \ *G Obsolescent Method use SetDlgItemAlign: instead
                  SetDlgItemAlign: self ;M DEPRECATED

--- 503,507 ----

  :M SetAlign:    ( flag id -- )          \ DEPRECATED
! \ *G Obsolescent Method use SetDlgItemAlign: instead.
                  SetDlgItemAlign: self ;M DEPRECATED

***************
*** 568,573 ****
  \ *G End of generic-window class

! : zero-windows  { \ wlink -- }          \ startup the console's menubar
!                 windows-link @          \ clear all menu handles
                  begin   dup
                  while   dup cell+ @ to wlink
--- 570,575 ----
  \ *G End of generic-window class

! : zero-windows  { \ wlink -- }          \ Zero all window handles.
!                 windows-link @
                  begin   dup
                  while   dup cell+ @ to wlink