[Win32forth-cvs] win32forth/apps/Win32ForthIDE ProjectWindow.f, 1.8, 1.9

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

Update of /cvsroot/win32forth/win32forth/apps/Win32ForthIDE
In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv11109

Modified Files:
	ProjectWindow.f 
Log Message:
Minor mods. EAB

Index: ProjectWindow.f
===================================================================
RCS file: /cvsroot/win32forth/win32forth/apps/Win32ForthIDE/ProjectWindow.f,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** ProjectWindow.f	3 Jun 2010 08:56:38 -0000	1.8
--- ProjectWindow.f	2 Dec 2010 05:23:56 -0000	1.9
***************
*** 56,59 ****
--- 56,61 ----
  Label lblInfo1
  Label lblInfo2
+ TextBox txtFindInTree
+ s" After tracking, select list, type text and press enter for quick find" BInfo: txtFindInTree place
  PushButton btnTrack
  PushButton btnGoto
***************
*** 202,205 ****
--- 204,208 ----
  0 value  MethodsList
  0 value  PrivateCodeList
+ 0 Value ActiveList
  
  false value in-class?
***************
*** 217,220 ****
--- 220,224 ----
  hash-table-size cell / 1- constant max-hash-items ( 32k )
  hash-table-size Pointer GrandChildList	\ instance items to be disposed
+ int hwndimage
  
  enum:
***************
*** 246,249 ****
--- 250,256 ----
                  PrivateDataList ;M
  
+ :M PrivateCodeList:   ( -- list )
+                 PrivateCodeList ;M
+ 
  :M GlobalDataList:  ( -- list )
  		GlobalDataList ;M
***************
*** 432,435 ****
--- 439,453 ----
  		then	;
  
+ :M Find:          { addr cnt \  list-item -- } \ searches children for text beginning with addr cnt, scroll child into view if found
+                        ActiveList 0= ?exitm      \ no parent selected
+                        #items: ActiveList 1+ 1
+                        ?do      i >Link#: ActiveList
+                                    Data@: ActiveList to list-item
+                                    getname: list-item cnt addr cnt caps-compare 0=        \ item begins with addr cnt?
+                                    \ note that because the lists are sorted the first entry may not necessarily be the one found
+                                    if   handle: list-item TVGN_FIRSTVISIBLE SelectItem: Self leave
+                                    then
+                         loop    ;M
+ 
  :M SortParentLists:   ( -- )
  \ Sort the content of the lists
***************
*** 477,481 ****
                _classes_		s" Objects & Classes"   new> treelinked-list to ClassesList
                ;
- int hwndimage
  
  : CreateImageList ( -- )    \ create image list for treeview control
--- 495,498 ----
***************
*** 575,582 ****
  		auto-showfile
          else	ItemID: SelectedItem 0<	\ category selected
! 		if	#items: SelectedItem (.) pad place
  			s"  entries" pad +place
  			pad count
! 		else	s" "	\ root item
  		then	SetText: lblInfo1 s" " SetText: lblInfo2
          then	false
--- 592,601 ----
  		auto-showfile
          else	ItemID: SelectedItem 0<	\ category selected
! 		if	SelectedItem to ActiveList
!                         #items: SelectedItem (.) pad place
  			s"  entries" pad +place
  			pad count
! 		else	0 to ActiveList
!                         s" "	\ root item
  		then	SetText: lblInfo1 s" " SetText: lblInfo2
          then	false
***************
*** 809,812 ****
--- 828,832 ----
                  SortParentLists: Self
                  0 to selecteditem
+                 0 to ActiveList
                  s" " SetText: lblInfo1
  		;M
***************
*** 814,817 ****
--- 834,850 ----
  ;object
  
+ : FindInTree    ( addr cnt -- )
+                         Find: NavigatorTree ;
+ 
+ : FITWmChar      ( h m w l obj -- res )
+                 2 pick VK_RETURN  =
+                 if      GetText: [  ]  ?dup  \ get adr,len of edit control text
+                         if      FindInTree
+                         else    drop
+                         then    false           \ we already processed this message
+                 else    drop            \ discard object
+                             true            \ and use default processing
+                 then    ;
+ 
  \ \\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\
  \ \\\\\ Top window pane \\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\
***************
*** 855,858 ****
--- 888,897 ----
  		Handle: TabFont SetFont: lblInfo2
  
+ 		WS_BORDER AddStyle: txtFindInTree
+ 		Self Start: txtFindIntree
+ 		Handle: TabFont SetFont: txtFindInTree
+ 		s" Quick find" SetText: txtFindInTree
+ 		['] FITWmChar SetWmChar: txtFindInTree
+ 
                  ;M
  
***************
*** 861,866 ****
  		0 25 Width Height 75 - Move: NavigatorTree
  
! 		0 0 75 24   Move: btnTrack
! 		77 0 75 24 Move: btnGoto
  
  		0 Height 50 - Width 24 Move: lblInfo1
--- 900,907 ----
  		0 25 Width Height 75 - Move: NavigatorTree
  
! 		0 0 60 20   Move: btnTrack
! 		62 0 60 20 Move: btnGoto
! 
! 		124 0 200 20 Move: txtFindInTree
  
  		0 Height 50 - Width 24 Move: lblInfo1