[Win32forth-cvs] win32forth/apps/Player4 Catalog.f,1.39,1.40

[Jos v.d.V. <jo...@us...>]

Update of /cvsroot/win32forth/win32forth/apps/Player4
In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv8658

Modified Files:
	Catalog.f 
Log Message:
Jos: It became unsafe to use PAD and  NewEditDialog

Index: Catalog.f
===================================================================
RCS file: /cvsroot/win32forth/win32forth/apps/Player4/Catalog.f,v
retrieving revision 1.39
retrieving revision 1.40
diff -C2 -d -r1.39 -r1.40
*** Catalog.f	26 Aug 2006 15:25:30 -0000	1.39
--- Catalog.f	15 Oct 2006 16:08:43 -0000	1.40
***************
*** 563,567 ****
         then
      drop   struct, InlineRecord RecordDef File_name  swap r>
!     CatalogPath FindRelativeName drop >r swap r@ cmove  
      r>   struct, InlineRecord RecordDef Cnt_File_name    c!
   ;
--- 563,567 ----
         then
      drop   struct, InlineRecord RecordDef File_name  swap r>
!     CatalogPath FindRelativeName drop >r swap r@ cmove
      r>   struct, InlineRecord RecordDef Cnt_File_name    c!
   ;
***************
*** 733,738 ****
   ;
  
! : pad$_ok? ( - pad count flag )    pad +null pad count dup 1 maxstring between ;
! : init-dlg ( base adr count - pad base )        pad place pad swap ;
  
  
--- 733,743 ----
   ;
  
! string: dialog$
! 
! : dialog$_ok?   ( - dialog$ count flag )
!                         dialog$ +null dialog$ count dup 1 maxstring between ;
! 
! : init-dlg      ( base adr count - dialog$ base )
!                         dialog$ place dialog$ swap ;
  
  
***************
*** 744,748 ****
  
  : search-records ( base - )
!   s"  artist*album " init-dlg  Start: searchDlg >r pad$_ok?
    over and r> 0> and
          if    "search-records RefreshCatalog
--- 749,753 ----
  
  : search-records ( base - )
!   s"  artist*album " init-dlg  Start: searchDlg >r dialog$_ok?
    over and r> 0> and
          if    "search-records RefreshCatalog
***************
*** 759,766 ****
  NewEditDialog MaximumRandomLevelDlg "Maximum randomlevel" "Enter the maximum number to use:" "Ok" "Cancel" ""
  
- 
  : ask-max-random-level  ( - )
     vadr-config MaximumRandomLevel @ n>tmp$ tmp$ count init-dlg  Start: MaximumRandomLevelDlg drop
!    pad count number?
         if   d>s  vadr-config MaximumRandomLevel !
         else 2drop
--- 764,770 ----
  NewEditDialog MaximumRandomLevelDlg "Maximum randomlevel" "Enter the maximum number to use:" "Ok" "Cancel" ""
  
  : ask-max-random-level  ( - )
     vadr-config MaximumRandomLevel @ n>tmp$ tmp$ count init-dlg  Start: MaximumRandomLevelDlg drop
!    dialog$ count number?
         if   d>s  vadr-config MaximumRandomLevel !
         else 2drop
***************
*** 772,776 ****
  : SetRequestLevel
     vadr-config RequestLevel c@ n>tmp$ tmp$ count init-dlg  Start: RequestLevelDlg drop
!    pad count number?
         if   d>s  vadr-config RequestLevel c!
         else 2drop
--- 776,780 ----
  : SetRequestLevel
     vadr-config RequestLevel c@ n>tmp$ tmp$ count init-dlg  Start: RequestLevelDlg drop
!    dialog$ count number?
         if   d>s  vadr-config RequestLevel c!
         else 2drop