Menu
▾
▴
[Win32forth-cvs] win32forth/apps/ForthForm FileLister.f, 1.3, 1.4 IMAGEWINDOW.F, 1.3, 1.4
|
From: Dirk B. <db...@us...> - 2006-06-11 07:37:30
|
Update of /cvsroot/win32forth/win32forth/apps/ForthForm In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv23478/apps/ForthForm Modified Files: FileLister.f IMAGEWINDOW.F Log Message: - Changed the TreeViewControl to use the control class as the base class. - Moved some methods from the ProjectTreeViewControl into the TreeViewControl class. - Changed the TreeViewControl to use SendMessage:self and SendMessage:selfdrop - AutoSize: method added to the control and the child-window class. Index: IMAGEWINDOW.F =================================================================== RCS file: /cvsroot/win32forth/win32forth/apps/ForthForm/IMAGEWINDOW.F,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** IMAGEWINDOW.F 9 Jun 2006 04:34:00 -0000 1.3 --- IMAGEWINDOW.F 11 Jun 2006 07:37:26 -0000 1.4 *************** *** 608,621 **** ;M - \ :M On_Size: ( -- ) - \ \ Refresh: self - \ ;M - - :M AutoSize: ( -- ) - tempRect.AddrOf GetClientRect: Parent - 0 0 Right: tempRect Bottom: tempRect \ x,y,h,w - Move: self - ;M - :M On_Paint: ( -- ) Refresh: self --- 608,611 ---- Index: FileLister.f =================================================================== RCS file: /cvsroot/win32forth/win32forth/apps/ForthForm/FileLister.f,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** FileLister.f 6 Jun 2006 03:03:49 -0000 1.3 --- FileLister.f 11 Jun 2006 07:37:26 -0000 1.4 *************** *** 190,206 **** :m isitemid: ( f -- ) to itemid ;m ! :m iconhandle: ( -- n ) iconhandle ;m ! :m isiconhandle: ( n -- ) to iconhandle ;m ! :m index: ( -- n ) index @ ;m ! :m isindex: ( n -- ) index ! ;m ! :M AddIcon: ( -- ) index itemname conhndl Call ExtractAssociatedIcon to iconhandle --- 190,206 ---- :m isitemid: ( f -- ) to itemid ;m ! :m iconhandle: ( -- n ) iconhandle ;m ! :m isiconhandle: ( n -- ) to iconhandle ;m ! :m index: ( -- n ) index @ ;m ! :m isindex: ( n -- ) index ! ;m ! :M AddIcon: ( -- ) index itemname conhndl Call ExtractAssociatedIcon to iconhandle *************** *** 321,325 **** :m Getpath: ( -- addr cnt ) treepath count ;M ! :M SetSpecs: ( addr cnt -- ) thespecs place ;M --- 321,325 ---- :m Getpath: ( -- addr cnt ) treepath count ;M ! :M SetSpecs: ( addr cnt -- ) thespecs place ;M *************** *** 327,331 **** :M GetSpecs: ( -- addr cnt ) thespecs count ;M ! :M IsLabelHandle: ( hwnd -- ) to hwndlabel ;M --- 327,331 ---- :M GetSpecs: ( -- addr cnt ) thespecs count ;M ! :M IsLabelHandle: ( hwnd -- ) to hwndlabel ;M *************** *** 344,348 **** hwnd send-window ; ! : add-icons { \ item -- } \ add icon for each file total: folderlist 1+ 1 --- 344,348 ---- hwnd send-window ; ! : add-icons { \ item -- } \ add icon for each file total: folderlist 1+ 1 *************** *** 396,400 **** else index: ThisItem \ use associated file icon then ; ! : AddTreeItem ( -- ) \ add file or directory to tree tvins /tvins erase --- 396,400 ---- else index: ThisItem \ use associated file icon then ; ! : AddTreeItem ( -- ) \ add file or directory to tree tvins /tvins erase *************** *** 516,520 **** then Close: super ;m ! : FindAllFiles ( -- ) path-ptr >r --- 516,520 ---- then Close: super ;m ! : FindAllFiles ( -- ) path-ptr >r *************** *** 554,557 **** --- 554,567 ---- ['] 0> to sortorder ;M + : null-check ( a1 -- a1 ) + ?win-error-enabled 0= + if dup 0= + if drop ['] noop \ convert null to NOOP + exit \ and exit + then + then + dup 0= s" Attempt to execute a NULL function" ?TerminateBox + ; + : dosortorder ( n -- f ) sortorder null-check execute ; *************** *** 585,589 **** if #dirs recbuffer() #fls sort \ and the files then writerecbuffer ; ! : show-path ( -- ) hwndlabel 0= ?exit --- 595,599 ---- if #dirs recbuffer() #fls sort \ and the files then writerecbuffer ; ! : show-path ( -- ) hwndlabel 0= ?exit *************** *** 625,629 **** ;m ! :M On_SelChanged: ( -- f ) \ lparamNew to SelectedItem SelectedItem tree-click null-check execute --- 635,639 ---- ;m ! :M On_SelChanged: ( -- f ) \ lparamNew to SelectedItem SelectedItem tree-click null-check execute *************** *** 701,713 **** to wstyle ;M ! :M On_Size: ( -- ) ! autosize: thisfolder ! ;M ! ! :M AutoSize: ( -- ) ! tempRect.AddrOf GetClientRect: Parent ! 0 0 Right: tempRect Bottom: tempRect \ x,y,h,w ! Move: self ! ;M :M #Dirs: ( -- n ) --- 711,716 ---- to wstyle ;M ! :M On_Size: ( -- ) ! autosize: thisfolder ;M :M #Dirs: ( -- n ) *************** *** 747,751 **** :M GetSpecs: ( -- addr cnt ) GetSpecs: ThisFolder ;M ! :M IsLabelhandle: ( hwnd -- ) \ handle of window that will display path name IsLabelHandle: ThisFolder ;M --- 750,754 ---- :M GetSpecs: ( -- addr cnt ) GetSpecs: ThisFolder ;M ! :M IsLabelhandle: ( hwnd -- ) \ handle of window that will display path name IsLabelHandle: ThisFolder ;M *************** *** 762,766 **** :M SelectedItem: ( -- ) \ selected file or directory, itemid = 0 means it is a file SelectedItem: ThisFolder ;M ! :M Total: ( -- n ) \ sum of files and directories #dirs: self #files: self + ;M --- 765,769 ---- :M SelectedItem: ( -- ) \ selected file or directory, itemid = 0 means it is a file SelectedItem: ThisFolder ;M ! :M Total: ( -- n ) \ sum of files and directories #dirs: self #files: self + ;M *************** *** 768,772 **** :M FileList: ( -- list ) FileList: ThisFolder ;M ! :M ChooseFolder: ( -- ) \ change folder programatically, also available by right clicking hwnd 0= ?exitm --- 771,775 ---- :M FileList: ( -- list ) FileList: ThisFolder ;M ! :M ChooseFolder: ( -- ) \ change folder programatically, also available by right clicking hwnd 0= ?exitm |
