[Win32forth-cvs] win32forth/src/console BasicWin.f,1.1,1.2 ConsoleStatbar.f,1.1,1.2 Statbar.f,1.2,1.3 WinBase.f,1.2,1.3

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

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

Modified Files:
	BasicWin.f ConsoleStatbar.f Statbar.f WinBase.f 
Log Message:
Removed usage of REL>ABS and ABS>REL from Win32For.exe and marked both words as deprecated.

Index: WinBase.f
===================================================================
RCS file: /cvsroot/win32forth/win32forth/src/console/WinBase.f,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** WinBase.f	13 Apr 2005 00:09:27 -0000	1.2
--- WinBase.f	1 May 2005 06:27:41 -0000	1.3
***************
*** 90,95 ****
            2DUP  2 - ( to drop CRLF pair)  CR TYPE CR  ( echo to console)
            DROP >R
!           MB_OK MB_ICONWARNING OR  Z" Error" rel>abs
!              R> rel>abs  NULL  Call MessageBox drop
      THEN ;
  
--- 90,95 ----
            2DUP  2 - ( to drop CRLF pair)  CR TYPE CR  ( echo to console)
            DROP >R
!           MB_OK MB_ICONWARNING OR  Z" Error"
!              R> NULL  Call MessageBox drop
      THEN ;
  
***************
*** 130,150 ****
  
  \ defines not in Win32for WINCON.DLL
! TTN_GETDISPINFOA   CONSTANT TTN_NEEDTEXT       \ ANSI version
! TBN_GETBUTTONINFOA CONSTANT TBN_GETBUTTONINFO  \ ANSI version
! TTM_ADDTOOLA       CONSTANT TTM_ADDTOOL        \ ANSI version
! SB_SETTEXTA        CONSTANT SB_SETTEXT         \ ANSI version
! SB_GETTEXTA        CONSTANT SB_GETTEXT         \ ANSI version
! TTM_UPDATETIPTEXTA CONSTANT TTM_UPDATETIPTEXT  \ ANSI version
! TTM_GETTEXTA       CONSTANT TTM_GETTEXT        \ ANSI version
! TTM_ENUMTOOLSA     CONSTANT TTM_ENUMTOOLS      \ ANSI version
  
     \ Strings not defined in Win32for
! \   : STATUSCLASSNAME   Z" msctls_statusbar32" rel>abs ;
! \   : TOOLBARCLASSNAME  Z" ToolbarWindow32"    rel>abs ;
! \   : WC_TREEVIEW       Z" SysTreeView32"      rel>abs ;
! \   : TOOLTIPS_CLASS    Z" tooltips_class32"   rel>abs ;
! \   : PROGRESS_CLASS    Z" msctls_progress32"  rel>abs ;
! \   : TRACKBAR_CLASS    Z" msctls_trackbar32"  rel>abs ;
! \   : UPDOWN_CLASS      Z" msctls_updown32"    rel>abs ;
  
  
--- 130,150 ----
  
  \ defines not in Win32for WINCON.DLL
! \ TTN_GETDISPINFOA   CONSTANT TTN_NEEDTEXT       \ ANSI version
! \ TBN_GETBUTTONINFOA CONSTANT TBN_GETBUTTONINFO  \ ANSI version
! \ TTM_ADDTOOLA       CONSTANT TTM_ADDTOOL        \ ANSI version
! \ SB_SETTEXTA        CONSTANT SB_SETTEXT         \ ANSI version
! \ SB_GETTEXTA        CONSTANT SB_GETTEXT         \ ANSI version
! \ TTM_UPDATETIPTEXTA CONSTANT TTM_UPDATETIPTEXT  \ ANSI version
! \ TTM_GETTEXTA       CONSTANT TTM_GETTEXT        \ ANSI version
! \ TTM_ENUMTOOLSA     CONSTANT TTM_ENUMTOOLS      \ ANSI version
  
     \ Strings not defined in Win32for
! \   : STATUSCLASSNAME   Z" msctls_statusbar32" ;
! \   : TOOLBARCLASSNAME  Z" ToolbarWindow32"    ;
! \   : WC_TREEVIEW       Z" SysTreeView32"      ;
! \   : TOOLTIPS_CLASS    Z" tooltips_class32"   ;
! \   : PROGRESS_CLASS    Z" msctls_progress32"  ;
! \   : TRACKBAR_CLASS    Z" msctls_trackbar32"  ;
! \   : UPDOWN_CLASS      Z" msctls_updown32"    ;
  
  
***************
*** 155,159 ****
  \ appears to be out of date since it works on my NT machine.
  \    For icons, the alternative would be:
! \       0 Z" Toolbar.ico" rel>abs  appInst
  \       Call ExtractIcon  DUP VALUE hIcon  ?WinError
  \    Couldn't find a simple alternative for bitmaps and didn't look
--- 155,159 ----
  \ appears to be out of date since it works on my NT machine.
  \    For icons, the alternative would be:
! \       0 Z" Toolbar.ico"  appInst
  \       Call ExtractIcon  DUP VALUE hIcon  ?WinError
  \    Couldn't find a simple alternative for bitmaps and didn't look
***************
*** 164,168 ****
  \ returns handle to resource
  : GetResource ( a f -- handle)
!    2>R  LR_LOADFROMFILE 0 0 R> R> rel>abs
     NULL  Call LoadImage  DUP ?WinError ;
  
--- 164,168 ----
  \ returns handle to resource
  : GetResource ( a f -- handle)
!    2>R  LR_LOADFROMFILE 0 0 R> R> 
     NULL  Call LoadImage  DUP ?WinError ;
  
***************
*** 225,229 ****
  Usage
     StartFrame  ICC_DATE_CLASSES 8  EndFrame
!       rel>abs  Call InitCommonControlsEx  ?WinError  ReclaimFrame
  
  Could also try something like putting the stack frame on the return stack
--- 225,229 ----
  Usage
     StartFrame  ICC_DATE_CLASSES 8  EndFrame
!       Call InitCommonControlsEx  ?WinError  ReclaimFrame
  
  Could also try something like putting the stack frame on the return stack
***************
*** 243,244 ****
--- 243,245 ----
  return to the word that called it.
  ------------------------------------------------------  Comment;
+