Update of /cvsroot/win32forth/win32forth/demos In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5876/demos Modified Files: DLGTEST.F HELLO.F MDIExample.f WINBROWS.F WINDEMO.F WINDILOG.F WINPAR.F WINSER.F pentom.f taskdemo.f Log Message: Removed REL>ABS and ABS>REL from the applications and demos, and made the demos work with the current w32f version Index: WINDILOG.F =================================================================== RCS file: /cvsroot/win32forth/win32forth/demos/WINDILOG.F,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** WINDILOG.F 21 Dec 2004 00:18:53 -0000 1.1 --- WINDILOG.F 5 May 2005 09:43:29 -0000 1.2 *************** *** 65,81 **** 4 140 100 60 Move: List_1 0 0 LB_RESETCONTENT GetID: List_1 SendDlgItemMessage: self drop ! z" Ola1 " rel>abs 0 LB_ADDSTRING GetID: List_1 SendDlgItemMessage: self drop ! z" Ola2 " rel>abs 0 LB_ADDSTRING GetID: List_1 SendDlgItemMessage: self drop ! z" Ola3 " rel>abs 0 LB_ADDSTRING GetID: List_1 SendDlgItemMessage: self drop self Start: CbList_1 4 220 100 90 Move: CbList_1 0 0 CB_RESETCONTENT GetID: CbList_1 SendDlgItemMessage: self drop ! z" Ola4 " rel>abs 0 CB_ADDSTRING GetID: CbList_1 SendDlgItemMessage: self drop ! z" Ola5 " rel>abs 0 CB_ADDSTRING GetID: CbList_1 SendDlgItemMessage: self drop ! z" Ola6 " rel>abs 0 CB_ADDSTRING GetID: CbList_1 SendDlgItemMessage: self drop ! z" Ola7 " rel>abs 0 CB_ADDSTRING GetID: CbList_1 SendDlgItemMessage: self drop ! z" Ola8 " rel>abs 0 CB_ADDSTRING GetID: CbList_1 SendDlgItemMessage: self drop ! z" Ola9 " rel>abs 0 CB_ADDSTRING GetID: CbList_1 SendDlgItemMessage: self drop 0 0 CB_SETCURSEL GetID: CbList_1 SendDlgItemMessage: self drop --- 65,81 ---- 4 140 100 60 Move: List_1 0 0 LB_RESETCONTENT GetID: List_1 SendDlgItemMessage: self drop ! z" Ola1 " 0 LB_ADDSTRING GetID: List_1 SendDlgItemMessage: self drop ! z" Ola2 " 0 LB_ADDSTRING GetID: List_1 SendDlgItemMessage: self drop ! z" Ola3 " 0 LB_ADDSTRING GetID: List_1 SendDlgItemMessage: self drop self Start: CbList_1 4 220 100 90 Move: CbList_1 0 0 CB_RESETCONTENT GetID: CbList_1 SendDlgItemMessage: self drop ! z" Ola4 " 0 CB_ADDSTRING GetID: CbList_1 SendDlgItemMessage: self drop ! z" Ola5 " 0 CB_ADDSTRING GetID: CbList_1 SendDlgItemMessage: self drop ! z" Ola6 " 0 CB_ADDSTRING GetID: CbList_1 SendDlgItemMessage: self drop ! z" Ola7 " 0 CB_ADDSTRING GetID: CbList_1 SendDlgItemMessage: self drop ! z" Ola8 " 0 CB_ADDSTRING GetID: CbList_1 SendDlgItemMessage: self drop ! z" Ola9 " 0 CB_ADDSTRING GetID: CbList_1 SendDlgItemMessage: self drop 0 0 CB_SETCURSEL GetID: CbList_1 SendDlgItemMessage: self drop Index: WINDEMO.F =================================================================== RCS file: /cvsroot/win32forth/win32forth/demos/WINDEMO.F,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** WINDEMO.F 21 Dec 2004 00:18:53 -0000 1.1 --- WINDEMO.F 5 May 2005 09:43:29 -0000 1.2 *************** *** 316,320 **** StartSize: self drop width max StartSize: Demo-Tool-Bar nip SetRect: DemoRect ! DemoRect.AddrOf rel>abs GetHandle: dc call FillRect ?win-error EraseRect: DemoRect On_Paint: super --- 316,320 ---- StartSize: self drop width max StartSize: Demo-Tool-Bar nip SetRect: DemoRect ! DemoRect.AddrOf GetHandle: dc call FillRect ?win-error EraseRect: DemoRect On_Paint: super *************** *** 560,564 **** NULL IMAGE_BITMAP ! open$ dup +NULL 1+ rel>abs NULL Call LoadImage to hbm --- 560,564 ---- NULL IMAGE_BITMAP ! open$ dup +NULL 1+ NULL Call LoadImage to hbm *************** *** 691,695 **** DIB_RGB_COLORS ! pbmi rel>abs NULL SCREEN-HEIGHT --- 691,695 ---- DIB_RGB_COLORS ! pbmi NULL SCREEN-HEIGHT *************** *** 702,711 **** \ pbmi show-bitmapinfoheader ! pbmi biSizeImage + @ malloc rel>abs to lpBits ! lpBits abs>rel pbmi biSizeImage + @ erase DIB_RGB_COLORS ! pbmi rel>abs lpBits SCREEN-HEIGHT --- 702,711 ---- \ pbmi show-bitmapinfoheader ! pbmi biSizeImage + @ malloc to lpBits ! lpBits pbmi biSizeImage + @ erase DIB_RGB_COLORS ! pbmi lpBits SCREEN-HEIGHT *************** *** 749,753 **** hfile write-file drop ! lpBits abs>rel pbmi biSizeImage + @ hfile write-file drop --- 749,753 ---- hfile write-file drop ! lpBits pbmi biSizeImage + @ hfile write-file drop *************** *** 759,763 **** ! lpBits abs>rel release pbmi release ELSE drop --- 759,763 ---- ! lpBits release pbmi release ELSE drop *************** *** 987,991 **** DIB_RGB_COLORS ! pbmi rel>abs NULL SCREEN-HEIGHT --- 987,991 ---- DIB_RGB_COLORS ! pbmi NULL SCREEN-HEIGHT *************** *** 998,1007 **** \ pbmi show-bitmapinfoheader ! pbmi biSizeImage + @ malloc rel>abs to lpBits ! lpBits abs>rel pbmi biSizeImage + @ erase DIB_RGB_COLORS ! pbmi rel>abs lpBits SCREEN-HEIGHT --- 998,1007 ---- \ pbmi show-bitmapinfoheader ! pbmi biSizeImage + @ malloc to lpBits ! lpBits pbmi biSizeImage + @ erase DIB_RGB_COLORS ! pbmi lpBits SCREEN-HEIGHT *************** *** 1016,1020 **** SRCCOPY DIB_RGB_COLORS ! pbmi rel>abs lpBits --- 1016,1020 ---- SRCCOPY DIB_RGB_COLORS ! pbmi lpBits *************** *** 1035,1039 **** ! lpBits abs>rel release pbmi release ; --- 1035,1039 ---- ! lpBits release pbmi release ; Index: WINPAR.F =================================================================== RCS file: /cvsroot/win32forth/win32forth/demos/WINPAR.F,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 Binary files /tmp/cvswrC0fV and /tmp/cvs0XndSg differ Index: taskdemo.f =================================================================== RCS file: /cvsroot/win32forth/win32forth/demos/taskdemo.f,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** taskdemo.f 21 Dec 2004 00:18:53 -0000 1.1 --- taskdemo.f 5 May 2005 09:43:29 -0000 1.2 *************** *** 61,65 **** taskwaits while ! INFINITE false taskhndls rel>abs \ wait for 1 or more tasks to end taskwaits call WaitForMultipleObjects \ wait on handles list dup WAIT_FAILED = if getlastwinerr then \ note the error --- 61,65 ---- taskwaits while ! INFINITE false taskhndls \ wait for 1 or more tasks to end taskwaits call WaitForMultipleObjects \ wait on handles list dup WAIT_FAILED = if getlastwinerr then \ note the error *************** *** 108,112 **** speed . cr console-lock unlock ! s" src\task.f" Prepend<home>\ t2-openfile begin pad 256 fhndl @ read-line abort" IO Error!" --- 108,112 ---- speed . cr console-lock unlock ! s" src\lib\task.f" Prepend<home>\ t2-openfile begin pad 256 fhndl @ read-line abort" IO Error!" *************** *** 140,141 **** --- 140,142 ---- .( Type Demo2 to start Demo2, any key to stop) cr + |