[Win32forth-cvs] win32forth/apps/Win32ForthIDE CommandID.f, 1.13, 1.14 EdFORTHFORM.F, 1.2, 1.3 FORMOBJECT.F, 1.1, 1.2 FORMPROPERTY.F, 1.1, 1.2

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

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

Modified Files:
	CommandID.f EdFORTHFORM.F FORMOBJECT.F FORMPROPERTY.F 
Log Message:
Bug fix #3 :-) Plus a little enhancement.

Index: EdFORTHFORM.F
===================================================================
RCS file: /cvsroot/win32forth/win32forth/apps/Win32ForthIDE/EdFORTHFORM.F,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** EdFORTHFORM.F	2 May 2008 02:00:23 -0000	1.2
--- EdFORTHFORM.F	4 May 2008 18:13:25 -0000	1.3
***************
*** 53,57 ****
  0 value NextControlType    		\ next control to be created
  false value newcontrol?
- \ 0 value statuswindow            	\ pointer to status window object
  0 value picturebmp
  0 value staticbmp
--- 53,56 ----
***************
*** 74,81 ****
  
  \ status labels
  Label lblControlName
- Label lblSize
  Label lblPosition
! Label lblFormName
  Label lblModified
  
--- 73,80 ----
  
  \ status labels
+ Label lblFormName
  Label lblControlName
  Label lblPosition
! Label lblSize
  Label lblModified
  
***************
*** 110,114 ****
                  join$(   s" X= "
  			 x >str
! 			 s"    "
  			 s" Y= "
  			 y (.)
--- 109,113 ----
                  join$(   s" X= "
  			 x >str
! 			 s"   "
  			 s" Y= "
  			 y (.)
***************
*** 231,235 ****
  FileOpenDialog GetBitmapDlg "Get Bitmap" "Bitmap Files|*.bmp;*.dib|"
  
! needs edformwindow.f       \ form toolbar etc.
  \ all ForthForm dialogs
  needs ControlProperty.frm
--- 230,234 ----
  FileOpenDialog GetBitmapDlg "Get Bitmap" "Bitmap Files|*.bmp;*.dib|"
  
! needs edformwindow.f       \ form designer window
  \ all ForthForm dialogs
  needs ControlProperty.frm
***************
*** 320,324 ****
                  then    ;    IDM_FORM_Open SetCommand
  
! : EditForm         ( -- )     \ view/edit form
                  ActiveForm 0= ?exit
                  GetBuffer: ActiveForm FormName: ActiveForm count ShowSource ; IDM_FORM_EDITOR SetCommand
--- 319,323 ----
                  then    ;    IDM_FORM_Open SetCommand
  
! : EditForm         ( -- )     \ view/edit form source code
                  ActiveForm 0= ?exit
                  GetBuffer: ActiveForm FormName: ActiveForm count ShowSource ; IDM_FORM_EDITOR SetCommand
***************
*** 405,414 ****
                          Close: frmProperties++
  			FormList Dispose 0 to FormList
                  else    SetFocus: [ Data@: FormList ]
                          ActiveControl: Activeform
                          if      UpdatePropertyWindow
                          then
!                 then	#Forms 2 <
!                 if      Close: frmCreatePropertyForm
                  then    doUpdate
                  ; IDM_FORM_Close SetCommand
--- 404,416 ----
                          Close: frmProperties++
  			FormList Dispose 0 to FormList
+ 			ActiveChild 0=	\ no other file opened
+ 			if	WindowTitle: MainWindow zcount SetText: MainWindow
+ 			then
                  else    SetFocus: [ Data@: FormList ]
                          ActiveControl: Activeform
                          if      UpdatePropertyWindow
                          then
!                 then	#Forms 2 <			\ less than two forms opened
!                 if      Close: frmCreatePropertyForm	\ makes no sense
                  then    doUpdate
                  ; IDM_FORM_Close SetCommand
***************
*** 421,433 ****
  		Repeat	;  IDM_FORM_CloseAll SetCommand
  
! : AddOpenForms	( -- )
                  #Forms ?dup
                  if	1+ 1
  			do	i >Link#: FormList
! 				TextFile: [ Data@: FormList ]
! 				2dup s" untitled.frm" istr= not
! 				if	AddForm: TheProject
! 				else	2drop
! 				then
  			loop
  		then	; IDM_ADD_FORMS_PRJ SetCommand
--- 423,437 ----
  		Repeat	;  IDM_FORM_CloseAll SetCommand
  
! : AddFormToProject ( form -- )	\ include in project
! 		TextFile: [ ] 2dup s" untitled.frm" istr= not
! 		if	AddForm: TheProject
! 		else	2drop
! 		then	; IDM_FORM_AddToProject SetCommand
! 
! : AddOpenForms	( -- )	\ include all open forms in project
                  #Forms ?dup
                  if	1+ 1
  			do	i >Link#: FormList
! 				Data@: FormList AddFormToProject
  			loop
  		then	; IDM_ADD_FORMS_PRJ SetCommand
***************
*** 449,453 ****
  		then	; IDM_FORM_WriteAll SetCommand
  
- 
  \ Session file loading definitions
  \ A session file is a standard text file defining the current state of the system
--- 453,456 ----

Index: FORMOBJECT.F
===================================================================
RCS file: /cvsroot/win32forth/win32forth/apps/Win32ForthIDE/FORMOBJECT.F,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** FORMOBJECT.F	28 Apr 2008 05:17:17 -0000	1.1
--- FORMOBJECT.F	4 May 2008 18:13:25 -0000	1.2
***************
*** 26,29 ****
--- 26,30 ----
           MenuItem "Save (.ff)"        IDM_FORM_SAVE DoCommand ;
           MenuItem "Compile (.frm)"    IDM_FORM_WRITE DoCommand ;
+          MenuItem "Add To Project"    ActiveForm IDM_FORM_AddToProject DoCommand ;
           :MenuItem mnu_lock "View Only"  Lock: ActiveForm ;
           MenuSeparator
***************
*** 1080,1084 ****
                  locked? ?exitm          \ if form is locked disable sizing
                  width to frmWidth height to frmHeight
!                 firsttime? not    \ ignore sizing message when when window is created
                  if      modified
                  else    false to firsttime?
--- 1081,1085 ----
                  locked? ?exitm          \ if form is locked disable sizing
                  width to frmWidth height to frmHeight
!                 firsttime? not    \ ignore sizing message when window is created
                  if      modified
                  else    false to firsttime?

Index: CommandID.f
===================================================================
RCS file: /cvsroot/win32forth/win32forth/apps/Win32ForthIDE/CommandID.f,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** CommandID.f	28 Apr 2008 05:17:15 -0000	1.13
--- CommandID.f	4 May 2008 18:13:25 -0000	1.14
***************
*** 190,193 ****
--- 190,194 ----
  NewId IDM_FORM_TABCONTROL
  NewID IDM_SHOW_FORMTAB
+ NewID IDM_FORM_AddToProject
  
  IdCounter constant IDM_LAST

Index: FORMPROPERTY.F
===================================================================
RCS file: /cvsroot/win32forth/win32forth/apps/Win32ForthIDE/FORMPROPERTY.F,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** FORMPROPERTY.F	28 Apr 2008 05:17:17 -0000	1.1
--- FORMPROPERTY.F	4 May 2008 18:13:25 -0000	1.2
***************
*** 381,384 ****
--- 381,389 ----
                  ;M
  
+ :M WindowStyle:	( -- style )
+ 		WindowStyle: Super
+ 		WS_MINIMIZEBOX or 	\ allow moving out of the way
+ 		;M
+ 
  ;Object