[Win32forth-cvs] win32forth/apps/ForthForm FORTHFORM.F,1.10,1.11

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

Update of /cvsroot/win32forth/win32forth/apps/ForthForm
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11567/apps/ForthForm

Modified Files:
	FORTHFORM.F 
Log Message:
Bug fix ( I hope! )

Index: FORTHFORM.F
===================================================================
RCS file: /cvsroot/win32forth/win32forth/apps/ForthForm/FORTHFORM.F,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** FORTHFORM.F	4 Nov 2005 06:40:15 -0000	1.10
--- FORTHFORM.F	6 Nov 2005 05:40:56 -0000	1.11
***************
*** 7,11 ****
  anew -ForthForm.f
  
!  : sysgen ;
  \ : withbgnd ;
  \ add the ForthForm folder's to our path list
--- 7,11 ----
  anew -ForthForm.f
  
! : sysgen ;
  \ : withbgnd ;
  \ add the ForthForm folder's to our path list
***************
*** 534,538 ****
--- 534,547 ----
                  ;
  
+ : ?data-size    ( -- )
+                 frmdata-size 0<> ctrldata-size 0<> and ?exit
+                 new> Form dup>r GetData: [ ] nip to frmdata-size
+                 r> Dispose      \ discard
+                 new> ControlObject dup>r Getdata: [ ] nip to ctrldata-size
+                 r> Dispose         \ discard
+                 ;
+ 
  : check-file      { fname fcnt \ fsize -- f }      \ check integrity of file before opening
+                   ?data-size
                    fname fcnt SetName: TheFile   \
                    Open: TheFile ?dup ?exit
***************
*** 722,726 ****
  #IFDEF withbgnd
                  self Start: BkGndImageWindow
- \                WS_CLIPSIBLINGS WS_CLIPCHILDREN or +Style: BkGndImageWindow
                  FIT_SIZE SetViewMode: BkGndImageWindow
                  GetBackGroundImage
--- 731,734 ----
***************
*** 1026,1033 ****
                  z" ToolBar"
                  SetRegistryKey: ControlToolBar
-                 new> Form dup>r GetData: [ ] nip to frmdata-size
-                 r> Dispose      \ discard
-                 new> ControlObject dup>r Getdata: [ ] nip to ctrldata-size
-                 r> Dispose         \ discard
                  ;
  
--- 1034,1037 ----