From: George H. <geo...@us...> - 2011-08-19 21:22:34
|
Update of /cvsroot/win32forth/win32forth/src/lib In directory vz-cvs-4.sog:/tmp/cvs-serv1713 Modified Files: BLOCK.F DIALOGRC.F Log Message: Ported to V6.15 Index: BLOCK.F =================================================================== RCS file: /cvsroot/win32forth/win32forth/src/lib/BLOCK.F,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** BLOCK.F 28 Oct 2006 10:58:58 -0000 1.6 --- BLOCK.F 19 Aug 2011 21:22:32 -0000 1.7 *************** *** 1,4 **** \ $Id$ ! \ BLOCK.F Tom's Forth virtual block system. by Tom Zimmer cr .( Loading BLOCK...) --- 1,5 ---- \ $Id$ ! ! \ Tom's Forth virtual block system. by Tom Zimmer cr .( Loading BLOCK...) Index: DIALOGRC.F =================================================================== RCS file: /cvsroot/win32forth/win32forth/src/lib/DIALOGRC.F,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** DIALOGRC.F 21 Dec 2004 00:19:10 -0000 1.1 --- DIALOGRC.F 19 Aug 2011 21:22:32 -0000 1.2 *************** *** 1,3 **** ! \ DIALOGRC.F a Dialog Ressource Compiler wordset \ by mi...@ki... (Michael Schroeder) --- 1,3 ---- ! \ DIALOGRC.F a Dialog Resource Compiler wordset \ by mi...@ki... (Michael Schroeder) *************** *** 6,25 **** \ which is not needed any longer since FIND-DIALOG-ID has been changed to be \ compatible with the use of FIND-DIALOG-TEMPLATE. - \ - \ updated for Win32Forth Version 6.09.05 - \ Sonntag, Mai 02 2004 - dbu \ -------------------------------------------------------------- ! \ A Dialog Ressource Compiler Add-On for Win32Forth \ \ The package contains the following files: \ - DIALOGRC.F ! \ this file, the main source of the ressource \ compiler wordset \ - DIALOGS.F ! \ the dialog ressources from FORTHDLG.DLG \ ported to the DIALOGRC syntax with the original ! \ ressource scripts as comments. Shows the way of ! \ porting existing ressource scripts and was used \ to test the output of dialogrc. \ - DLGTEST.F --- 6,22 ---- \ which is not needed any longer since FIND-DIALOG-ID has been changed to be \ compatible with the use of FIND-DIALOG-TEMPLATE. \ -------------------------------------------------------------- ! \ A Dialog Resource Compiler Add-On for Win32Forth \ \ The package contains the following files: \ - DIALOGRC.F ! \ this file, the main source of the Resource \ compiler wordset \ - DIALOGS.F ! \ the dialog Resources from FORTHDLG.DLG \ ported to the DIALOGRC syntax with the original ! \ resource scripts as comments. Shows the way of ! \ porting existing resource scripts and was used \ to test the output of dialogrc. \ - DLGTEST.F *************** *** 28,32 **** \ I used it, to see if DIALOGRC proper works. \ - DIALOGRC.TXT ! \ glossary of the Dialog Ressource Compiler wordset \ (still incomplete) \ --- 25,29 ---- \ I used it, to see if DIALOGRC proper works. \ - DIALOGRC.TXT ! \ glossary of the Dialog Resource Compiler wordset \ (still incomplete) \ *************** *** 54,58 **** mov eax, [ebp] mov ebx, eax ! sub ebx, edi \ relative address sub ecx, ecx mov cx, [eax] --- 51,55 ---- mov eax, [ebp] mov ebx, eax ! \ sub ebx, edi \ relative address sub ecx, ecx mov cx, [eax] *************** *** 155,167 **** \ -------------------------------------------------------------- ! \ -------------------- Ressource Scope ------------------------- ! : BEGIN-RESSOURCE ( --<RessourceName>-- -- a 6 ) NOSTACK \ suppress stack check at line end ! CREATE HERE \ start of named ressource ! 0 , \ placeholder for the ressource length 6 \ check value for ?pairs ; \ to check scope integrity ! : END-RESSOURCE 6 ?PAIRS \ abort if scope IDD isn't paired HERE OVER - CELL- SWAP ! \ fill the placeholder --- 152,170 ---- \ -------------------------------------------------------------- ! \ -------------------- Resource Scope ------------------------- ! ! in-system ! ! : BEGIN-RESOURCE ( --<ResourceName>-- -- a 6 ) NOSTACK \ suppress stack check at line end ! CREATE HERE \ start of named resource ! 0 , \ placeholder for the resource length 6 \ check value for ?pairs ; \ to check scope integrity ! : BEGIN-RESSOURCE ( --<ResourceName>-- -- a 6 ) ! Begin-Resource ; ! ! : END-RESOURCE ( -- ) 6 ?PAIRS \ abort if scope IDD isn't paired HERE OVER - CELL- SWAP ! \ fill the placeholder *************** *** 169,172 **** --- 172,178 ---- ; + : END-RESSOURCE ( -- ) + END-RESOURCE ; + \ -------------------------------------------------------------- \ -------------------- Dialog Scope ---------------------------- *************** *** 197,202 **** : BEGIN-DIALOG { id x y cx cy -- addr0 addr1 7 } ! ALIGN HERE >R \ save start of ressource entry ! \ first create a 32 Byte generic ressource header (not part of the template) 0 , \ placeholder for length of the following res. data 0x00000020 , \ length of this header (32 Bytes) --- 203,208 ---- : BEGIN-DIALOG { id x y cx cy -- addr0 addr1 7 } ! ALIGN HERE >R \ save start of resource entry ! \ first create a 32 Byte generic resource header (not part of the template) 0 , \ placeholder for length of the following res. data 0x00000020 , \ length of this header (32 Bytes) *************** *** 224,228 **** THEN 0 TO STYLEFLAGS \ reset STYLEFLAGS ALIGN \ once more for safety ! DUP 6 ?PAIRS \ check ressource scope 2R> 7 \ open another scope ... until END-DIALOG ; --- 230,234 ---- THEN 0 TO STYLEFLAGS \ reset STYLEFLAGS ALIGN \ once more for safety ! DUP 6 ?PAIRS \ check resource scope 2R> 7 \ open another scope ... until END-DIALOG ; *************** *** 281,286 **** \ See DIALOGS.F for an example. ! : aCONTROL ( identifier classID xpos ypos xsize ysize --<quoted text>-- -- ) ! { identifier classID xpos ypos xsize ysize -- } STYLEFLAGS WS_CHILD WS_VISIBLE OR OR TO STYLEFLAGS "PARSE-TEXT" ANSI>WIDECHAR \ get following "quoted text" --- 287,291 ---- \ See DIALOGS.F for an example. ! : aCONTROL { identifier classID xpos ypos xsize ysize -- "quoted text" } STYLEFLAGS WS_CHILD WS_VISIBLE OR OR TO STYLEFLAGS "PARSE-TEXT" ANSI>WIDECHAR \ get following "quoted text" *************** *** 296,301 **** \ Additional control styles may be preset with: "... TO STYLEFLAGS" ! : PUSHBUTTON ( identifier xpos ypos xsize ysize --<text>-- -- ) ! { identifier xpos ypos xsize ysize -- } STYLEFLAGS BS_PUSHBUTTON WS_TABSTOP WS_CHILD WS_VISIBLE OR OR OR OR TO STYLEFLAGS --- 301,305 ---- \ Additional control styles may be preset with: "... TO STYLEFLAGS" ! : PUSHBUTTON { identifier xpos ypos xsize ysize -- "text" } STYLEFLAGS BS_PUSHBUTTON WS_TABSTOP WS_CHILD WS_VISIBLE OR OR OR OR TO STYLEFLAGS *************** *** 315,320 **** \ Additional control styles may be preset with: "... TO STYLEFLAGS" ! : DEFPUSHBUTTON ( identifier xpos ypos xsize ysize --<text>-- -- ) ! { identifier xpos ypos xsize ysize -- } STYLEFLAGS BS_DEFPUSHBUTTON WS_TABSTOP WS_CHILD WS_VISIBLE OR OR OR OR TO STYLEFLAGS --- 319,323 ---- \ Additional control styles may be preset with: "... TO STYLEFLAGS" ! : DEFPUSHBUTTON { identifier xpos ypos xsize ysize -- "text" } STYLEFLAGS BS_DEFPUSHBUTTON WS_TABSTOP WS_CHILD WS_VISIBLE OR OR OR OR TO STYLEFLAGS *************** *** 365,370 **** \ Additional control styles may be preset with: "... TO STYLEFLAGS" ! : CHECKBOX ( identifier xpos ypos xsize ysize --<text>-- -- ) ! { identifier xpos ypos xsize ysize -- } STYLEFLAGS BS_CHECKBOX WS_CHILD WS_TABSTOP WS_VISIBLE OR OR OR OR TO STYLEFLAGS --- 368,372 ---- \ Additional control styles may be preset with: "... TO STYLEFLAGS" ! : CHECKBOX { identifier xpos ypos xsize ysize -- "text" } STYLEFLAGS BS_CHECKBOX WS_CHILD WS_TABSTOP WS_VISIBLE OR OR OR OR TO STYLEFLAGS *************** *** 381,386 **** \ Additional control styles may be preset with: "... TO STYLEFLAGS" ! : AUTOCHECKBOX ( identifier xpos ypos xsize ysize --<text>-- -- ) ! { identifier xpos ypos xsize ysize -- } STYLEFLAGS BS_AUTOCHECKBOX WS_CHILD WS_TABSTOP WS_VISIBLE OR OR OR OR TO STYLEFLAGS --- 383,387 ---- \ Additional control styles may be preset with: "... TO STYLEFLAGS" ! : AUTOCHECKBOX { identifier xpos ypos xsize ysize -- "text" } STYLEFLAGS BS_AUTOCHECKBOX WS_CHILD WS_TABSTOP WS_VISIBLE OR OR OR OR TO STYLEFLAGS *************** *** 397,402 **** \ Additional control styles may be preset with: "... TO STYLEFLAGS" ! : RADIOBUTTON ( identifier xpos ypos xsize ysize --<text>-- -- ) ! { identifier xpos ypos xsize ysize -- } STYLEFLAGS BS_RADIOBUTTON WS_CHILD WS_VISIBLE OR OR OR TO STYLEFLAGS --- 398,402 ---- \ Additional control styles may be preset with: "... TO STYLEFLAGS" ! : RADIOBUTTON { identifier xpos ypos xsize ysize -- "text" } STYLEFLAGS BS_RADIOBUTTON WS_CHILD WS_VISIBLE OR OR OR TO STYLEFLAGS *************** *** 462,467 **** \ (But is this useful?) ! : CTEXT ( identifier xpos ypos xsize ysize --<text>-- -- ) ! { identifier xpos ypos xsize ysize -- } STYLEFLAGS SS_CENTER WS_GROUP WS_CHILD WS_VISIBLE OR OR OR OR TO STYLEFLAGS --- 462,466 ---- \ (But is this useful?) ! : CTEXT { identifier xpos ypos xsize ysize -- "text" } STYLEFLAGS SS_CENTER WS_GROUP WS_CHILD WS_VISIBLE OR OR OR OR TO STYLEFLAGS *************** *** 472,475 **** --- 471,476 ---- ; + + \ LTEXT ( identifier xpos ypos xsize ysize --<quoted text>-- -- ) \ defines a left-justified static text control within a dialog structure. *************** *** 478,483 **** \ (But is this useful?) ! : LTEXT ( identifier xpos ypos xsize ysize --<text>-- -- ) ! { identifier xpos ypos xsize ysize -- } STYLEFLAGS SS_LEFT WS_GROUP WS_CHILD WS_VISIBLE OR OR OR OR TO STYLEFLAGS --- 479,483 ---- \ (But is this useful?) ! : LTEXT { identifier xpos ypos xsize ysize -- "text" } STYLEFLAGS SS_LEFT WS_GROUP WS_CHILD WS_VISIBLE OR OR OR OR TO STYLEFLAGS *************** *** 494,499 **** \ (But is this useful?) ! : RTEXT ( identifier xpos ypos xsize ysize --<text>-- -- ) ! { identifier xpos ypos xsize ysize -- } STYLEFLAGS SS_RIGHT WS_GROUP WS_CHILD WS_VISIBLE OR OR OR OR TO STYLEFLAGS --- 494,498 ---- \ (But is this useful?) ! : RTEXT { identifier xpos ypos xsize ysize -- "text" } STYLEFLAGS SS_RIGHT WS_GROUP WS_CHILD WS_VISIBLE OR OR OR OR TO STYLEFLAGS *************** *** 506,515 **** \ ICON ( identifier xpos ypos xsize ysize --<quoted text>-- -- ) \ defines an "icon" bitmap control within a dialog structure. The bitmap is ! \ an icon ressource in the executable file. Therefore ICON cannot be used to ! \ create new icons without commercial ressource compiler :-( sorry! \ The control styles used by ICON are: SS_ICON WS_CHILD WS_VISIBLE. ! : ICON ( identifier xpos ypos xsize ysize --<text>-- -- ) ! { identifier xpos ypos xsize ysize -- } STYLEFLAGS SS_ICON WS_CHILD WS_VISIBLE OR OR OR TO STYLEFLAGS --- 505,513 ---- \ ICON ( identifier xpos ypos xsize ysize --<quoted text>-- -- ) \ defines an "icon" bitmap control within a dialog structure. The bitmap is ! \ an icon resource in the executable file. Therefore ICON cannot be used to ! \ create new icons without commercial Resource compiler :-( sorry! \ The control styles used by ICON are: SS_ICON WS_CHILD WS_VISIBLE. ! : ICON { identifier xpos ypos xsize ysize -- "text" } STYLEFLAGS SS_ICON WS_CHILD WS_VISIBLE OR OR OR TO STYLEFLAGS *************** *** 520,522 **** ; ! --- 518,520 ---- ; ! in-application |