Menu
▾
▴
win32forth-cvs
|
From: George H. <geo...@us...> - 2006-11-20 14:18:24
|
Update of /cvsroot/win32forth/win32forth/apps/ForthForm In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv8156/win32forth/apps/ForthForm Modified Files: CreateToolBar.f FORMCONTROLS.F FORMOBJECT.F FORTHFORM.F FormMenu.f Log Message: gah:Bug fix from Ezra Boyce Index: FORTHFORM.F =================================================================== RCS file: /cvsroot/win32forth/win32forth/apps/ForthForm/FORTHFORM.F,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** FORTHFORM.F 29 May 2006 17:13:14 -0000 1.14 --- FORTHFORM.F 20 Nov 2006 14:18:17 -0000 1.15 *************** *** 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 *************** *** 143,146 **** --- 143,147 ---- defer doLoadsession \ reload a saved state defer doCloseAllForms + defer doCloseForm defer doSaveAll defer doMoveToBack *************** *** 631,641 **** then r> IsChildState: ActiveForm ; is doTest :NoName ( -- ) \ clean slate ! #Forms ?dup ! if 1+ 1 ! do i >Link#: FormList ! Data@: FormList CloseForm: TheMainWindow ! loop ! then ; is doCloseAllForms :NoName ( -- ) \ save all modified forms --- 632,669 ---- then r> IsChildState: ActiveForm ; is doTest + : CloseForm { theform -- } + Close: theform + theform ?FormNumber >Link#: FormList + theform Dispose + 0 Data!: FormList + DeleteLink: FormList + #Forms 0= + if Blank: Monitor + ForthFormTitle$ SetText: TheMainWindow + ClearStatusWindow + SetFocus: TheMainWindow + 0 to ActiveForm + \ InhibitPropertyWindow + Close: frmProperties++ + UpdateSystem + FormList Dispose 0 to FormList + else SetFocus: [ Data@: FormList ] + ActiveControl: Activeform + if UpdatePropertyWindow + then + then UpdateFormPicker + #Forms 2 < + if Close: frmCreatePropertyForm + UpdateSystem + then ; ' CloseForm is doCloseForm + + :NoName ( -- ) \ clean slate ! FormList 0= ?exit ! >FirstLink: FormList ! Begin FormList ! While Data@: FormList CloseForm ! Repeat ; is doCloseAllForms ! :NoName ( -- ) \ save all modified forms *************** *** 877,881 **** :M Close: ( -- ) SaveDefaults ! DisposeForms Close: TheRebar Close: Monitor --- 905,909 ---- :M Close: ( -- ) SaveDefaults ! doCloseAllForms Close: TheRebar Close: Monitor *************** *** 975,1003 **** 0 ;M - :M CloseForm: { <form> -- } - Close: <Form> - <Form> ?FormNumber >Link#: FormList - <Form> Dispose - 0 Data!: FormList - DeleteLink: FormList - #Forms 0= - if Blank: Monitor - ForthFormTitle$ SetText: self - ClearStatusWindow - SetFocus: TheMainWindow - 0 to ActiveForm - \ InhibitPropertyWindow - Close: frmProperties++ - UpdateSystem - else SetFocus: [ Data@: FormList ] - ActiveControl: Activeform - if UpdatePropertyWindow - then - then UpdateFormPicker - #Forms 2 < - if Close: frmCreatePropertyForm - UpdateSystem - then ;M - :M PushKey: ( c -- ) case --- 1003,1006 ---- *************** *** 1237,1240 **** --- 1240,1244 ---- \+ sysgen s" %DIRSciEditMdi.exe %FILENAME %LINE" editor$ place \+ sysgen s" %DIRSciEditMdi.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 Index: FormMenu.f =================================================================== RCS file: /cvsroot/win32forth/win32forth/apps/ForthForm/FormMenu.f,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** FormMenu.f 1 Nov 2005 23:14:04 -0000 1.2 --- FormMenu.f 20 Nov 2006 14:18:17 -0000 1.3 *************** *** 7,11 **** MenuItem "&Open\tCtrl+O" doOpen ; :MenuItem mnu_doform "&Edit properties" doForm ; ! :MenuItem mnu_close "Close Active &Form" ActiveForm if Close: ActiveForm then ; :MenuItem mnu_closeall "&Close All" doCloseAllForms ; MenuSeparator --- 7,11 ---- MenuItem "&Open\tCtrl+O" doOpen ; :MenuItem mnu_doform "&Edit properties" doForm ; ! :MenuItem mnu_close "Close Active &Form" ActiveForm if ActiveForm doCloseForm then ; :MenuItem mnu_closeall "&Close All" doCloseAllForms ; MenuSeparator Index: FORMCONTROLS.F =================================================================== RCS file: /cvsroot/win32forth/win32forth/apps/ForthForm/FORMCONTROLS.F,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** FORMCONTROLS.F 4 Nov 2005 06:40:15 -0000 1.5 --- FORMCONTROLS.F 20 Nov 2006 14:18:17 -0000 1.6 *************** *** 760,764 **** Update: self ;M ! : default-font ( -- ) Delete: TheFont --- 760,764 ---- Update: self ;M ! : default-font ( -- ) Delete: TheFont *************** *** 773,777 **** Update: self ;M ! : SetTheFont ( -- ) ctrlFont TheFont.LogFont sizeOf(LogFont) move --- 773,777 ---- Update: self ;M ! : SetTheFont ( -- ) ctrlFont TheFont.LogFont sizeOf(LogFont) move *************** *** 883,890 **** :M IsGlobal: ( f -- ) to ctrlGlobal ;M ! :M FontChanged: ( -- f ) fontchanged ;M ! :M FontData: ( -- addr cnt ) ctrlfont sizeof(logfont) ;M --- 883,890 ---- :M IsGlobal: ( f -- ) to ctrlGlobal ;M ! :M FontChanged: ( -- f ) fontchanged ;M ! :M FontData: ( -- addr cnt ) ctrlfont sizeof(logfont) ;M *************** *** 951,955 **** ;M ! :M ~: ( -- ) \ what to do when disposing control TheControl if GetHandle: TheControl --- 951,955 ---- ;M ! :M Free: ( -- ) \ what to do when disposing control TheControl if GetHandle: TheControl Index: FORMOBJECT.F =================================================================== RCS file: /cvsroot/win32forth/win32forth/apps/ForthForm/FORMOBJECT.F,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** FORMOBJECT.F 5 Jul 2006 14:38:43 -0000 1.12 --- FORMOBJECT.F 20 Nov 2006 14:18:17 -0000 1.13 *************** *** 221,231 **** ControlList if >FirstLink: ControlList ! #controls 0 ! do Data@: ControlList dup to ThisControl ! if ThisControl dispose ! 0 Data!: ControlList ! DeleteLink: ControlList ! then >NextLink: ControlList ! loop then 0 to ActiveControl ; --- 221,231 ---- ControlList if >FirstLink: ControlList ! begin Data@: ControlList dup to ThisControl ! while Free: ThisControl ! \ ThisControl Dispose ! 0 Data!: ControlList ! DeleteLink: ControlList ! repeat ControlList Dispose ! 0 to ControlList then 0 to ActiveControl ; *************** *** 1291,1299 **** if SaveIt? if SaveForm ! then then Close: Super ;M :M WM_CLOSE ( -- ) \ let parent do the closing ! self CloseForm: TheMainWindow ;M --- 1291,1299 ---- if SaveIt? if SaveForm ! then DisposeControls then Close: Super ;M :M WM_CLOSE ( -- ) \ let parent do the closing ! self doCloseForm ;M Index: CreateToolBar.f =================================================================== RCS file: /cvsroot/win32forth/win32forth/apps/ForthForm/CreateToolBar.f,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** CreateToolBar.f 1 Nov 2005 23:14:04 -0000 1.4 --- CreateToolBar.f 20 Nov 2006 14:18:17 -0000 1.5 *************** *** 71,75 **** if &bitmap SetBitmap: TheBitmap \ width height dc.hdc ShowFittedBitmap: TheBitmap ! 0 0 dc.hdc ShowBitmap: TheBitmap else 0 0 width height WHITE FillArea: dc then ;M --- 71,75 ---- if &bitmap SetBitmap: TheBitmap \ width height dc.hdc ShowFittedBitmap: TheBitmap ! 0 0 GetHandle: dc ShowBitmap: TheBitmap else 0 0 width height WHITE FillArea: dc then ;M *************** *** 97,101 **** mousex to savex mousey to savey ; ! : showposition ( -- ) ShowBox --- 97,101 ---- mousex to savex mousey to savey ; ! : showposition ( -- ) ShowBox |
×
Want the latest updates on software, tech news, and AI?
Get latest updates about software, tech news, and AI from SourceForge directly in your inbox once a month.
Thanks for helping keep SourceForge clean.
X