From: Ezra B. <ezr...@us...> - 2008-10-01 03:09:04
|
Update of /cvsroot/win32forth/win32forth/apps/Win32ForthIDE In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv18122/apps/Win32ForthIDE Modified Files: EdFormWindow.f EdToolbar.f Log Message: Bug fix for ?control. Minor updates. EAB Index: EdToolbar.f =================================================================== RCS file: /cvsroot/win32forth/win32forth/apps/Win32ForthIDE/EdToolbar.f,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** EdToolbar.f 3 Aug 2008 10:56:42 -0000 1.14 --- EdToolbar.f 1 Oct 2008 03:08:51 -0000 1.15 *************** *** 312,316 **** eraseband-info GetHandle: helpbox ! z" View Source for:" to lptext [ RBBS_GRIPPERALWAYS RBBS_CHILDEDGE or ] literal 150 insert-band ; --- 312,316 ---- eraseband-info GetHandle: helpbox ! z" Help on:" to lptext [ RBBS_GRIPPERALWAYS RBBS_CHILDEDGE or ] literal 150 insert-band ; *************** *** 349,365 **** ;object ! : $browse ( line_number file_name len -- ) ! NewBrowseChild LoadHyperFile: ActiveBrowser ! SetBrowseMode: ActiveBrowser Update ; ! ! : ?viewsource { addr cnt -- } ! \in-system-ok addr cnt "CLIP" "anyfind \ find it if it exist \ ! if ! \in-system-ok get-viewfile ! if count $browse ! else 2drop ! then addr cnt InsertString: helpbox \ save help string as entered ! else drop beep ! then ; \ copied from WinED --- 349,369 ---- ;object ! : GetSomeHelp { addr cnt \ cfa -- } ! \in-system-ok addr cnt "CLIP" "anyfind \ find it if it exist \ ! swap to cfa ! if addr cnt InsertString: helpbox \ save string ! 0 0 ExecHelp drop \ launch help or put it in front ! addr cnt msgpad place \ try to show word from help ! msgpad dup c@ 1+ WM_WORDHELP w32fHelp Sendw32fMsg ! 0= \ if not in help database, show source ! if cfa ! \in-system-ok get-viewfile ! drop count ! rot msgpad ! ! dup 1+ >r msgpad cell+ place ! msgpad r> cell+ WM_LINEFILE w32fHelp Sendw32fMsg drop ! then ! else beep ! then ; \ copied from WinED *************** *** 367,371 **** 2 pick VK_RETURN = \ if return if GetText: [ ] \ get adr,len of edit control text ! ?viewsource false else drop true --- 371,375 ---- 2 pick VK_RETURN = \ if return if GetText: [ ] \ get adr,len of edit control text ! GetSomeHelp false else drop true *************** *** 374,378 **** ' myWmChar SetWmChar: helpbox - \ ----------------------------------------------------------------------------------- \ ----------------------------------------------------------------------------------- --- 378,381 ---- Index: EdFormWindow.f =================================================================== RCS file: /cvsroot/win32forth/win32forth/apps/Win32ForthIDE/EdFormWindow.f,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** EdFormWindow.f 24 Aug 2008 05:07:27 -0000 1.3 --- EdFormWindow.f 1 Oct 2008 03:08:51 -0000 1.4 *************** *** 1,3 **** ! \ COLOR_BTNFACE Call GetSysColor new-color BTNFACE load-bitmap formbitmap "res\FFBITMAPS.BMP" --- 1,3 ---- ! \ EdFormWindow.f load-bitmap formbitmap "res\FFBITMAPS.BMP" *************** *** 6,10 **** load-bitmap PictureBitmap "picture.bmp" - :Object FormBar <Super Win32Toolbar --- 6,9 ---- *************** *** 151,155 **** : ?TypeTextBox ( -- type ) ! ?control \ control key pressed while buttonclicked? if TypeMultiLineBox else TypeTextBox --- 150,154 ---- : ?TypeTextBox ( -- type ) ! control-key? \ control key pressed while buttonclicked? if TypeMultiLineBox else TypeTextBox *************** *** 157,161 **** : ?TypeLabel ( -- type ) ! ?control \ control key pressed while buttonclicked? if TypeStaticBitmap else TypeLabel --- 156,160 ---- : ?TypeLabel ( -- type ) ! control-key? \ control key pressed while buttonclicked? if TypeStaticBitmap else TypeLabel *************** *** 163,167 **** : ?TypeComboBox ( -- type ) ! ?control \ control key pressed while buttonclicked? if TypeComboListBox else TypeComboBox --- 162,166 ---- : ?TypeComboBox ( -- type ) ! control-key? \ control key pressed while buttonclicked? if TypeComboListBox else TypeComboBox *************** *** 169,173 **** : ?TypeListBox ( -- type ) ! ?control \ control key pressed while buttonclicked? if TypeMultiListBox else TypeListBox --- 168,172 ---- : ?TypeListBox ( -- type ) ! control-key? \ control key pressed while buttonclicked? if TypeMultiListBox else TypeListBox *************** *** 200,214 **** :M WM_COMMAND ( hwnd msg wparam lparam -- res ) ! ?dup 0= ! if LOWORD ! CurrentMenu ! if dup DoMenu: CurrentMenu ! then ! CurrentPopup ! if dup DoMenu: CurrentPopup ! then drop ! else over HIWORD ( notification code ) rot LOWORD ( ID ) ! On_Command: [ self ] ! then 0 ;M --- 199,204 ---- :M WM_COMMAND ( hwnd msg wparam lparam -- res ) ! over HIWORD ( notification code ) rot LOWORD ( ID ) ! On_Command: self 0 ;M *************** *** 249,263 **** :M WM_COMMAND ( hwnd msg wparam lparam -- res ) ! ?dup 0= ! if LOWORD ! CurrentMenu ! if dup DoMenu: CurrentMenu ! then ! CurrentPopup ! if dup DoMenu: CurrentPopup ! then drop ! else over HIWORD ( notification code ) rot LOWORD ( ID ) ! On_Command: [ self ] ! then 0 ;M --- 239,244 ---- :M WM_COMMAND ( hwnd msg wparam lparam -- res ) ! over HIWORD ( notification code ) rot LOWORD ( ID ) ! On_Command: self 0 ;M |