win32forth-cvs — CVS Commit List

[Win32forth-cvs] cg/WinEd/res - New directory

[bob a. <rd...@us...>]

Update of /cvsroot/win32forth/cg/WinEd/res
In directory vz-cvs-4.sog:/tmp/cvs-serv5473/res

Log Message:
Directory /cvsroot/win32forth/cg/WinEd/res added to the repository

[Win32forth-cvs] cg/src/kernel - New directory

[bob a. <rd...@us...>]

Update of /cvsroot/win32forth/cg/src/kernel
In directory vz-cvs-4.sog:/tmp/cvs-serv5402/kernel

Log Message:
Directory /cvsroot/win32forth/cg/src/kernel added to the repository

[Win32forth-cvs] cg/modules - New directory

[bob a. <rd...@us...>]

Update of /cvsroot/win32forth/cg/modules
In directory vz-cvs-4.sog:/tmp/cvs-serv5267/modules

Log Message:
Directory /cvsroot/win32forth/cg/modules added to the repository

[Win32forth-cvs] cg/src - New directory

[bob a. <rd...@us...>]

Update of /cvsroot/win32forth/cg/src
In directory vz-cvs-4.sog:/tmp/cvs-serv5267/src

Log Message:
Directory /cvsroot/win32forth/cg/src added to the repository

[Win32forth-cvs] win32forth/Help/hdb Help.cfg, 1.3, 1.4 HelpCls.tv, 1.3, 1.4 HelpWrd.hdb, 1.7, 1.8 HelpWrd.ndx, 1.7, 1.8 HelpWrd.txt, 1.7, 1.8

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

Update of /cvsroot/win32forth/win32forth/Help/hdb
In directory vz-cvs-4.sog:/tmp/cvs-serv19483

Modified Files:
	Help.cfg HelpCls.tv HelpWrd.hdb HelpWrd.ndx HelpWrd.txt 
Log Message:
Updated hdb files for {: :}

Index: HelpCls.tv
===================================================================
RCS file: /cvsroot/win32forth/win32forth/Help/hdb/HelpCls.tv,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** HelpCls.tv	31 Aug 2010 07:38:44 -0000	1.3
--- HelpCls.tv	1 Mar 2011 21:54:25 -0000	1.4
***************
*** 1,2290 ****
! 0 tvn| CLASSROOT| tvd| 5469|
  1 tvn| -methods-| tvd| 0|
! -2 tvn| CLASSINIT:| tvd| 5470|
! -2 tvn| ~:| tvd| 5471|
! -2 tvn| ADDR:| tvd| 5472|
! -2 tvn| PRINT:| tvd| 5473|
! 1 tvn| OBJECT| tvd| 5474|
  2 tvn| -methods-| tvd| 0|
! -3 tvn| GET:| tvd| 5475|
! -3 tvn| PUT:| tvd| 5476|
[...4551 lines suppressed...]
! -4 tvn| FIELDNAME:| tvd| 8533|
! -4 tvn| GETINT:| tvd| 8534|
! -4 tvn| GETDOUBLE:| tvd| 8535|
! -4 tvn| GETFLOAT:| tvd| 8536|
! -4 tvn| GETSTR:| tvd| 8537|
! -4 tvn| GETBLOB:| tvd| 8538|
! -4 tvn| ISNULL?:| tvd| 8539|
! -4 tvn| NEXTROW:| tvd| 8540|
! -4 tvn| (BIND):| tvd| 8541|
! -4 tvn| BINDINT:| tvd| 8542|
! -4 tvn| BINDDOUBLE:| tvd| 8543|
! -4 tvn| BINDFLOAT:| tvd| 8544|
! -4 tvn| BINDSTR:| tvd| 8545|
! -4 tvn| BINDBLOB:| tvd| 8546|
! 1 tvn| STRING| tvd| 8552|
  2 tvn| -methods-| tvd| 0|
! -3 tvn| GET:| tvd| 8553|
! -3 tvn| PUT:| tvd| 8554|
! -3 tvn| ADD:| tvd| 8555|
! -3 tvn| APPEND:| tvd| 8556|

Index: Help.cfg
===================================================================
RCS file: /cvsroot/win32forth/win32forth/Help/hdb/Help.cfg,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** Help.cfg	8 Aug 2009 19:02:55 -0000	1.3
--- Help.cfg	1 Mar 2011 21:54:25 -0000	1.4
***************
*** 3,7 ****
  [WindowW] 1019
  [WindowH] 708
! [SplitterV] 206
  [SplitterH] 112
    
\ No newline at end of file
--- 3,7 ----
  [WindowW] 1019
  [WindowH] 708
! [SplitterV] 210
  [SplitterH] 112
    
\ No newline at end of file

Index: HelpWrd.txt
===================================================================
RCS file: /cvsroot/win32forth/win32forth/Help/hdb/HelpWrd.txt,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** HelpWrd.txt	31 Aug 2010 07:38:44 -0000	1.7
--- HelpWrd.txt	1 Mar 2011 21:54:25 -0000	1.8
***************
*** 1447,1453 ****
  CREATE USERCONFIG$ 
  BYTES &PS 
  : (CLASSINIT) ( -- ) 
  : (CLASSINIT) ( n1 -- ) 
- : (CLASSINIT) ( x y width height -- ) 
  CONSTANT 1/1 
  CONSTANT 1/2 
--- 1447,1453 ----
  CREATE USERCONFIG$ 
  BYTES &PS 
[...8450 lines suppressed...]
- : OPEN-DIALOG2 ( filterindx filenam diradr titleadr specadr owner -- filename ) 
- : RUN-DIALOG ( owner_handle dialog-func-cfa -- a1 ) 
- : SAVE-DIALOG ( filename diraddr titleaddr specaddr owner -- filename ) 
- : SAVE-DIALOG2 ( filterindx filename diraddr titleaddr specaddr owner -- filename ) 
- :M SETDIR: ( a1 n1 -- ) 
- \ set the dialog directory string
- :M SETFILTER: ( a1 n1 -- ) 
- \ set new file filter spec
- :M SETTITLE: ( a1 n1 -- ) 
- :M START2: ( filterindex owner_handle -- a1 ) 
- :M START2: ( filterindex owner_handle -- a1 ) 
- :M START2: ( filterindex owner_handle -- a1 ) 
- :M START: ( owner_handle -- a1 ) 
- :M START: ( owner_handle -- a1 ) 
- :M START: ( owner_handle -- a1 ) 
- BYTES SZDIR 
- BYTES SZFILE 
- INT SZFILTER 
- INT SZTITLE 
--- 6831,6832 ----

Index: HelpWrd.hdb
===================================================================
RCS file: /cvsroot/win32forth/win32forth/Help/hdb/HelpWrd.hdb,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
Binary files /tmp/cvsY18ALH and /tmp/cvsFzZzXd differ

Index: HelpWrd.ndx
===================================================================
RCS file: /cvsroot/win32forth/win32forth/Help/hdb/HelpWrd.ndx,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
Binary files /tmp/cvsRizGEI and /tmp/cvstuqQSe differ

[Win32forth-cvs] win32forth/Help/html w32f-HelpOthers.htm, 1.2, 1.3 w32f-HelpPresent.htm, 1.2, 1.3 w32f-locals.htm, 1.2, 1.3 w32f-memory.htm, 1.1, 1.2

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

Update of /cvsroot/win32forth/win32forth/Help/html
In directory vz-cvs-4.sog:/tmp/cvs-serv18263

Modified Files:
	w32f-HelpOthers.htm w32f-HelpPresent.htm w32f-locals.htm 
	w32f-memory.htm 
Log Message:
Added documentation for {: :} locals and minor corrections

Index: w32f-locals.htm
===================================================================
RCS file: /cvsroot/win32forth/win32forth/Help/html/w32f-locals.htm,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** w32f-locals.htm	8 Aug 2009 19:02:55 -0000	1.2
--- w32f-locals.htm	1 Mar 2011 21:52:06 -0000	1.3
***************
*** 9,17 ****
  <h1>Local variables (or named input parameters)</h2>
  
! <p>Thought including the ANS
! standard LOCALS word set, W32F also implement a more useful set (ported from
  the Macintosh Forth system Yerkes, formerly Neon). The ANSI Standard
  &quot;Local&quot; is similar to what are called &quot;args&quot; in this
! documentation, except for reversed order. </p>
  
  <h2>Syntax</h2>
--- 9,19 ----
  <h1>Local variables (or named input parameters)</h2>
  
! <p>Though including the ANS
! standard LOCALS word set, W32F also implement a more useful set (originally ported from
  the Macintosh Forth system Yerkes, formerly Neon). The ANSI Standard
  &quot;Local&quot; is similar to what are called &quot;args&quot; in this
! documentation, except for reversed order. W32F also supports (since V6.15.01)
!  the proposed new 200X  standard locals extension, which is similar to the Yerkes
! system except {: and :} replace { and }. </p>
  
  <h2>Syntax</h2>
***************
*** 27,58 ****
  
  <p>You can have 0 or more args or
! locals up to a total of 12. The <code>--</code> and <code>}</code> are required parts of the syntax.
  Anything between <code>--</code> and <code>}</code> is treated as a comment and does
  not do anything. The following are all valid argument declarations: </p>
  
! <pre>    { -- }                    \ does nothing
!     { arg -- }                \ one input argument
!     { \ local -- }            \ one local (not initialized!)
!     { arg \ local -- }        \ one arg and one local
!     { arg1 arg2 -- result }   \ two args </pre></blockquote>
  
  <p>The args and locals are similar to
  &quot;values&quot;, in the sense that the value of the current arg or local is
  pushed on the stack during execution of a definition when the name is
! encountered. The content of an arg or local may be changed by using <code>TO</code> or <code>+TO</code> . </p>
  
  <h2>Restrictions</h2>
  
  <ol start=1 type=1>
!  <li>Left brace '<code>{</code>' must be first word if used in a <code>:M</code> method definition. </li>
!  <li>Total numbor of args and locals is limited to 12. </li>
   <li>Only ordinary (single cell) numbers are supported. Neither Double numbers nor
       floating point numbers are supported. <code>LOCALALLOC:</code>
       can be used for Doubles, Floats and strings. </li>
   <li>Locals are not initialized. </li>
-  <li>Names cannot begin with '\' '-' or '}' </li>
   <li>A definition may have only one occurrence
!      of the use of either <code>{</code> or <code>LOCALS|</code> .
!      If one is used in a definition, the other may NOT be used! </li>
   <li>Locals can't be declared inside of control structures. </li>
   <li>Only the return address should be on the
--- 29,69 ----
  
  <p>You can have 0 or more args or
! locals up to a total of 12. The  <code>}</code> or <code>:}</code> is a required part of the syntax.
  Anything between <code>--</code> and <code>}</code> is treated as a comment and does
  not do anything. The following are all valid argument declarations: </p>
  
! <pre>    { }                         \ does nothing
!     { -- }                      \ does nothing
!     { arg -- }                  \ one input argument
!     { | local -- }              \ one local (not initialized!)
!     { arg | local -- }          \ one arg and one local
!     { arg1 arg2 -- result }     \ two args
!     {: :}                       \ does nothing
!     {: -- :}                    \ does nothing
!     {: arg -- :}                \ one input argument
!     {: | local -- :}            \ one local (not initialized!)
!     {: arg | local -- :}        \ one arg and one local
!     {: arg1 arg2 -- result :}   \ two args
!     { \ local -- }              \ one local (not initialized!)
!     { arg \ local -- }          \ one arg and one local
! </pre></blockquote>
  
  <p>The args and locals are similar to
  &quot;values&quot;, in the sense that the value of the current arg or local is
  pushed on the stack during execution of a definition when the name is
! encountered. The content of an arg or local may be changed by using <code>TO</code> or <code>+TO</code> . The older <code>\</code> seperator cannot be used with <code>{:</code> and <code>:}</code> which only accepts <code>|</code> . Also <code>{</code> must be terminated with <code>}</code> , while <code>{:</code> must be temrninated with <code>:}</code></p>
  
  <h2>Restrictions</h2>
  
  <ol start=1 type=1>
!  <li>Left brace '<code>{</code>' or '<code>{:</code>' must be the first word if used in a <code>:M</code> method definition. </li>
!  <li>Total numbor of args and locals is limited to 16. </li>
   <li>Only ordinary (single cell) numbers are supported. Neither Double numbers nor
       floating point numbers are supported. <code>LOCALALLOC:</code>
       can be used for Doubles, Floats and strings. </li>
   <li>Locals are not initialized. </li>
   <li>A definition may have only one occurrence
!      of the use of any of <code>{</code> , <code>{:</code>  or <code>LOCALS|</code> .
!      If one is used in a definition, the others may NOT be used! </li>
   <li>Locals can't be declared inside of control structures. </li>
   <li>Only the return address should be on the

Index: w32f-HelpPresent.htm
===================================================================
RCS file: /cvsroot/win32forth/win32forth/Help/html/w32f-HelpPresent.htm,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** w32f-HelpPresent.htm	28 May 2008 04:01:07 -0000	1.2
--- w32f-HelpPresent.htm	1 Mar 2011 21:52:06 -0000	1.3
***************
*** 31,36 ****
   <li><img border=0 width=16 height=18
        src="../Res/Hwww.bmp"> icon
!      means an external link that will take you to the wordlwide web (need an
!      internet connexion) </li>
  </ul>
  
--- 31,36 ----
   <li><img border=0 width=16 height=18
        src="../Res/Hwww.bmp"> icon
!      means an external link that will take you to the wordlwide web (needs an
!      internet connection) </li>
  </ul>
  

Index: w32f-memory.htm
===================================================================
RCS file: /cvsroot/win32forth/win32forth/Help/html/w32f-memory.htm,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** w32f-memory.htm	15 May 2008 07:36:49 -0000	1.1
--- w32f-memory.htm	1 Mar 2011 21:52:06 -0000	1.2
***************
*** 23,29 ****
  handle result flags, except for <code>REALLOC</code>.</p>
  
! <p><code>MALLOC    ( n -- addr )</code> allocate n bytes of heap memory, at addr</p>
! <p><code>REALLOC   ( n addr -- addr' flag )</code> resize a previously allocated block of memory to
! the new size n - n may be less or more than previously allocated - return possibly new
  address addr' and flag=0 if success</p>
  <p><code>RELEASE   ( addr -- )</code> release the previously allocated memory block</p>
--- 23,29 ----
  handle result flags, except for <code>REALLOC</code>.</p>
  
! <p><code>MALLOC    ( u -- addr )</code> allocate n bytes of heap memory, at addr</p>
! <p><code>REALLOC   ( u addr -- addr' flag )</code> resize a previously allocated block of memory to
! the new size u - u may be less or more than previously allocated - return possibly new
  address addr' and flag=0 if success</p>
  <p><code>RELEASE   ( addr -- )</code> release the previously allocated memory block</p>
***************
*** 33,39 ****
  <h2>ANS heap memory management</h2>
  
! <p><code>ALLOCATE  ( n -- addr flag )</code> allocate n bytes of memory, give addr and flag=0 if success</p>
! <p><code>RESIZE    ( a1 n1 -- a2 flag )</code> resize memory at addr1 to n1 bytes, return possibly new
! address a2 and flag=0 if success</p>
  <p><code>FREE      ( addr -- flag )</code> release memory, flag=0 if success</p>
  
--- 33,39 ----
  <h2>ANS heap memory management</h2>
  
! <p><code>ALLOCATE  ( u -- addr flag )</code> allocate n bytes of memory, give addr and flag=0 if success</p>
! <p><code>RESIZE    ( addr1 u -- addr2 flag )</code> resize memory at addr1 to u bytes, return possibly new
! address addr2 and flag=0 if success</p>
  <p><code>FREE      ( addr -- flag )</code> release memory, flag=0 if success</p>
  

Index: w32f-HelpOthers.htm
===================================================================
RCS file: /cvsroot/win32forth/win32forth/Help/html/w32f-HelpOthers.htm,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** w32f-HelpOthers.htm	28 May 2008 04:01:07 -0000	1.2
--- w32f-HelpOthers.htm	1 Mar 2011 21:52:06 -0000	1.3
***************
*** 74,78 ****
  important unless you have defined a particular word more than once. Also you
  cannot get help about words that cannot be found in dictionary searches, such
! as &quot;hidden&quot; words or methods in classes. One advantage of theese
  tools, however, is that they can find information about any word that is
  currently loaded (conversely, the present help system knows only the words that
--- 74,78 ----
  important unless you have defined a particular word more than once. Also you
  cannot get help about words that cannot be found in dictionary searches, such
! as &quot;hidden&quot; words or methods in classes. One advantage of these
  tools, however, is that they can find information about any word that is
  currently loaded (conversely, the present help system knows only the words that

[Win32forth-cvs] win32forth/src EXCEPTIO.F,1.9,1.10

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

Update of /cvsroot/win32forth/win32forth/src
In directory vz-cvs-4.sog:/tmp/cvs-serv17483

Modified Files:
	EXCEPTIO.F 
Log Message:
Spelling correction

Index: EXCEPTIO.F
===================================================================
RCS file: /cvsroot/win32forth/win32forth/src/EXCEPTIO.F,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** EXCEPTIO.F	31 Oct 2007 18:51:39 -0000	1.9
--- EXCEPTIO.F	1 Mar 2011 21:50:02 -0000	1.10
***************
*** 348,352 ****
                  r> @             over eip !           \ point at docol
                  THROW_WINEXCEPT  over ebx !           \ exception to top of stack for throw
!                 UP@ over edx !                        \ restore UP form Thread Local Storage
                  drop EXCEPTION_CONTINUE_EXECUTION  ;  \ attempt recovery
  
--- 348,352 ----
                  r> @             over eip !           \ point at docol
                  THROW_WINEXCEPT  over ebx !           \ exception to top of stack for throw
!                 UP@ over edx !                        \ restore UP from Thread Local Storage
                  drop EXCEPTION_CONTINUE_EXECUTION  ;  \ attempt recovery
  

[Win32forth-cvs] win32forth/src/kernel fkernel.f,1.68,1.69

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

Update of /cvsroot/win32forth/win32forth/src/kernel
In directory vz-cvs-4.sog:/tmp/cvs-serv13394

Modified Files:
	fkernel.f 
Log Message:
Added proposed 200X {: :} loocals syntax

Index: fkernel.f
===================================================================
RCS file: /cvsroot/win32forth/win32forth/src/kernel/fkernel.f,v
retrieving revision 1.68
retrieving revision 1.69
diff -C2 -d -r1.68 -r1.69
*** fkernel.f	21 Dec 2010 19:55:28 -0000	1.68
--- fkernel.f	1 Mar 2011 21:43:26 -0000	1.69
***************
*** 5351,5355 ****
                  REPEAT  NIP TRUE ;
  
! |: BLNEXTWORD   ( -- addr ln )  \ check for next word, if fails closing } is missing
                  BL NEXTWORD 0= THROW_LOCALSNO} ?THROW
                  UPPERCASE COUNT ;
--- 5351,5355 ----
                  REPEAT  NIP TRUE ;
  
! |: BLNEXTWORD   ( -- addr ln )  \ check for next word, it fails if closing } or :} is missing
                  BL NEXTWORD 0= THROW_LOCALSNO} ?THROW
                  UPPERCASE COUNT ;
***************
*** 5376,5379 ****
--- 5376,5399 ----
          ; IMMEDIATE
  
+ : {:    ( -- )  \ begin local variable usage in the form;
+                 \ {: initedloc1 initedloc2 \ uninitedloc3 -- comments :}
+         LOCALS-INIT
+         BEGIN BLNEXTWORD                       \ get next word
+               2DUP S" --" STR= >R              \ as in {: [...] -- ...
+               2DUP S" :}"  STR= R> OR INVERT   \ as in {: [...] } ...
+         WHILE                                  \ if neither, then not done
+               2DUP S" |" STR= INVERT           \ is it {: [...] | ...
+               IF {LOCAL}                       \ no, it's a local
+               ELSE 2DROP 0 TO LOCFLG THEN      \ onto uninited locals
+         REPEAT
+ 
+         BEGIN                                  \ here at ... -- or ... }
+               S" :}" STR= INVERT
+         WHILE
+               BLNEXTWORD                       \ skip until we see ... }
+         REPEAT
+         PARMS,                                 \ compile runtime code (equiv of 0 0 (LOCAL))
+         ; IMMEDIATE
+ 
  : LOCALS|       ( -- )                         \ ANS standard locals
          BEGIN BLNEXTWORD

[Win32forth-cvs] win32forth/src/kernel fkernel.f,1.67,1.68

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

Update of /cvsroot/win32forth/win32forth/src/kernel
In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv13499

Modified Files:
	fkernel.f 
Log Message:
Added PARSE-NAME

Index: fkernel.f
===================================================================
RCS file: /cvsroot/win32forth/win32forth/src/kernel/fkernel.f,v
retrieving revision 1.67
retrieving revision 1.68
diff -C2 -d -r1.67 -r1.68
*** fkernel.f	26 Aug 2010 08:12:17 -0000	1.67
--- fkernel.f	21 Dec 2010 19:55:28 -0000	1.68
***************
*** 2616,2620 ****
  
  \ WORD doesn't met the ANS-Standard in Win32Forth.
! \ The standrad reqires that a space, not included in the length, must follow
  \ the string. In Win32Forth a NULL follow's the string.
  CODE WORD       ( char "<chars>ccc<char>" -- c-addr ) \ parse the input stream
--- 2616,2620 ----
  
  \ WORD doesn't met the ANS-Standard in Win32Forth.
! \ The standard reqires that a space, not included in the length, must follow
  \ the string. In Win32Forth a NULL follow's the string.
  CODE WORD       ( char "<chars>ccc<char>" -- c-addr ) \ parse the input stream
***************
*** 2685,2689 ****
                  next    c;
  
! CODE PARSE-WORD ( "<spaces>name" -- c-addr u ) \ parse the input stream
                  \ for a string delimited by spaces. Skip all leading spaces.
                  \ Give the string as address and count.
--- 2685,2689 ----
                  next    c;
  
! CODE PARSE-NAME ( "<spaces>name" -- c-addr u ) \ parse the input stream
                  \ for a string delimited by spaces. Skip all leading spaces.
                  \ Give the string as address and count.
***************
*** 2727,2730 ****
--- 2727,2732 ----
                  next    c;
  
+ ' PARSE-NAME ALIAS PARSE-WORD
+ 
  CODE PARSE      ( char "ccc<char>" -- c-addr u ) \ parse the input stream
                  \ for a string delimited by char. Skip ONLY ONE leading char.

[Win32forth-cvs] win32forth/apps/ProMgr ProjectManager.f, 1.20, 1.21

[Ezra B. <ezr...@us...>]

Update of /cvsroot/win32forth/win32forth/apps/ProMgr
In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv13641

Modified Files:
	ProjectManager.f 
Log Message:
Made these apps compilable from IDE

Index: ProjectManager.f
===================================================================
RCS file: /cvsroot/win32forth/win32forth/apps/ProMgr/ProjectManager.f,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** ProjectManager.f	25 Feb 2007 13:58:11 -0000	1.20
--- ProjectManager.f	2 Dec 2010 05:34:42 -0000	1.21
***************
*** 107,111 ****
  \ Odd minor version numbers are possibly unstable beta releases.
  
! Create ProjectVersion ," 2.01.01"
  
  needs linklist.f
--- 107,111 ----
  \ Odd minor version numbers are possibly unstable beta releases.
  
! Create ProjectVersion ," 2.01.02"
  
  needs linklist.f
***************
*** 1240,1244 ****
          Options SaveSettings
          ProjectManager SaveSettings
!         false promgr-started
          SaveRecentFiles
          SaveRecentFiles
--- 1240,1244 ----
          Options SaveSettings
          ProjectManager SaveSettings
! \        false promgr-started
          SaveRecentFiles
          SaveRecentFiles
***************
*** 1271,1275 ****
  :M ParentWindow: ( -- hwndparent )
          0 ;M
! 
  : add-open-forms  ( -- )
                  clear-status-bar
--- 1271,1275 ----
  :M ParentWindow: ( -- hwndparent )
          0 ;M
! ((
  : add-open-forms  ( -- )
                  clear-status-bar
***************
*** 1291,1295 ****
                       endcase
                  0 ;M
! 
  :M OnWmCommand: ( hwnd msg wparam lparam -- hwnd msg wparam lparam )
          over LOWORD ( command ID ) dup
--- 1291,1295 ----
                       endcase
                  0 ;M
! ))
  :M OnWmCommand: ( hwnd msg wparam lparam -- hwnd msg wparam lparam )
          over LOWORD ( command ID ) dup
***************
*** 1476,1485 ****
  false value comment?
  \ // --   -1   \S
! (         1    )
! ((        2   ))
! /*        4   */
! (*        8   *)
! comment:  16  comment;
! DOC  keep this for adding files like docs  ENDDOC
  
  : +Comment ( n -- )   comment? IF  drop  ELSE  comment? or to comment?  THEN ;
--- 1476,1485 ----
  false value comment?
  \ // --   -1   \S
! \ (         1    )
! \ ((        2   ))
! \ /*        4   */
! \ (*        8   *)
! \ comment:  16  comment;
! \ DOC  keep this for adding files like docs  ENDDOC
  
  : +Comment ( n -- )   comment? IF  drop  ELSE  comment? or to comment?  THEN ;
***************
*** 1676,1685 ****
  
  : delete-item ( -- )   Delete: TheProject ;   IDM_DELETE SetCommand
! 
  : AddForms ( -- ) \ get open forms from ForthForm
                  msg-buffer 0= ?exit     \ shared memory not initialized
                  msg-buffer @ FFORMID <> ?exit       \ ForthForm not running
                  0 WANT_FORMS win32forth-message ;   IDM_ADD_FORMS SetCommand
! 
  Create to$ max-path allot
  
--- 1676,1685 ----
  
  : delete-item ( -- )   Delete: TheProject ;   IDM_DELETE SetCommand
! ((
  : AddForms ( -- ) \ get open forms from ForthForm
                  msg-buffer 0= ?exit     \ shared memory not initialized
                  msg-buffer @ FFORMID <> ?exit       \ ForthForm not running
                  0 WANT_FORMS win32forth-message ;   IDM_ADD_FORMS SetCommand
! ))
  Create to$ max-path allot
  
***************
*** 1818,1822 ****
  : Restore ( -- )   Options RestoreSettings ;                 IDM_RESTORE_SETTINGS SetCommand
  
! : Save ( -- )   Options SaveSettings ;                       IDM_SAVE_SETTINGS SetCommand
  
  : Default ( -- )   Options DefaultSettings ;                 IDM_DEFAULT_SETTINGS SetCommand
--- 1818,1822 ----
  : Restore ( -- )   Options RestoreSettings ;                 IDM_RESTORE_SETTINGS SetCommand
  
! : SaveOps ( -- )   Options SaveSettings ;                       IDM_SAVE_SETTINGS SetCommand
  
  : Default ( -- )   Options DefaultSettings ;                 IDM_DEFAULT_SETTINGS SetCommand
***************
*** 1929,1933 ****
  \+ sysgen           read-path-file
                      Start: ProjectWindow
! \+ sysgen           true promgr-started
                      RestoreRecentFiles
                      6 SetNumber: RecentFiles
--- 1929,1933 ----
  \+ sysgen           read-path-file
                      Start: ProjectWindow
! \ \+ sysgen           true promgr-started
                      RestoreRecentFiles
                      6 SetNumber: RecentFiles
***************
*** 1937,1940 ****
--- 1937,1943 ----
                      ;
  
+ : run-PM        ( -- )
+                 PM
+                 Messageloop ;
  
  [defined] sysgen [IF]
***************
*** 1944,1955 ****
  Initialization-chain Chain-add InitDir
  
! :noname ( -- )
!         init-console
!         if  initialization-chain do-chain  then
!         exception@ if bye then
!         default-application ;   is default-hello
  
          &forthdir count &appdir place
!         0 0 ' PM application Project.exe
          &appdir off
  
--- 1947,1958 ----
  Initialization-chain Chain-add InitDir
  
! \ :noname ( -- )
! \         init-console
! \         if  initialization-chain do-chain  then
! \         exception@ if bye then
! \         default-application ;   is default-hello
  
          &forthdir count &appdir place
!          ' run-PM turnkey Project.exe
          &appdir off
  

[Win32forth-cvs] win32forth/apps/ForthForm CreateToolBar.f, 1.7, 1.8 FORTHFORM.F, 1.24, 1.25 FormMenu.f, 1.5, 1.6 FormPad.f, 1.3, 1.4

[Ezra B. <ezr...@us...>]

Update of /cvsroot/win32forth/win32forth/apps/ForthForm
In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv13413

Modified Files:
	CreateToolBar.f FORTHFORM.F FormMenu.f FormPad.f 
Log Message:
Made these apps compilable from IDE

Index: FORTHFORM.F
===================================================================
RCS file: /cvsroot/win32forth/win32forth/apps/ForthForm/FORTHFORM.F,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -d -r1.24 -r1.25
*** FORTHFORM.F	3 Aug 2008 00:49:04 -0000	1.24
--- FORTHFORM.F	2 Dec 2010 05:32:54 -0000	1.25
***************
*** 120,124 ****
  
  \ adapted from WinEd
! 20209 constant fform_version#  \ 2.02.09
  
  \ Version numbers: v.ww.rr
--- 120,124 ----
  
  \ adapted from WinEd
! 20210 constant fform_version#  \ 2.02.10
  
  \ Version numbers: v.ww.rr
***************
*** 192,211 ****
  \+ withbgnd BkGndImageWindow link-formwindow  \ link
  
! : Start-Win32ForthIDE   ( -- )  \ start  the editor if not already started
!                      editor-present?
! 			if      s" Win32Forth*IDE" "SetToForeground drop
! 			else    s" Win32ForthIDE.exe" PrePend<Home>\
! 				conhndl ExecuteFile
! 			then  ;
! 
! : ffLoadProject   	( -- )       \ start the project manager if not started
!                      s" Win32for.exe" PrePend<Home>\
!                      temp$ place  s"  LoadProject" temp$ +place temp$
!                      exec-cmd drop ;
! 
! : Start-ProjectManager   ( -- )       \ start the project manager if not started
!                      ?promgr-started ?exit
!                      s" Project.exe" PrePend<Home>\
!                      GetHandle: TheMainWindow ExecuteFile ;
  
  : set-base-path   ( -- )
--- 192,211 ----
  \+ withbgnd BkGndImageWindow link-formwindow  \ link
  
! \ : Start-Win32ForthIDE   ( -- )  \ start  the editor if not already started
! \                      editor-present?
! \ 			if      s" Win32Forth*IDE" "SetToForeground drop
! \ 			else    s" Win32ForthIDE.exe" PrePend<Home>\
! \ 				conhndl ExecuteFile
! \ 			then  ;
! \
! \ : ffLoadProject   	( -- )       \ start the project manager if not started
! \                      s" Win32for.exe" PrePend<Home>\
! \                      temp$ place  s"  LoadProject" temp$ +place temp$
! \                      exec-cmd drop ;
! \
! \ : Start-ProjectManager   ( -- )       \ start the project manager if not started
! \                      ?promgr-started ?exit
! \                      s" Project.exe" PrePend<Home>\
! \                      GetHandle: TheMainWindow ExecuteFile ;
  
  : set-base-path   ( -- )
***************
*** 372,376 ****
                  then    ; ' updatewin is doupdate
  
! /* ******************** Specialised words for ForthForm.cfg ************** */
  #IFDEF withbgnd
  create BkGndImage$ 0 , max-path allot-to         \ for user supplied BackGroundImage
--- 372,376 ----
                  then    ; ' updatewin is doupdate
  
! \  ******************** Specialised words for ForthForm.cfg ************** */
  #IFDEF withbgnd
  create BkGndImage$ 0 , max-path allot-to         \ for user supplied BackGroundImage
***************
*** 385,389 ****
  ' SetBackGroundImage alias SetWallpaper  \ for compatibility
  #ENDIF
! /* ************************************************************************* */
  
  : SaveRebar    ( -- )
--- 385,389 ----
  ' SetBackGroundImage alias SetWallpaper  \ for compatibility
  #ENDIF
! \  ************************************************************************* */
  
  : SaveRebar    ( -- )
***************
*** 617,621 ****
  		Repeat	;  is doCloseAllForms
  
! /*   ********************** Main ForthForm Window  *************** */
  
  :Object MainWindow      <Super Window
--- 617,621 ----
  		Repeat	;  is doCloseAllForms
  
! \    ********************** Main ForthForm Window  *************** */
  
  :Object MainWindow      <Super Window
***************
*** 771,775 ****
  			On_Size: self ;m
  
! /*   ***************** Toolbar handlers *********************** */
  
  :M WM_NOTIFY    { h m w l \ hwndfrom -- f }
--- 771,775 ----
  			On_Size: self ;m
  
! \    ***************** Toolbar handlers *********************** */
  
  :M WM_NOTIFY    { h m w l \ hwndfrom -- f }
***************
*** 909,913 ****
                  then    ExitScintillaControl
  \+ sysgen       0 Call PostQuitMessage
! \+ sysgen       false fform-started                 \ set as no longer running
  
                  On_Done: super
--- 909,913 ----
                  then    ExitScintillaControl
  \+ sysgen       0 Call PostQuitMessage
! \ \+ sysgen       false fform-started                 \ set as no longer running
  
                  On_Done: super
***************
*** 935,971 ****
                  ;M
  
! : answer_message   ( -- ) \ if file specified open it
!                 SetForegroundWindow: self
!                 param-buffer count ?dup
!                 if      OpenByExtension
!                 else    drop
!                 then    ;
! 
! : build-form-list   { \ tmp cnt -- }
!                 0 param-buffer !        \ default at no forms
!                 #Forms 0= ?exit
!                 0 to cnt                \ reset
!                 param-buffer cell+ to tmp
!                 #Forms 1+ 1
!                 ?do     i >Link#: FormList
!                         TextFile: [ Data@: FormList ] dup 1+ cnt +
!                         param-max > not                 \ don't exceed buffer
!                         if      tuck tmp place 1+ +to cnt
!                                 1 param-buffer +!       \ increment form count
!                                 tmp count + to tmp
!                         else    2drop
!                         then
!                 loop    ;
! 
! : send-forms    ( -- )
!                 build-form-list 0 FORMS_SENT win32forth-message ;
! 
! :M Win32Forth:  ( h m w l -- )
!                 over case
!                         FF_ACTIVATE      of   answer_message   endof
!                         WANT_FORMS       of   send-forms       endof
!                         Win32Forth: super
!                       endcase
!                 0 ;M
  
  :M PushKey:     ( c -- )
--- 935,971 ----
                  ;M
  
! \ : answer_message   ( -- ) \ if file specified open it
! \                 SetForegroundWindow: self
! \                 param-buffer count ?dup
! \                 if      OpenByExtension
! \                 else    drop
! \                 then    ;
! \
! \ : build-form-list   { \ tmp cnt -- }
! \                 0 param-buffer !        \ default at no forms
! \                 #Forms 0= ?exit
! \                 0 to cnt                \ reset
! \                 param-buffer cell+ to tmp
! \                 #Forms 1+ 1
! \                 ?do     i >Link#: FormList
! \                         TextFile: [ Data@: FormList ] dup 1+ cnt +
! \                         param-max > not                 \ don't exceed buffer
! \                         if      tuck tmp place 1+ +to cnt
! \                                 1 param-buffer +!       \ increment form count
! \                                 tmp count + to tmp
! \                         else    2drop
! \                         then
! \                 loop    ;
! \
! \ : send-forms    ( -- )
! \                 build-form-list 0 FORMS_SENT win32forth-message ;
! \
! \ :M Win32Forth:  ( h m w l -- )
! \                 over case
! \                         FF_ACTIVATE      of   answer_message   endof
! \                         WANT_FORMS       of   send-forms       endof
! \                         Win32Forth: super
! \                       endcase
! \                 0 ;M
  
  :M PushKey:     ( c -- )
***************
*** 974,978 ****
                          'O' +k_control  of      doOpen          endof
                           K_F9           of   SetFocus: Monitor  endof
!                          K_F12          of   ffLoadProject      endof
                           K_F1           of      doFormHelp      endof
                  endcase ;M
--- 974,978 ----
                          'O' +k_control  of      doOpen          endof
                           K_F9           of   SetFocus: Monitor  endof
! \                         K_F12          of   ffLoadProject      endof
                           K_F1           of      doFormHelp      endof
                  endcase ;M
***************
*** 1005,1020 ****
                  ;
  
! : check-if-running ( -- )
!                 ed-ptr
!                 if      ?fform-started
!                         if      CmdLine ?dup
!                                 if      strip-cmdline
!                                 else    drop pad 0
!                                 then    param-buffer place
!                                 0 FF_ACTIVATE win32forth-message
!                                 bye
!                         else    true fform-started    \ set as running
!                         then
!                 then    ;
  
  : show-release-notes        ( -- ) \ show one time only
--- 1005,1020 ----
                  ;
  
! \ : check-if-running ( -- )
! \                 ed-ptr
! \                 if      ?fform-started
! \                         if      CmdLine ?dup
! \                                 if      strip-cmdline
! \                                 else    drop pad 0
! \                                 then    param-buffer place
! \                                 0 FF_ACTIVATE win32forth-message
! \                                 bye
! \                         else    true fform-started    \ set as running
! \                         then
! \                 then    ;
  
  : show-release-notes        ( -- ) \ show one time only
***************
*** 1026,1030 ****
  
  : FForm         ( -- )
! \+ sysgen       check-if-running
                  init-forthform
                  LoadDefaults            \ read default settings in registry
--- 1026,1030 ----
  
  : FForm         ( -- )
! \ \+ sysgen       check-if-running
                  init-forthform
                  LoadDefaults            \ read default settings in registry
***************
*** 1039,1043 ****
  
  : EndForthForm ( -- )
! 	doCloseAllForms  false fform-started  k_bye	;
  
  : ff            ( -- )    \ main executable word
--- 1039,1043 ----
  
  : EndForthForm ( -- )
! 	doCloseAllForms  ( false fform-started  ) k_bye	;
  
  : ff            ( -- )    \ main executable word
***************
*** 1045,1048 ****
--- 1045,1052 ----
                  ['] FForm catch ExitOnError ;
  
+ : run-ff        ( -- )
+                 ff
+                 messageloop ;
+ 
  previous definitions
  
***************
*** 1067,1070 ****
--- 1071,1075 ----
  #ENDIF
  
+ false to sys-warning?
  0 value con
  : ForthConsole  ( -- )
***************
*** 1086,1089 ****
--- 1091,1096 ----
                  then    ;
  
+ true to sys-warning?
+ 
  #IFDEF sysgen
  ' ForthConsole is doForth
***************
*** 1092,1096 ****
  #ENDIF
  
! /* ********************** ForthForm Preferences **************** */
  \ preferences.frm     \ preferences dialog
  
--- 1099,1103 ----
  #ENDIF
  
! \  ********************** ForthForm Preferences **************** */
  \ preferences.frm     \ preferences dialog
  
***************
*** 1140,1144 ****
                      right     of     CheckButton: radAlignRight        endof
                  endcase  ; is doPref
! /* ************************************************************************* */
  
  :NoName       ( -- )  \ shutdown
--- 1147,1151 ----
                      right     of     CheckButton: radAlignRight        endof
                  endcase  ; is doPref
! \  ************************************************************************* */
  
  :NoName       ( -- )  \ shutdown
***************
*** 1228,1233 ****
  \+ sysgen       s" %DIRWin32ForthIDE.exe /B %FILENAME %LINE" browse$ place
  \+ sysgen &forthdir count &appdir place \ create ForthForm.exe in the Win32Forth directory
! 
! \+ sysgen 0 0 ' ff application ForthForm.exe
  
  forthform also
--- 1235,1240 ----
  \+ sysgen       s" %DIRWin32ForthIDE.exe /B %FILENAME %LINE" browse$ place
  \+ sysgen &forthdir count &appdir place \ create ForthForm.exe in the Win32Forth directory
! \+ sysgen consolehiddenboot
! \+ sysgen ' run-ff save ForthForm.exe
  
  forthform also
***************
*** 1240,1242 ****
  
  \s
- That's all folks!
--- 1247,1248 ----

Index: FormMenu.f
===================================================================
RCS file: /cvsroot/win32forth/win32forth/apps/ForthForm/FormMenu.f,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** FormMenu.f	25 Feb 2007 19:04:42 -0000	1.5
--- FormMenu.f	2 Dec 2010 05:32:54 -0000	1.6
***************
*** 48,54 ****
           MenuItem "&Define Menu"     doCreateMenu ;
           :MenuItem mnu_psheet "&Property Form Template" doPropertyForm ;
!          MenuSeparator
!          MenuItem "Win32Forth IDE" Start-Win32ForthIDE ;
!          MENUITEM    "Compile &Project\tF12"             FFLoadProject ;
  
  \         MenuItem "Project Manager " Start-ProjectManager ;
--- 48,54 ----
           MenuItem "&Define Menu"     doCreateMenu ;
           :MenuItem mnu_psheet "&Property Form Template" doPropertyForm ;
! \         MenuSeparator
! \         MenuItem "Win32Forth IDE" Start-Win32ForthIDE ;
! \         MENUITEM    "Compile &Project\tF12"             FFLoadProject ;
  
  \         MenuItem "Project Manager " Start-ProjectManager ;

Index: CreateToolBar.f
===================================================================
RCS file: /cvsroot/win32forth/win32forth/apps/ForthForm/CreateToolBar.f,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** CreateToolBar.f	15 Apr 2007 02:59:51 -0000	1.7
--- CreateToolBar.f	2 Dec 2010 05:32:54 -0000	1.8
***************
*** 737,741 ****
  	r> >Link#: TBList ;
  
! /*
  : WriteDefaultButtonText ( -- )
                  +crlf s" :ToolStrings ButtonText" append&crlf
--- 737,741 ----
  	r> >Link#: TBList ;
  
! ((
  : WriteDefaultButtonText ( -- )
                  +crlf s" :ToolStrings ButtonText" append&crlf
***************
*** 756,760 ****
                  1 +tabs s" ts," append "append s"  Help" append "append +crlf
                  s" ;ToolStrings" append&crlf +crlf ;
! */
  
  : WriteDefaultTooltips ( -- )
--- 756,760 ----
                  1 +tabs s" ts," append "append s"  Help" append "append +crlf
                  s" ;ToolStrings" append&crlf +crlf ;
! ))
  
  : WriteDefaultTooltips ( -- )

Index: FormPad.f
===================================================================
RCS file: /cvsroot/win32forth/win32forth/apps/ForthForm/FormPad.f,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** FormPad.f	27 Dec 2006 18:43:57 -0000	1.3
--- FormPad.f	2 Dec 2010 05:32:54 -0000	1.4
***************
*** 93,100 ****
  
  : ShowSource     ( addr cnt title$ cnt -- )
!                  editor-present?   \ is SciEdit open?
!                  if      ed-filename place             \ pass name through shared memory
!                          copy-clipboard                \ send source to clipboard
!                          0 FF_PASTE editor-message     \ tell SciEdit to paste it
                   else    View: FormPad
                   then    ;
--- 93,100 ----
  
  : ShowSource     ( addr cnt title$ cnt -- )
!                  false \ editor-present?   \ is SciEdit open?
!                  if     \ ed-filename place             \ pass name through shared memory
!                         \ copy-clipboard                \ send source to clipboard
!                         \ 0 FF_PASTE editor-message     \ tell SciEdit to paste it
                   else    View: FormPad
                   then    ;

[Win32forth-cvs] win32forth/src/lib FolderView.f,1.5,1.6

[Ezra B. <ezr...@us...>]

Update of /cvsroot/win32forth/win32forth/src/lib
In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv11803

Modified Files:
	FolderView.f 
Log Message:
Minor mods. EAB

Index: FolderView.f
===================================================================
RCS file: /cvsroot/win32forth/win32forth/src/lib/FolderView.f,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** FolderView.f	31 Jul 2010 06:38:12 -0000	1.5
--- FolderView.f	2 Dec 2010 05:25:32 -0000	1.6
***************
*** 146,152 ****
                     filespec-ext filebuf-ext compare-buf and ;
  
- 0 value hwndSmallIcons           \ handle to imagelist for small icons
- 0 value hwndLargeIcons
- 
  :Class FolderItem           <super Object
  
--- 146,149 ----
***************
*** 154,159 ****
  int iconhandle
  int itemhandle	\ parent handle
- cell bytes index
- 
  \ save information for each individual file
  Record: Win32_Find_Data
--- 151,154 ----
***************
*** 211,215 ****
              0 to iconhandle
              0 to itemhandle
-             0 index !
              ;M
  
--- 206,209 ----
***************
*** 269,272 ****
--- 263,268 ----
  LV_ITEM LvItem
  FolderListView TheView
+ int FolderList
+ int DirList
  int itemindex
  int ThisItem            \ temp pointer to new item
***************
*** 283,294 ****
  int hwndlabel           \ handle to window to display path
  int popup?
  StatusBar ViewStatusBar
  
! 32 1024 * constant max-files
! max-files cell * Pointer FolderList     \ 32k max files shown in a folder
! max-files cell * Pointer DirList        \ 32k max directories shown, 64k total in a listing
  
  max-path 1+ bytes Treepath
! path: thespecs
  
  : rootdir?  { pathstr cnt -- f } \ f = true if path is at root
--- 279,296 ----
  int hwndlabel           \ handle to window to display path
  int popup?
+ int hwndSmallIcons           \ handle to imagelist for small icons
+ int hwndLargeIcons
  StatusBar ViewStatusBar
+ 32 bytes findspecs
+ max-path bytes fullpath$
  
! 32 1024 * constant max-files    \ 32k max files shown in a folder
! max-files cell * constant buffersize
  
  max-path 1+ bytes Treepath
! max-path 2 cells + bytes specbuffer
! 
! : thespecs      ( -- addr  )
!                 specbuffer [ 2 cells ] literal + ;
  
  : rootdir?  { pathstr cnt -- f } \ f = true if path is at root
***************
*** 296,299 ****
--- 298,308 ----
              pathstr cnt + 1- c@ ':' = ;
  
+ : releasebuffers  ( -- )
+                   FolderList ?dup
+                   if    release 0 to FolderList
+                   then  DirList ?dup
+                   if    release 0 to DirList
+                   then  ;
+ 
  : list[]        ( list ndx -- addr )
                  cell under+ cells+ ;
***************
*** 458,464 ****
  :M Start:   ( parent -- )
              Start: super
              FolderList off
!             DirList off
!             ;M
  
  :M On_Init: ( -- )
--- 467,474 ----
  :M Start:   ( parent -- )
              Start: super
+             buffersize malloc to FolderList
+             buffersize malloc to DirList
              FolderList off
!             DirList off ;M
  
  :M On_Init: ( -- )
***************
*** 489,492 ****
--- 499,504 ----
                  0 to #dirs
                  0 to #fls
+                 0 to FolderList
+                 0 to DirList
                  0.0 2to total-size
                  0 to hwndlabel
***************
*** 495,498 ****
--- 507,511 ----
  
  : DisposeTheList ( -- )
+             FolderList 0= ?exit
              FolderList lcount cells bounds
              ?do  i @ dispose
***************
*** 504,518 ****
  :M ~:   ( -- )
          DisposeTheList
!         ;M
  
  :M Close: ( -- )
          DisposeTheList
          DestroyImageLists
          ;M
  
- \ max-path bytes findpath
- 32 bytes findspecs
- max-path bytes fullpath$
- 
  : FindFirstFile ( -- f )
                  TreePath count fullpath$ dup>r place
--- 517,528 ----
  :M ~:   ( -- )
          DisposeTheList
!         releasebuffers ;M
  
  :M Close: ( -- )
          DisposeTheList
+         releasebuffers
          DestroyImageLists
          ;M
  
  : FindFirstFile ( -- f )
                  TreePath count fullpath$ dup>r place

[Win32forth-cvs] win32forth/apps/Win32ForthIDE FORMOBJECT.F, 1.8, 1.9

[Ezra B. <ezr...@us...>]

Update of /cvsroot/win32forth/win32forth/apps/Win32ForthIDE
In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv11238

Modified Files:
	FORMOBJECT.F 
Log Message:
Minor mods. EAB

Index: FORMOBJECT.F
===================================================================
RCS file: /cvsroot/win32forth/win32forth/apps/Win32ForthIDE/FORMOBJECT.F,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** FORMOBJECT.F	11 Jul 2010 02:48:11 -0000	1.8
--- FORMOBJECT.F	2 Dec 2010 05:24:47 -0000	1.9
***************
*** 836,840 ****
                  hwnd call SetCapture drop
  		SingleControl?
! 		if	ButtonID IDM_FORM_BITMAP IDM_FORM_Generic between
                  	if      false ButtonID   CheckButton: FormBar     \ uncheck it
                                	true  IDM_FORM_SELECT CheckButton: FormBar     \ set default
--- 836,840 ----
                  hwnd call SetCapture drop
  		SingleControl?
! 		if	ButtonID IDM_FORM_BITMAP IDM_FORM_TABCONTROL between
                  	if      false ButtonID   CheckButton: FormBar     \ uncheck it
                                	true  IDM_FORM_SELECT CheckButton: FormBar     \ set default

[Win32forth-cvs] win32forth/apps/Win32ForthIDE ProjectWindow.f, 1.8, 1.9

[Ezra B. <ezr...@us...>]

Update of /cvsroot/win32forth/win32forth/apps/Win32ForthIDE
In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv11109

Modified Files:
	ProjectWindow.f 
Log Message:
Minor mods. EAB

Index: ProjectWindow.f
===================================================================
RCS file: /cvsroot/win32forth/win32forth/apps/Win32ForthIDE/ProjectWindow.f,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** ProjectWindow.f	3 Jun 2010 08:56:38 -0000	1.8
--- ProjectWindow.f	2 Dec 2010 05:23:56 -0000	1.9
***************
*** 56,59 ****
--- 56,61 ----
  Label lblInfo1
  Label lblInfo2
+ TextBox txtFindInTree
+ s" After tracking, select list, type text and press enter for quick find" BInfo: txtFindInTree place
  PushButton btnTrack
  PushButton btnGoto
***************
*** 202,205 ****
--- 204,208 ----
  0 value  MethodsList
  0 value  PrivateCodeList
+ 0 Value ActiveList
  
  false value in-class?
***************
*** 217,220 ****
--- 220,224 ----
  hash-table-size cell / 1- constant max-hash-items ( 32k )
  hash-table-size Pointer GrandChildList	\ instance items to be disposed
+ int hwndimage
  
  enum:
***************
*** 246,249 ****
--- 250,256 ----
                  PrivateDataList ;M
  
+ :M PrivateCodeList:   ( -- list )
+                 PrivateCodeList ;M
+ 
  :M GlobalDataList:  ( -- list )
  		GlobalDataList ;M
***************
*** 432,435 ****
--- 439,453 ----
  		then	;
  
+ :M Find:          { addr cnt \  list-item -- } \ searches children for text beginning with addr cnt, scroll child into view if found
+                        ActiveList 0= ?exitm      \ no parent selected
+                        #items: ActiveList 1+ 1
+                        ?do      i >Link#: ActiveList
+                                    Data@: ActiveList to list-item
+                                    getname: list-item cnt addr cnt caps-compare 0=        \ item begins with addr cnt?
+                                    \ note that because the lists are sorted the first entry may not necessarily be the one found
+                                    if   handle: list-item TVGN_FIRSTVISIBLE SelectItem: Self leave
+                                    then
+                         loop    ;M
+ 
  :M SortParentLists:   ( -- )
  \ Sort the content of the lists
***************
*** 477,481 ****
                _classes_		s" Objects & Classes"   new> treelinked-list to ClassesList
                ;
- int hwndimage
  
  : CreateImageList ( -- )    \ create image list for treeview control
--- 495,498 ----
***************
*** 575,582 ****
  		auto-showfile
          else	ItemID: SelectedItem 0<	\ category selected
! 		if	#items: SelectedItem (.) pad place
  			s"  entries" pad +place
  			pad count
! 		else	s" "	\ root item
  		then	SetText: lblInfo1 s" " SetText: lblInfo2
          then	false
--- 592,601 ----
  		auto-showfile
          else	ItemID: SelectedItem 0<	\ category selected
! 		if	SelectedItem to ActiveList
!                         #items: SelectedItem (.) pad place
  			s"  entries" pad +place
  			pad count
! 		else	0 to ActiveList
!                         s" "	\ root item
  		then	SetText: lblInfo1 s" " SetText: lblInfo2
          then	false
***************
*** 809,812 ****
--- 828,832 ----
                  SortParentLists: Self
                  0 to selecteditem
+                 0 to ActiveList
                  s" " SetText: lblInfo1
  		;M
***************
*** 814,817 ****
--- 834,850 ----
  ;object
  
+ : FindInTree    ( addr cnt -- )
+                         Find: NavigatorTree ;
+ 
+ : FITWmChar      ( h m w l obj -- res )
+                 2 pick VK_RETURN  =
+                 if      GetText: [  ]  ?dup  \ get adr,len of edit control text
+                         if      FindInTree
+                         else    drop
+                         then    false           \ we already processed this message
+                 else    drop            \ discard object
+                             true            \ and use default processing
+                 then    ;
+ 
  \ \\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\
  \ \\\\\ Top window pane \\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\
***************
*** 855,858 ****
--- 888,897 ----
  		Handle: TabFont SetFont: lblInfo2
  
+ 		WS_BORDER AddStyle: txtFindInTree
+ 		Self Start: txtFindIntree
+ 		Handle: TabFont SetFont: txtFindInTree
+ 		s" Quick find" SetText: txtFindInTree
+ 		['] FITWmChar SetWmChar: txtFindInTree
+ 
                  ;M
  
***************
*** 861,866 ****
  		0 25 Width Height 75 - Move: NavigatorTree
  
! 		0 0 75 24   Move: btnTrack
! 		77 0 75 24 Move: btnGoto
  
  		0 Height 50 - Width 24 Move: lblInfo1
--- 900,907 ----
  		0 25 Width Height 75 - Move: NavigatorTree
  
! 		0 0 60 20   Move: btnTrack
! 		62 0 60 20 Move: btnGoto
! 
! 		124 0 200 20 Move: txtFindInTree
  
  		0 Height 50 - Width 24 Move: lblInfo1

[Win32forth-cvs] win32forth/apps/Win32ForthIDE ProjectTree.f, 1.25, 1.26

[Ezra B. <ezr...@us...>]

Update of /cvsroot/win32forth/win32forth/apps/Win32ForthIDE
In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv11080

Modified Files:
	ProjectTree.f 
Log Message:
Minor mods. EAB

Index: ProjectTree.f
===================================================================
RCS file: /cvsroot/win32forth/win32forth/apps/Win32ForthIDE/ProjectTree.f,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -d -r1.25 -r1.26
*** ProjectTree.f	3 Jun 2010 08:56:38 -0000	1.25
--- ProjectTree.f	2 Dec 2010 05:23:12 -0000	1.26
***************
*** 1104,1105 ****
--- 1104,1119 ----
  \ The files that are currently added to the project are removed first.
                  true (build-project) ;   IDM_REBUILD_PRJ SetCommand
+ 
+ : add-opened-files { \ thechild -- }
+                 TabFile? ?dup
+                 if      0
+                         do      i GetFileTabChild dup to TheChild
+                                 if	TheChild ActiveCoder <>
+ 					if	GetFileName: TheChild count ".ext-only" nip \ not viewing source?
+ 						if	GetFileName: TheChild count AddFile
+ 						then
+ 					then
+ 				then
+                         loop
+                 then    ; IDM_ADD_OPEN_PRJ SetCommand
+ 

[Win32forth-cvs] win32forth/apps/Win32ForthIDE EdVersion.f, 1.15, 1.16 GroupAction.f, 1.1, 1.2 Main.f, 1.66, 1.67

[Ezra B. <ezr...@us...>]

Update of /cvsroot/win32forth/win32forth/apps/Win32ForthIDE
In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv10857

Modified Files:
	EdVersion.f GroupAction.f Main.f 
Log Message:
Minor mods. EAB

Index: Main.f
===================================================================
RCS file: /cvsroot/win32forth/win32forth/apps/Win32ForthIDE/Main.f,v
retrieving revision 1.66
retrieving revision 1.67
diff -C2 -d -r1.66 -r1.67
*** Main.f	11 Jul 2010 02:48:44 -0000	1.66
--- Main.f	2 Dec 2010 05:22:03 -0000	1.67
***************
*** 240,244 ****
  	tab-index CloseTabFile update ;
  
- 
  : CloseTabsRight	( -- )
  		Begin	tab-index 1+ GetTabCount: OpenfilesTab <
--- 240,243 ----
***************
*** 252,255 ****
--- 251,261 ----
  		Repeat	;
  
+ : CloseAllOthers ( -- )
+                 GetTabCount: OpenFilesTab 1- tab-index >
+                 if      CloseTabsRight
+                 then    tab-index 0>
+                 if      CloseTabsLeft
+                 then    update ;
+ 
  : CompileTabFile	( -- )
  	tab-index GetFileTabChild >r
***************
*** 278,281 ****
--- 284,288 ----
           :MenuItem mnurel "Reload" ReloadTabFile ;
           MenuSeparator
+          :MenuItem mnucae "Close all other files" CloseAllOthers ;
           :MenuItem mnucar "Close all files to right"  CloseTabsRight  ;
           :MenuItem mnucal "Close all files to left"    CloseTabsLeft   ;
***************
*** 285,293 ****
  
  : check-menu-funcs	( -- )
! 			GetTabCount: OpenFilesTab 1- tab-index > Enable: mnucar
! 			tab-index 0> Enable: mnucal
  			tab-index GetFileTabChild >r GetFileType: [ r@ ] FT_SOURCE =
! 			dup Enable: mnucmp
! 			GetFileName: [ r@ ] c@ 0<> and Enable: mnurel
  		        r>drop ;
  
--- 292,301 ----
  
  : check-menu-funcs	( -- )
! 			GetTabCount: OpenFilesTab dup 1- tab-index > Enable: mnucar     \ close all right
! 			1 > Enable: mnucae      \ close all other files
! 			tab-index 0> Enable: mnucal     \ close all left
  			tab-index GetFileTabChild >r GetFileType: [ r@ ] FT_SOURCE =
! 			dup Enable: mnucmp      \ compilable source file
! 			GetFileName: [ r@ ] c@ 0<> and Enable: mnurel   \ reloadable file
  		        r>drop ;
  
***************
*** 667,671 ****
  
                  r> base !
!                 ;
  
  : load-defaults ( -- )
--- 675,679 ----
  
                  r> base !
!                 ; IDM_SAVEDEFAULTS SetCommand
  
  : load-defaults ( -- )
***************
*** 1156,1162 ****
                  GetFileName: self count SetText: super ;M
  
! :M SetURL:      ( zUrl -- )
!                 dup zcount SetFileName: self
!                 SetURL: ChildWindow
                  SetWindowTitle: self ;M
  
--- 1164,1170 ----
                  GetFileName: self count SetText: super ;M
  
! :M SetURL:      ( Url cnt -- )
!                 2dup SetFileName: self
!                 GoURL: ChildWindow
                  SetWindowTitle: self ;M
  
***************
*** 1366,1370 ****
                  temp$ FileNotFound: Frame
                  if   NewHtmlWnd
!                      temp$ count asciiz SetURL: ActiveChild
                  then  Update ;
  
--- 1374,1378 ----
                  temp$ FileNotFound: Frame
                  if   NewHtmlWnd
!                      temp$ count SetURL: ActiveChild
                  then  Update ;
  

Index: EdVersion.f
===================================================================
RCS file: /cvsroot/win32forth/win32forth/apps/Win32ForthIDE/EdVersion.f,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** EdVersion.f	11 Jul 2010 02:47:34 -0000	1.15
--- EdVersion.f	2 Dec 2010 05:22:03 -0000	1.16
***************
*** 349,353 ****
          - Added feature to monitor file system and prompt a reload if a file has been
            modified. Enabled from options dialog
!         - Auto saving of a session also enabled form options dialog. Last active files
            and project now available automatically on startup.
  	- Added MessageBox builder dialog. Really just a port aka copy from BCX. Another example of adding
--- 349,353 ----
          - Added feature to monitor file system and prompt a reload if a file has been
            modified. Enabled from options dialog
!         - Auto saving of a session also enabled from options dialog. Last active files
            and project now available automatically on startup.
  	- Added MessageBox builder dialog. Really just a port aka copy from BCX. Another example of adding
***************
*** 355,357 ****
--- 355,364 ----
          Tuesday, June 22 2010
          - Which tabs are shown is now user configurable, and added a debug dialog ( not shown by default) tab.
+         Tuesday, September 08 2010
+         - Added quick search textbox to Project Navigator. After tracking a project highlight the list to be
+           searched, type text in box and press enter. The entry that begins with the search text will be
+           displayed.
+         - Bug fix (if no form open and any button from Action dialog clicked would cause a crash).
+         Saturday, November 06 2010
+         - Filter specs in the directory tab can now be edited by pressing the control key and clicking the specs tab.
  

Index: GroupAction.f
===================================================================
RCS file: /cvsroot/win32forth/win32forth/apps/Win32ForthIDE/GroupAction.f,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** GroupAction.f	28 Apr 2008 05:17:17 -0000	1.1
--- GroupAction.f	2 Dec 2010 05:22:03 -0000	1.2
***************
*** 52,55 ****
--- 52,56 ----
  
  : group-action  { id obj -- }
+                 ActiveForm 0= ?exit
                  id
                  case

[Win32forth-cvs] win32forth/apps/Win32ForthIDE CommandID.f, 1.23, 1.24 EdFilePane.f, 1.5, 1.6 EdMenu.f, 1.32, 1.33

[Ezra B. <ezr...@us...>]

Update of /cvsroot/win32forth/win32forth/apps/Win32ForthIDE
In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv10700

Modified Files:
	CommandID.f EdFilePane.f EdMenu.f 
Log Message:
Minor mods. EAB

Index: CommandID.f
===================================================================
RCS file: /cvsroot/win32forth/win32forth/apps/Win32ForthIDE/CommandID.f,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -d -r1.23 -r1.24
*** CommandID.f	11 Jul 2010 02:45:17 -0000	1.23
--- CommandID.f	2 Dec 2010 05:20:58 -0000	1.24
***************
*** 93,96 ****
--- 93,97 ----
  NewID IDM_SAVEDEFAULT_SESSION
  NewID IDM_LOADDEFAULT_SESSION
+ NewID IDM_SAVEDEFAULTS
  
  \ Win32Forth menu

Index: EdMenu.f
===================================================================
RCS file: /cvsroot/win32forth/win32forth/apps/Win32ForthIDE/EdMenu.f,v
retrieving revision 1.32
retrieving revision 1.33
diff -C2 -d -r1.32 -r1.33
*** EdMenu.f	11 Jul 2010 02:46:44 -0000	1.32
--- EdMenu.f	2 Dec 2010 05:20:58 -0000	1.33
***************
*** 175,178 ****
--- 175,179 ----
                   MenuItem         "IDE &Preferences"     IDM_PREFERENCES DoCommand ;
                  MenuSeparator
+                  MenuItem         "Save Defaults now" IDM_SAVEDEFAULTS DoCommand ;
                   MenuItem         "Save Default Session" IDM_SAVEDEFAULT_SESSION DoCommand ;
                   MenuItem         "Reload Default Session" IDM_LOADDEFAULT_SESSION DoCommand ;

Index: EdFilePane.f
===================================================================
RCS file: /cvsroot/win32forth/win32forth/apps/Win32ForthIDE/EdFilePane.f,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** EdFilePane.f	10 Apr 2009 16:37:04 -0000	1.5
--- EdFilePane.f	2 Dec 2010 05:20:58 -0000	1.6
***************
*** 3,7 ****
  needs filewindow.frm
  
! NewEditDialog AddFilterDialog "Add Filter" "Enter filter e.g Forth Files (*.f;*.frm):" "&Ok" "Cancel" ""
  NewEditDialog DupeFileDialog "Duplicate File" "Enter new file name:" "&Duplicate" "&Cancel" ""
  NewEditDialog RenameFileDialog "Rename File" "Enter new name:" "&Rename"  "&Cancel" ""
--- 3,7 ----
  needs filewindow.frm
  
! NewEditDialog AddFilterDialog "Add/Edit Filter" "Enter filter e.g Forth Files (*.f;*.frm):" "&Ok" "Cancel" ""
  NewEditDialog DupeFileDialog "Duplicate File" "Enter new file name:" "&Duplicate" "&Cancel" ""
  NewEditDialog RenameFileDialog "Rename File" "Enter new name:" "&Rename"  "&Cancel" ""
***************
*** 21,24 ****
--- 21,25 ----
  load-bitmap dupebmp "dupe.bmp"
  
+ string: tmp-buf
  : AdjustWindowSize      { width height winhndl -- }
                  SWP_SHOWWINDOW SWP_NOZORDER or SWP_NOMOVE or
***************
*** 40,47 ****
                  then    ;
  
! : add-filter    ( -- )
!                 here dup off frmfileWindow Start: AddFilterDialog
!                 if      here count 2dup parse-filters nip 0= abort" Error in filter string!"
!                         asciiz AddStringto: cmblstFilters
                  then    ;
  
--- 41,61 ----
                  then    ;
  
! : update-dir   ( -- )
!                 GetSelectedString: cmblstFilters parse-filters SetSpecs: TheDirectory
!                 UpDateFiles: TheDirectory ;
! 
! : add-filter    { \ editing? -- }
!                 control-key? dup to editing?
!                 if      GetSelectedString: cmblstFilters tmp-buf place
!                 else    tmp-buf off
!                 then    tmp-buf frmfileWindow Start: AddFilterDialog
!                 if      tmp-buf count 2dup parse-filters nip 0= abort" Error in filter string!"
!                         asciiz editing?
!                         if      GetCurrent: cmblstFilters dup DeleteString: cmblstFilters       \ remove old
!                                 tuck InsertStringAt: cmblstFilters                              \ add new
!                                 SetSelection: cmblstFilters                                     \ and select it
!                                 update-dir                                                     \ refresh
!                         else    AddStringto: cmblstFilters                                      \ just add new
!                         then
                  then    ;
  
***************
*** 58,67 ****
                  #Files: TheDirectory 0= ?exit
                  get-file ?dup
!                 if      here dup off frmfileWindow Start: DupefileDialog
                          if      2dup "to-pathend"
!                                 here count istr= abort" Can't duplicate file to itself!"
                                  2dup "path-only" pad place
                                  pad ?+\
!                                 here count pad +place
                                  pad +NULL
                                  drop 0 pad 1+ rot Call CopyFile
--- 72,81 ----
                  #Files: TheDirectory 0= ?exit
                  get-file ?dup
!                 if      tmp-buf dup off frmfileWindow Start: DupefileDialog
                          if      2dup "to-pathend"
!                                 tmp-buf count istr= abort" Can't duplicate file to itself!"
                                  2dup "path-only" pad place
                                  pad ?+\
!                                 tmp-buf count pad +place
                                  pad +NULL
                                  drop 0 pad 1+ rot Call CopyFile
***************
*** 81,88 ****
                  pad frmfileWindow Start: RenameFileDialog
                  if      pad c@ 0= abort" No name specified!"
!                         r@ count "path-only" here place
!                         here ?+\
!                         pad count here +place
!                         r@ count here count rename-file abort" File rename failed!"
                          Updatefiles: TheDirectory
                  then    r>drop ;
--- 95,102 ----
                  pad frmfileWindow Start: RenameFileDialog
                  if      pad c@ 0= abort" No name specified!"
!                         r@ count "path-only" tmp-buf place
!                         tmp-buf ?+\
!                         pad count tmp-buf +place
!                         r@ count tmp-buf count rename-file abort" File rename failed!"
                          Updatefiles: TheDirectory
                  then    r>drop ;
***************
*** 113,117 ****
                      then    ;
  
! : delete_file      { \ cnt flag  -- }
                      #Files: TheDirectory 0= ?exit
                      DeleteFile: TheDirectory ;
--- 127,131 ----
                      then    ;
  
! : delete_file       ( -- )
                      #Files: TheDirectory 0= ?exit
                      DeleteFile: TheDirectory ;
***************
*** 121,127 ****
                  case
                          GetId: cmblstfilters    of      over HIWORD CBN_SELCHANGE =
!                                                         if      GetCurrent: cmblstFilters GetStringAt: cmblstFilters
!                                                                 parse-filters SetSpecs: TheDirectory
!                                                                 UpdateFiles: TheDirectory
                                                          then
                                                  endof
--- 135,139 ----
                  case
                          GetId: cmblstfilters    of      over HIWORD CBN_SELCHANGE =
!                                                         if      update-dir
                                                          then
                                                  endof
***************
*** 134,140 ****
  
                          GetId: cmblstPathPicker of      over HIWORD CBN_SELCHANGE  =
!                                                         if      GetCurrent: cmblstPathPicker GetStringAt: cmblstPathPicker
!                                                                 SetPath: TheDirectory
!                                                                 UpdateFiles: TheDirectory
                                                          then
                                                endof
--- 146,151 ----
  
                          GetId: cmblstPathPicker of      over HIWORD CBN_SELCHANGE  =
!                                                         if      GetSelectedString: cmblstPathPicker
!                                                                 Update: TheDirectory
                                                          then
                                                endof
***************
*** 168,177 ****
                  WS_CLIPSIBLINGS +Style: imgDrvButton
  
!                 \ allow   user specified filespecs, N.B. changes lost when program exited
                  specsbmp usebitmap map-3dcolors
                  frmFileWindow Start: imgspecsbutton
                  imgButton2X imgButton2Y imgButton2W imgButton2H move: imgSpecsButton
                  specsbmp SetImage: imgSpecsButton
!                 s" Add file specification string e.g (*.f;*.4th)" Binfo: imgSpecsButton place
                  WS_CLIPSIBLINGS +Style: imgSpecsButton
  
--- 179,188 ----
                  WS_CLIPSIBLINGS +Style: imgDrvButton
  
!                 \ allow user specified filespecs, N.B. changes lost when program exited
                  specsbmp usebitmap map-3dcolors
                  frmFileWindow Start: imgspecsbutton
                  imgButton2X imgButton2Y imgButton2W imgButton2H move: imgSpecsButton
                  specsbmp SetImage: imgSpecsButton
!                 s" Add (press ctrl key to edit) file specification string e.g (*.f;*.4th)" Binfo: imgSpecsButton place
                  WS_CLIPSIBLINGS +Style: imgSpecsButton
  
***************
*** 200,214 ****
  
                  \ add default filters, see definition of parse-filters for note on format
!                 z" All Files (*.*)"                       AddstringTo: cmblstFilters
!                 z" Forth Files (*.f;*.frm;*.seq;*.4th)"   Addstringto: cmblstfilters
!                 z" C Source (*.c;*.h;*.cpp)"              AddStringto: cmblstFilters
!                 z" Html Files (*.htm)"			  Addstringto: cmblstfilters
!                 z" Text Files (*.txt;*.bat;*.ini;*.cfg)"  Addstringto: cmblstfilters
!  \               z" ForthForm Files (*.ff)"                AddStringto: cmblstfilters
                  1 SetSelection: cmblstFilters             \ default to Forth files
  
!                 GetCurrent: cmblstFilters GetStringAt: cmblstFilters
!                 parse-filters SetSpecs: TheDirectory
!                 UpDateFiles: TheDirectory
                  ;M
  
--- 211,224 ----
  
                  \ add default filters, see definition of parse-filters for note on format
!                 z" All Files (*.*)"                            AddstringTo: cmblstFilters
!                 z" Forth Files (*.f;*.frm;*.seq;*.4th;*.fs)"   Addstringto: cmblstfilters
!                 z" C Source (*.c;*.h;*.cpp)"                   AddStringto: cmblstFilters
!                 z" Basic Source (*.bas;*.inc)"                 Addstringto: cmblstfilters
!                 z" Html Files (*.html;*.htm)"		       Addstringto: cmblstfilters
!                 z" Text Files (*.txt;*.bat;*.ini;*.cfg)"       Addstringto: cmblstfilters
!                 z" ForthForm Files (*.ff)"                     AddStringto: cmblstfilters
                  1 SetSelection: cmblstFilters             \ default to Forth files
  
!                 update-dir
                  ;M
  

[Win32forth-cvs] win32forth/src Primutil.f,1.49,1.50

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

Update of /cvsroot/win32forth/win32forth/src
In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv14109/src

Modified Files:
	Primutil.f 
Log Message:
Jos: Replaced tnegate with the version of Will Baden

Index: Primutil.f
===================================================================
RCS file: /cvsroot/win32forth/win32forth/src/Primutil.f,v
retrieving revision 1.49
retrieving revision 1.50
diff -C2 -d -r1.49 -r1.50
*** Primutil.f	15 May 2010 21:09:14 -0000	1.49
--- Primutil.f	17 Nov 2010 18:08:34 -0000	1.50
***************
*** 341,348 ****
  
  : TNEGATE   ( t1lo t1mid t1hi -- t2lo t2mid t2hi )
!         invert >r
!         invert >r
!         invert 0 -1. d+ s>d r> 0 d+
!         r> + ;
  
  : UT*   ( ulo uhi u -- utlo utmid uthi )
--- 341,346 ----
  
  : TNEGATE   ( t1lo t1mid t1hi -- t2lo t2mid t2hi )
!         >r  2dup or dup if drop  dnegate 1  then
!         r> +  negate ;
  
  : UT*   ( ulo uhi u -- utlo utmid uthi )

[Win32forth-cvs] win32forth-extsrc/extsrc/installer ExtFiles.nsi, 1.2, 1.3 Files.nsi, 1.9, 1.10 Uninstall.nsi, 1.9, 1.10

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

Update of /cvsroot/win32forth/win32forth-extsrc/extsrc/installer
In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv16795

Modified Files:
	ExtFiles.nsi Files.nsi Uninstall.nsi 
Log Message:
new release 6.14.01 build

Index: ExtFiles.nsi
===================================================================
RCS file: /cvsroot/win32forth/win32forth-extsrc/extsrc/installer/ExtFiles.nsi,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** ExtFiles.nsi	1 Sep 2006 07:25:53 -0000	1.2
--- ExtFiles.nsi	1 Sep 2010 06:52:35 -0000	1.3
***************
*** 16,44 ****
  	File "WinEd.exe"
  	File "WinEd.ndx"
! 	SetOutPath "$INSTDIR\extsrc\w32fConsole\"
! 	File "..\w32fConsole\Console.cpp"
! 	File "..\w32fConsole\Console.def"
! 	File "..\w32fConsole\Console.dsp"
! 	File "..\w32fConsole\Console.dsw"
! 	File "..\w32fConsole\Console.rc"
! 	File "..\w32fConsole\HAND.CUR"
! 	File "..\w32fConsole\harrow.cur"
! 	File "..\w32fConsole\Keyboard.cpp"
! 	File "..\w32fConsole\MAGNIFY.CUR"
! 	File "..\w32fConsole\resource.h"
! 	File "..\w32fConsole\SPLITH.CUR"
! 	File "..\w32fConsole\SPLITV.CUR"
! 	File "..\w32fConsole\StdAfx.cpp"
! 	File "..\w32fConsole\StdAfx.h"
! 	File "..\w32fConsole\Term.cpp"
! 	File "..\w32fConsole\Term.h"
! 	SetOutPath "$INSTDIR\extsrc\w32fHtmlDisplay\"
! 	File "..\w32fHtmlDisplay\resource.h"
! 	File "..\w32fHtmlDisplay\w32fHtmlDisplay.c"
! 	File "..\w32fHtmlDisplay\w32fHtmlDisplay.def"
! 	File "..\w32fHtmlDisplay\w32fHtmlDisplay.dsp"
! 	File "..\w32fHtmlDisplay\w32fHtmlDisplay.dsw"
! 	File "..\w32fHtmlDisplay\w32fHtmlDisplay.h"
! 	File "..\w32fHtmlDisplay\w32fHtmlDisplay.rc"
  	SetOutPath "$INSTDIR\extsrc\w32fScintilla\"
  	File "..\w32fScintilla\delbin.bat"
--- 16,44 ----
  	File "WinEd.exe"
  	File "WinEd.ndx"
! ;	SetOutPath "$INSTDIR\extsrc\w32fConsole\"
! ;	File "..\w32fConsole\Console.cpp"
! ;	File "..\w32fConsole\Console.def"
! ;	File "..\w32fConsole\Console.dsp"
! ;	File "..\w32fConsole\Console.dsw"
! ;	File "..\w32fConsole\Console.rc"
! ;	File "..\w32fConsole\HAND.CUR"
! ;	File "..\w32fConsole\harrow.cur"
! ;	File "..\w32fConsole\Keyboard.cpp"
! ;	File "..\w32fConsole\MAGNIFY.CUR"
! ;	File "..\w32fConsole\resource.h"
! ;	File "..\w32fConsole\SPLITH.CUR"
! ;	File "..\w32fConsole\SPLITV.CUR"
! ;	File "..\w32fConsole\StdAfx.cpp"
! ;	File "..\w32fConsole\StdAfx.h"
! ;	File "..\w32fConsole\Term.cpp"
! ;	File "..\w32fConsole\Term.h"
! ;	SetOutPath "$INSTDIR\extsrc\w32fHtmlDisplay\"
! ;	File "..\w32fHtmlDisplay\resource.h"
! ;	File "..\w32fHtmlDisplay\w32fHtmlDisplay.c"
! ;	File "..\w32fHtmlDisplay\w32fHtmlDisplay.def"
! ;	File "..\w32fHtmlDisplay\w32fHtmlDisplay.dsp"
! ;	File "..\w32fHtmlDisplay\w32fHtmlDisplay.dsw"
! ;	File "..\w32fHtmlDisplay\w32fHtmlDisplay.h"
! ;	File "..\w32fHtmlDisplay\w32fHtmlDisplay.rc"
  	SetOutPath "$INSTDIR\extsrc\w32fScintilla\"
  	File "..\w32fScintilla\delbin.bat"

Index: Uninstall.nsi
===================================================================
RCS file: /cvsroot/win32forth/win32forth-extsrc/extsrc/installer/Uninstall.nsi,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** Uninstall.nsi	31 Aug 2010 07:27:02 -0000	1.9
--- Uninstall.nsi	1 Sep 2010 06:52:35 -0000	1.10
***************
*** 403,408 ****
  	Delete "$INSTDIR\apps\Win32ForthIDE\Forms\CreateToolBarForm.ff"
  	Delete "$INSTDIR\apps\Win32ForthIDE\Forms\CreateToolBarForm.frm"
- 	Delete "$INSTDIR\apps\Win32ForthIDE\Forms\DebugForm.ff"
- 	Delete "$INSTDIR\apps\Win32ForthIDE\Forms\DebugForm.frm"
  	Delete "$INSTDIR\apps\Win32ForthIDE\Forms\EdPreferences.ff"
  	Delete "$INSTDIR\apps\Win32ForthIDE\Forms\EdPreferences.frm"
--- 403,406 ----
***************
*** 416,428 ****
  	Delete "$INSTDIR\apps\Win32ForthIDE\Forms\GroupAction.ff"
  	Delete "$INSTDIR\apps\Win32ForthIDE\Forms\GroupAction.frm"
- 	Delete "$INSTDIR\apps\Win32ForthIDE\Forms\MsgBoxBuilder.ff"
- 	Delete "$INSTDIR\apps\Win32ForthIDE\Forms\MsgBoxBuilder.ff_code"
- 	Delete "$INSTDIR\apps\Win32ForthIDE\Forms\MsgBoxBuilder.frm"
  	Delete "$INSTDIR\apps\Win32ForthIDE\Forms\PREFERENCES.frm"
- 	Delete "$INSTDIR\apps\Win32ForthIDE\Forms\SavePrompt.ff"
- 	Delete "$INSTDIR\apps\Win32ForthIDE\Forms\SavePrompt.ff_code"
- 	Delete "$INSTDIR\apps\Win32ForthIDE\Forms\SavePrompt.frm"
- 	Delete "$INSTDIR\apps\Win32ForthIDE\Forms\SearchPrompt.ff"
- 	Delete "$INSTDIR\apps\Win32ForthIDE\Forms\SearchPrompt.frm"
  	Delete "$INSTDIR\apps\Win32ForthIDE\Forms\SplitterWindow.ff"
  	Delete "$INSTDIR\apps\Win32ForthIDE\Forms\SplitterWindow.frm"
--- 414,418 ----
***************
*** 768,772 ****
  	Delete "$INSTDIR\Help\html\w32f-relnotes.6.12.htm"
  	Delete "$INSTDIR\Help\html\w32f-relnotes.6.14.htm"
- 	Delete "$INSTDIR\Help\html\w32f-relnotes.6.15.htm"
  	Delete "$INSTDIR\Help\html\w32f-relnotes.htm"
  	Delete "$INSTDIR\Help\html\w32f-relnotesOld.txt"
--- 758,761 ----
***************
*** 1390,1393 ****
--- 1379,1383 ----
  	RMDir "$INSTDIR\extsrc\"
  	
+ 	RMDir "$SMPROGRAMS\My Application"
  	RMDir "$INSTDIR\Templates\"
  	RMDir "$INSTDIR\src\tools\"

Index: Files.nsi
===================================================================
RCS file: /cvsroot/win32forth/win32forth-extsrc/extsrc/installer/Files.nsi,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** Files.nsi	31 Aug 2010 07:27:02 -0000	1.9
--- Files.nsi	1 Sep 2010 06:52:35 -0000	1.10
***************
*** 413,418 ****
  	File "..\..\..\win32forth\apps\Win32ForthIDE\Forms\CreateToolBarForm.ff"
  	File "..\..\..\win32forth\apps\Win32ForthIDE\Forms\CreateToolBarForm.frm"
- 	File "..\..\..\win32forth\apps\Win32ForthIDE\Forms\DebugForm.ff"
- 	File "..\..\..\win32forth\apps\Win32ForthIDE\Forms\DebugForm.frm"
  	File "..\..\..\win32forth\apps\Win32ForthIDE\Forms\EdPreferences.ff"
  	File "..\..\..\win32forth\apps\Win32ForthIDE\Forms\EdPreferences.frm"
--- 413,416 ----
***************
*** 426,438 ****
  	File "..\..\..\win32forth\apps\Win32ForthIDE\Forms\GroupAction.ff"
  	File "..\..\..\win32forth\apps\Win32ForthIDE\Forms\GroupAction.frm"
- 	File "..\..\..\win32forth\apps\Win32ForthIDE\Forms\MsgBoxBuilder.ff"
- 	File "..\..\..\win32forth\apps\Win32ForthIDE\Forms\MsgBoxBuilder.ff_code"
- 	File "..\..\..\win32forth\apps\Win32ForthIDE\Forms\MsgBoxBuilder.frm"
  	File "..\..\..\win32forth\apps\Win32ForthIDE\Forms\PREFERENCES.frm"
- 	File "..\..\..\win32forth\apps\Win32ForthIDE\Forms\SavePrompt.ff"
- 	File "..\..\..\win32forth\apps\Win32ForthIDE\Forms\SavePrompt.ff_code"
- 	File "..\..\..\win32forth\apps\Win32ForthIDE\Forms\SavePrompt.frm"
- 	File "..\..\..\win32forth\apps\Win32ForthIDE\Forms\SearchPrompt.ff"
- 	File "..\..\..\win32forth\apps\Win32ForthIDE\Forms\SearchPrompt.frm"
  	File "..\..\..\win32forth\apps\Win32ForthIDE\Forms\SplitterWindow.ff"
  	File "..\..\..\win32forth\apps\Win32ForthIDE\Forms\SplitterWindow.frm"
--- 424,428 ----
***************
*** 795,799 ****
  	File "..\..\..\win32forth\Help\html\w32f-relnotes.6.12.htm"
  	File "..\..\..\win32forth\Help\html\w32f-relnotes.6.14.htm"
- 	File "..\..\..\win32forth\Help\html\w32f-relnotes.6.15.htm"
  	File "..\..\..\win32forth\Help\html\w32f-relnotes.htm"
  	File "..\..\..\win32forth\Help\html\w32f-relnotesOld.txt"
--- 785,788 ----

[Win32forth-cvs] win32forth/Help/hdb HelpCls.tv, 1.2, 1.2.2.1 HelpWrd.hdb, 1.6, 1.6.2.1 HelpWrd.ndx, 1.6, 1.6.2.1 HelpWrd.tv, 1.6, 1.6.2.1 HelpWrd.txt, 1.6, 1.6.2.1

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

Update of /cvsroot/win32forth/win32forth/Help/hdb
In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv12912/Help/hdb

Modified Files:
      Tag: V614XX
	HelpCls.tv HelpWrd.hdb HelpWrd.ndx HelpWrd.tv HelpWrd.txt 
Log Message:
new release 6.14.01 build

Index: HelpCls.tv
===================================================================
RCS file: /cvsroot/win32forth/win32forth/Help/hdb/HelpCls.tv,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -C2 -d -r1.2 -r1.2.2.1
*** HelpCls.tv	7 Feb 2010 07:36:16 -0000	1.2
--- HelpCls.tv	1 Sep 2010 06:37:26 -0000	1.2.2.1
***************
*** 1,2291 ****
! 0 tvn| CLASSROOT| tvd| 5448|
  1 tvn| -methods-| tvd| 0|
! -2 tvn| CLASSINIT:| tvd| 5449|
! -2 tvn| ~:| tvd| 5450|
! -2 tvn| ADDR:| tvd| 5451|
! -2 tvn| PRINT:| tvd| 5452|
! 1 tvn| OBJECT| tvd| 5453|
  2 tvn| -methods-| tvd| 0|
! -3 tvn| GET:| tvd| 5454|
! -3 tvn| PUT:| tvd| 5455|
[...4553 lines suppressed...]
! -4 tvn| FIELDNAME:| tvd| 8520|
! -4 tvn| GETINT:| tvd| 8521|
! -4 tvn| GETDOUBLE:| tvd| 8522|
! -4 tvn| GETFLOAT:| tvd| 8523|
! -4 tvn| GETSTR:| tvd| 8524|
! -4 tvn| GETBLOB:| tvd| 8525|
! -4 tvn| ISNULL?:| tvd| 8526|
! -4 tvn| NEXTROW:| tvd| 8527|
! -4 tvn| (BIND):| tvd| 8528|
! -4 tvn| BINDINT:| tvd| 8529|
! -4 tvn| BINDDOUBLE:| tvd| 8530|
! -4 tvn| BINDFLOAT:| tvd| 8531|
! -4 tvn| BINDSTR:| tvd| 8532|
! -4 tvn| BINDBLOB:| tvd| 8533|
! 1 tvn| STRING| tvd| 8539|
  2 tvn| -methods-| tvd| 0|
! -3 tvn| GET:| tvd| 8540|
! -3 tvn| PUT:| tvd| 8541|
! -3 tvn| ADD:| tvd| 8542|
! -3 tvn| APPEND:| tvd| 8543|

Index: HelpWrd.txt
===================================================================
RCS file: /cvsroot/win32forth/win32forth/Help/hdb/HelpWrd.txt,v
retrieving revision 1.6
retrieving revision 1.6.2.1
diff -C2 -d -r1.6 -r1.6.2.1
*** HelpWrd.txt	7 Feb 2010 07:36:16 -0000	1.6
--- HelpWrd.txt	1 Sep 2010 06:37:27 -0000	1.6.2.1
***************
*** 678,686 ****
  : JCC-UNKNOWN ( compile a conditional branch with an unknown size ) 
  ( addr \ param -- ) 
! OPCODE JCXZ \ ' jcxz     alias jecxz
  : JCXZ-COMPILE ( compile jcxz ) 
  ( address \ param -- ) 
  OPCODE JE \ ' je       alias jz
! OPCODE JECXZ 
  : JECXZ-COMPILE ( compile jecxz ) 
  ( address \ param -- ) 
--- 678,686 ----
[...1291 lines suppressed...]
*** 14326,14329 ****
--- 14327,14331 ----
  CREATE STARTUPINFO 
  VALUE STOPLAUNCHING \ true if a new instance of me must be stopped
+ VALUE TIME-TAKEN 
  : UNINITSHAREDMEMORY ( -- ) 
  \ Uninit win32forth application shared memory
***************
*** 14368,14372 ****
  \ maxstring = return stack
  CONSTANT ED_WATCH \ "           file for display source for debugger
! \ in theese 3 msgs, addr siz contains:
  \ cell1 = line number ; maxpath+1 = filename
  CONSTANT ED_WORD \ Forth tells the IDE to highlight the word (token)
--- 14370,14374 ----
  \ maxstring = return stack
  CONSTANT ED_WATCH \ "           file for display source for debugger
! \ in these 3 msgs, addr siz contains:
  \ cell1 = line number ; maxpath+1 = filename
  CONSTANT ED_WORD \ Forth tells the IDE to highlight the word (token)

Index: HelpWrd.hdb
===================================================================
RCS file: /cvsroot/win32forth/win32forth/Help/hdb/HelpWrd.hdb,v
retrieving revision 1.6
retrieving revision 1.6.2.1
diff -C2 -d -r1.6 -r1.6.2.1
Binary files /tmp/cvsNpJGf8 and /tmp/cvsvCnlsz differ

Index: HelpWrd.tv
===================================================================
RCS file: /cvsroot/win32forth/win32forth/Help/hdb/HelpWrd.tv,v
retrieving revision 1.6
retrieving revision 1.6.2.1
diff -C2 -d -r1.6 -r1.6.2.1
*** HelpWrd.tv	7 Feb 2010 07:36:16 -0000	1.6
--- HelpWrd.tv	1 Sep 2010 06:37:27 -0000	1.6.2.1
***************
*** 1,5278 ****
  0 tvn| Words| tvd| 0|
! 1 tvn| CLASSROOT| tvd| 5448|
  2 tvn| -methods-| tvd| 0|
! -3 tvn| CLASSINIT:| tvd| 5449|
! -3 tvn| ~:| tvd| 5450|
! -3 tvn| ADDR:| tvd| 5451|
! -3 tvn| PRINT:| tvd| 5452|
! 2 tvn| OBJECT| tvd| 5453|
  3 tvn| -methods-| tvd| 0|
! -4 tvn| GET:| tvd| 5454|
[...24456 lines suppressed...]
  2 tvn| \| tvd| 2766|
! 2 tvn| \+| tvd| 5269|
! 2 tvn| \-| tvd| 5270|
! 2 tvn| \IN-SYSTEM-OK| tvd| 5274|
! 2 tvn| \S| tvd| 5323|
! 2 tvn| ]MACRO| tvd| 5165|
! 2 tvn| __STDCALL| tvd| 5156|
! 2 tvn| {| tvd| 5345|
! 2 tvn| |IF| tvd| 4894|
! 2 tvn| |OF| tvd| 4893|
  1 tvn| Deprecated| tvd| 0|
! 2 tvn| .DIR->FILE-NAME| tvd| 5027|
! 2 tvn| >BOLD| tvd| 4119|
! 2 tvn| >NORM| tvd| 4118|
! 2 tvn| ABS>REL| tvd| 5294|
! 2 tvn| REL>ABS| tvd| 5295|
  2 tvn| TASK-SLEEP| tvd| 2577|
! 2 tvn| _PRINT-DIR-FILES| tvd| 5025|
  1 tvn| Vocabularies| tvd| 0|
  2 tvn| Application space| tvd| 0|

Index: HelpWrd.ndx
===================================================================
RCS file: /cvsroot/win32forth/win32forth/Help/hdb/HelpWrd.ndx,v
retrieving revision 1.6
retrieving revision 1.6.2.1
diff -C2 -d -r1.6 -r1.6.2.1
Binary files /tmp/cvsXZWxsi and /tmp/cvsyqRVnM differ

[Win32forth-cvs] win32forth fkernel.exe, 1.58.2.1, 1.58.2.2 setup.exe, 1.38, 1.38.2.1

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

Update of /cvsroot/win32forth/win32forth
In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv12912

Modified Files:
      Tag: V614XX
	fkernel.exe setup.exe 
Log Message:
new release 6.14.01 build

Index: setup.exe
===================================================================
RCS file: /cvsroot/win32forth/win32forth/setup.exe,v
retrieving revision 1.38
retrieving revision 1.38.2.1
diff -C2 -d -r1.38 -r1.38.2.1
Binary files /tmp/cvsD3ZASb and /tmp/cvsTC7L7C differ

Index: fkernel.exe
===================================================================
RCS file: /cvsroot/win32forth/win32forth/fkernel.exe,v
retrieving revision 1.58.2.1
retrieving revision 1.58.2.2
diff -C2 -d -r1.58.2.1 -r1.58.2.2
Binary files /tmp/cvsZnV5Ua and /tmp/cvsBN9EcC differ

[Win32forth-cvs] win32forth/src/kernel version.f,1.16,1.16.2.1

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

Update of /cvsroot/win32forth/win32forth/src/kernel
In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv12834

Modified Files:
      Tag: V614XX
	version.f 
Log Message:
new release 6.14.01 build

Index: version.f
===================================================================
RCS file: /cvsroot/win32forth/win32forth/src/kernel/version.f,v
retrieving revision 1.16
retrieving revision 1.16.2.1
diff -C2 -d -r1.16 -r1.16.2.1
*** version.f	7 Feb 2010 08:02:22 -0000	1.16
--- version.f	1 Sep 2010 06:35:51 -0000	1.16.2.1
***************
*** 3,7 ****
  cr .( Loading META version info)
  
! 61400     VALUE #VERSION#
  
  \ Change only the version number above; the build number is automatically assigned.
--- 3,7 ----
  cr .( Loading META version info)
  
! 61401     VALUE #VERSION#
  
  \ Change only the version number above; the build number is automatically assigned.

[Win32forth-cvs] win32forth/apps/Setup Setup.f,1.25,1.25.2.1

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

Update of /cvsroot/win32forth/win32forth/apps/Setup
In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv12054

Modified Files:
      Tag: V614XX
	Setup.f 
Log Message:
Updated to define MS@

Index: Setup.f
===================================================================
RCS file: /cvsroot/win32forth/win32forth/apps/Setup/Setup.f,v
retrieving revision 1.25
retrieving revision 1.25.2.1
diff -C2 -d -r1.25 -r1.25.2.1
*** Setup.f	21 Dec 2008 10:55:24 -0000	1.25
--- Setup.f	31 Aug 2010 19:51:31 -0000	1.25.2.1
***************
*** 8,12 ****
--- 8,14 ----
  \ Setup for Win32Forth
  
+ \ ------------------------------------------------------------------------------
  \ This is all we need of win32forth to create a small Setup.exe
+ \ ------------------------------------------------------------------------------
      FLOAD ..\..\src\comment.f
      FLOAD ..\..\src\numconv.f
***************
*** 30,45 ****
  
      FLOAD ..\..\src\mapfile.f      \ Windows32 file into memory mapping words
      FLOAD ..\..\src\w32fmsglist.f  \ win32forth applications & messages IDs
-     FLOAD ..\..\src\w32fmsg.f      \ w32f application messaging
  
!     FLOAD ..\..\src\shell.f
  
  SYS-FLOAD ..\..\src\imageman.f
      FLOAD ..\..\src\Keyboard.f     \ function and special key constants
  
  \ the Setup starts here...
  
  : ?win-error ( f -- ) drop ;
  : seconds    ( n -- ) drop ;
  FLOAD sub_dirs.f
  FLOAD array.f            \ array words
--- 32,71 ----
  
      FLOAD ..\..\src\mapfile.f      \ Windows32 file into memory mapping words
+ 
      FLOAD ..\..\src\w32fmsglist.f  \ win32forth applications & messages IDs
  
! \ The current Version of the file w32fmsg.f needs the word MS@
! \ wich is defined in utils.f.
! \ Because including utils.f here doesn't work so I added copy of the MS@ code here.
! \ Not nice, but working...
! \ Montag, August 30 2010 - 19:17 dbu
! 16 constant TIME-LEN
! time-len newuser TIME-BUF
! 
! 1 proc GetLocalTime
! 
! : get-local-time ( -- )                 \ get the local computer date and time
! 	time-buf call GetLocalTime drop ;
  
+ : ms@	( -- ms )
+ 	get-local-time
+ 	time-buf
+ 	dup   8 + w@     60 *           \ hours
+ 	over 10 + w@ +   60 *           \ minutes
+ 	over 12 + w@ + 1000 *           \ seconds
+ 	swap 14 + w@ + ;                \ milli-seconds
+ 
+     FLOAD ..\..\src\w32fmsg.f      \ w32f application messaging
+     FLOAD ..\..\src\shell.f
  SYS-FLOAD ..\..\src\imageman.f
      FLOAD ..\..\src\Keyboard.f     \ function and special key constants
  
+ \ ------------------------------------------------------------------------------
  \ the Setup starts here...
+ \ ------------------------------------------------------------------------------
  
  : ?win-error ( f -- ) drop ;
  : seconds    ( n -- ) drop ;
+ 
  FLOAD sub_dirs.f
  FLOAD array.f            \ array words

[Win32forth-cvs] win32forth fkernel.exe,1.60,1.61

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

Update of /cvsroot/win32forth/win32forth
In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv11015

Modified Files:
	fkernel.exe 
Log Message:
Corrected version number back to 61500 and improved w32MsgList to automatically update the values form the version number.

Index: fkernel.exe
===================================================================
RCS file: /cvsroot/win32forth/win32forth/fkernel.exe,v
retrieving revision 1.60
retrieving revision 1.61
diff -C2 -d -r1.60 -r1.61
Binary files /tmp/cvsq2KUAv and /tmp/cvsn0vjpp differ

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

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

Update of /cvsroot/win32forth/win32forth/src
In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv11015/src

Modified Files:
	w32fMsgList.f 
Log Message:
Corrected version number back to 61500 and improved w32MsgList to automatically update the values form the version number.

Index: w32fMsgList.f
===================================================================
RCS file: /cvsroot/win32forth/win32forth/src/w32fMsgList.f,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** w32fMsgList.f	31 Aug 2010 08:02:47 -0000	1.4
--- w32fMsgList.f	31 Aug 2010 19:46:33 -0000	1.5
***************
*** 23,27 ****
  \ ------------------------------------------------------------------------------
  
! \ The win32forth applications pool IDs are organized by release. These comments
  \ are indeed remainders of all the IDs already used.
  \ Notice that there is no reason for two different releases to communicate. So
--- 23,27 ----
  \ ------------------------------------------------------------------------------
  
! \ The win32forth applications pool IDs are organized by Major release. These comments
  \ are indeed remainders of all the IDs already used.
  \ Notice that there is no reason for two different releases to communicate. So
***************
*** 45,55 ****
  \ ------------------------------------------------------------------------------
  
! \ the following values and, if needed, filenames are the only things to be
  \ changed for a new release
  
  3333 value w32fWinEd
! 6150 value w32fForth
! 6151 value w32fIDE
! 6152 value w32fHelp
  
  w32fIDE value w32fEditor   \ current editor, defaults to IDE, can be WINED
--- 45,56 ----
  \ ------------------------------------------------------------------------------
  
! \ the following values are updated automatically when the major release changes.
! \ If needed, filenames are the only things to be
  \ changed for a new release
  
  3333 value w32fWinEd
! version# 100 / 10 * value w32fForth
! w32fForth 1 +       value w32fIDE
! w32fForth 2 +       value w32fHelp
  
  w32fIDE value w32fEditor   \ current editor, defaults to IDE, can be WINED