[Win32forth-cvs] win32forth/src CALLBACK.f, 1.10, 1.11 GENERIC.F, 1.17, 1.18 Menu.f, 1.5, 1.6

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

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

Modified Files:
	CALLBACK.f GENERIC.F Menu.f 
Log Message:
gah: modified words with local structures to use localalloc:

Index: CALLBACK.f
===================================================================
RCS file: /cvsroot/win32forth/win32forth/src/CALLBACK.f,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** CALLBACK.f	17 May 2007 11:10:21 -0000	1.10
--- CALLBACK.f	27 Jun 2007 07:31:16 -0000	1.11
***************
*** 342,348 ****
  5 proc PeekMessage
  :Noname ( -- )
!         { \ hwnd mess wparm lparm time pt.x pt.y -- }
!         BEGIN  PM_REMOVE 0 0 0 &of hwnd Call PeekMessage
!         WHILE  &of hwnd HandleMessages drop
          REPEAT ; is WINPAUSE
  
--- 342,349 ----
  5 proc PeekMessage
  :Noname ( -- )
!         { | pMsg -- }
!         7 cells LocalAlloc: pMsg
!         BEGIN  PM_REMOVE 0 0 0 pMsg Call PeekMessage
!         WHILE  pMsg HandleMessages drop
          REPEAT ; is WINPAUSE
  

Index: Menu.f
===================================================================
RCS file: /cvsroot/win32forth/win32forth/src/Menu.f,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** Menu.f	28 Apr 2007 10:12:49 -0000	1.5
--- Menu.f	27 Jun 2007 07:31:16 -0000	1.6
***************
*** 153,162 ****
                  ;M
  
! :M Track:       { x y win-handle -- }
                  hmenu -1 <>
                  if      0
                          hmenu
                          Call GetSubMenu >r
!                         &of x              \ ClientToScreen begin here
                          win-handle      \ convert relative to absolute coords
                          Call ClientToScreen drop
--- 153,163 ----
                  ;M
  
! :M Track:       { win-handle | point -- }
!                 2 cells localalloc: point swap point 2!
                  hmenu -1 <>
                  if      0
                          hmenu
                          Call GetSubMenu >r
!                         point           \ ClientToScreen begin here
                          win-handle      \ convert relative to absolute coords
                          Call ClientToScreen drop
***************
*** 164,169 ****
                          win-handle
                          0
!                         y      \ recover absolute screen coordinates
!                         x
                          [ TPM_LEFTALIGN TPM_RIGHTBUTTON or ] literal
                          r>
--- 165,169 ----
                          win-handle
                          0
!                         point 2@        \ recover absolute screen coordinates
                          [ TPM_LEFTALIGN TPM_RIGHTBUTTON or ] literal
                          r>

Index: GENERIC.F
===================================================================
RCS file: /cvsroot/win32forth/win32forth/src/GENERIC.F,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** GENERIC.F	22 May 2007 07:44:39 -0000	1.17
--- GENERIC.F	27 Jun 2007 07:31:16 -0000	1.18
***************
*** 58,65 ****
  : get-mouse-xy  ( hWnd -- x y)               \ W32F
  \ *G Return the co-ordinates of the mouse pointer in window, hWnd.
!                 { hWnd | CursorPoint.x CursorPoint.y -- x y }
!                 &of CursorPoint.x      Call GetCursorPos   drop
!                 &of CursorPoint.x hWnd Call ScreenToClient drop
!                 CursorPoint.x CursorPoint.y  ;
  
  in-system
--- 58,66 ----
  : get-mouse-xy  ( hWnd -- x y)               \ W32F
  \ *G Return the co-ordinates of the mouse pointer in window, hWnd.
!                 { hWnd | CursorPoint -- x y }
!                 2 cells localalloc: CursorPoint
!                 CursorPoint      Call GetCursorPos   drop
!                 CursorPoint hWnd Call ScreenToClient drop
!                 CursorPoint 2@ swap ;
  
  in-system