Menu
▾
▴
win32forth-cvs — CVS Commit List
You can subscribe to this list here.
| 2004 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
(70) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2005 |
Jan
(38) |
Feb
(4) |
Mar
(11) |
Apr
(49) |
May
(81) |
Jun
(65) |
Jul
(36) |
Aug
(57) |
Sep
(63) |
Oct
(57) |
Nov
(49) |
Dec
(41) |
| 2006 |
Jan
(75) |
Feb
(80) |
Mar
(10) |
Apr
(13) |
May
(100) |
Jun
(100) |
Jul
(77) |
Aug
(87) |
Sep
(80) |
Oct
(124) |
Nov
(39) |
Dec
(41) |
| 2007 |
Jan
(20) |
Feb
(32) |
Mar
(32) |
Apr
(43) |
May
(146) |
Jun
(40) |
Jul
(49) |
Aug
(33) |
Sep
(25) |
Oct
(19) |
Nov
(11) |
Dec
(8) |
| 2008 |
Jan
(4) |
Feb
(11) |
Mar
(31) |
Apr
(40) |
May
(34) |
Jun
(24) |
Jul
(39) |
Aug
(104) |
Sep
(27) |
Oct
(35) |
Nov
(34) |
Dec
(97) |
| 2009 |
Jan
(75) |
Feb
(29) |
Mar
(45) |
Apr
(76) |
May
(121) |
Jun
(103) |
Jul
(67) |
Aug
(28) |
Sep
(22) |
Oct
(39) |
Nov
(9) |
Dec
(15) |
| 2010 |
Jan
(7) |
Feb
(39) |
Mar
(40) |
Apr
(57) |
May
(67) |
Jun
(69) |
Jul
(49) |
Aug
(68) |
Sep
(22) |
Oct
(7) |
Nov
(2) |
Dec
(10) |
| 2011 |
Jan
|
Feb
|
Mar
(10) |
Apr
(4) |
May
(6) |
Jun
(10) |
Jul
(16) |
Aug
(23) |
Sep
(9) |
Oct
|
Nov
(28) |
Dec
(3) |
| 2012 |
Jan
(11) |
Feb
(10) |
Mar
(1) |
Apr
|
May
(4) |
Jun
(3) |
Jul
(3) |
Aug
(4) |
Sep
(2) |
Oct
|
Nov
|
Dec
(1) |
| 2013 |
Jan
|
Feb
(7) |
Mar
(30) |
Apr
(4) |
May
(4) |
Jun
(8) |
Jul
(10) |
Aug
(4) |
Sep
|
Oct
(2) |
Nov
(24) |
Dec
(13) |
| 2014 |
Jan
(7) |
Feb
(2) |
Mar
|
Apr
(1) |
May
(9) |
Jun
|
Jul
(3) |
Aug
(9) |
Sep
|
Oct
(2) |
Nov
|
Dec
(3) |
| 2015 |
Jan
(4) |
Feb
(2) |
Mar
|
Apr
|
May
|
Jun
(1) |
Jul
|
Aug
(5) |
Sep
(1) |
Oct
(4) |
Nov
(7) |
Dec
(39) |
| 2016 |
Jan
(17) |
Feb
(2) |
Mar
(2) |
Apr
|
May
(1) |
Jun
(1) |
Jul
|
Aug
|
Sep
|
Oct
|
Nov
(1) |
Dec
(2) |
| 2017 |
Jan
|
Feb
(3) |
Mar
|
Apr
|
May
(1) |
Jun
(2) |
Jul
|
Aug
(3) |
Sep
|
Oct
|
Nov
|
Dec
(2) |
| 2018 |
Jan
|
Feb
|
Mar
(2) |
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2019 |
Jan
|
Feb
|
Mar
(1) |
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2022 |
Jan
|
Feb
|
Mar
|
Apr
|
May
(1) |
Jun
|
Jul
|
Aug
|
Sep
(1) |
Oct
(2) |
Nov
(1) |
Dec
(1) |
| 2023 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
(1) |
Sep
|
Oct
(1) |
Nov
|
Dec
|
| 2025 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
(1) |
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: Dirk B. <db...@us...> - 2006-06-11 09:03:58
|
Update of /cvsroot/win32forth/win32forth/apps/ProMgr/res In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv26541/apps/ProMgr/res Modified Files: treeimages.bmp Log Message: Some more work on the ProjectManger within the IDE. Index: treeimages.bmp =================================================================== RCS file: /cvsroot/win32forth/win32forth/apps/ProMgr/res/treeimages.bmp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 Binary files /tmp/cvs6HLF7H and /tmp/cvsX03bfl differ |
|
From: Rod O. <rod...@us...> - 2006-06-11 09:03:56
|
Update of /cvsroot/win32forth/win32forth/src/lib In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv26557/src/lib Modified Files: ButtonBar.f Buttons.f Calendar.f Label.f ListBox.f ProgressBar.f RebarControl.f ScrollBar.f StatusBar.f TabControl.f TextBox.f TrackBar.f UpDownControl.f Log Message: Rod: updated to use SendMessage:SelfDrop Index: ButtonBar.f =================================================================== RCS file: /cvsroot/win32forth/win32forth/src/lib/ButtonBar.f,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** ButtonBar.f 6 Jun 2006 02:58:24 -0000 1.1 --- ButtonBar.f 11 Jun 2006 09:03:49 -0000 1.2 *************** *** 3,7 **** WinLibrary COMCTL32.DLL ! needs sendmessage.f INTERNAL --- 3,7 ---- WinLibrary COMCTL32.DLL ! cr .( Loading ButtonBar Class...) INTERNAL Index: UpDownControl.f =================================================================== RCS file: /cvsroot/win32forth/win32forth/src/lib/UpDownControl.f,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** UpDownControl.f 6 Jun 2006 02:58:24 -0000 1.1 --- UpDownControl.f 11 Jun 2006 09:03:50 -0000 1.2 *************** *** 3,9 **** WinLibrary COMCTL32.DLL - needs sendmessage.f needs textbox.f INTERNAL EXTERNAL --- 3,10 ---- WinLibrary COMCTL32.DLL needs textbox.f + cr .( Loading UpDownControl Class...) + INTERNAL EXTERNAL *************** *** 53,57 **** :M SetBuddy: ( hBuddy -- ) \ *G Sets the buddy window for the up-down control. ! 0 SWAP UDM_SETBUDDY SendMessage:Self DROP ;M :M GetValue: ( -- n ) --- 54,58 ---- :M SetBuddy: ( hBuddy -- ) \ *G Sets the buddy window for the up-down control. ! 0 SWAP UDM_SETBUDDY SendMessage:SelfDrop ;M :M GetValue: ( -- n ) *************** *** 64,78 **** :M SetValue: ( n -- ) \ *G Set the current position for the up-down control. ! 0 word-join 0 UDM_SETPOS SendMessage:Self DROP ;M :M SetDecimal: ( -- ) \ *G Sets the radix base for the control to decimal. \ ** Decimal numbers are signed. ! 0 10 UDM_SETBASE SendMessage:Self DROP ;M :M SetHex: ( -- ) \ *G Sets the radix base for the control to hexadecimal. \ ** Hexadecimal numbers are always unsigned. ! 0 16 UDM_SETBASE SendMessage:Self DROP ;M :M GetBase: ( -- n ) --- 65,79 ---- :M SetValue: ( n -- ) \ *G Set the current position for the up-down control. ! 0 word-join 0 UDM_SETPOS SendMessage:SelfDrop ;M :M SetDecimal: ( -- ) \ *G Sets the radix base for the control to decimal. \ ** Decimal numbers are signed. ! 0 10 UDM_SETBASE SendMessage:SelfDrop ;M :M SetHex: ( -- ) \ *G Sets the radix base for the control to hexadecimal. \ ** Hexadecimal numbers are always unsigned. ! 0 16 UDM_SETBASE SendMessage:SelfDrop ;M :M GetBase: ( -- n ) *************** *** 85,89 **** \ ** the UD_MINVAL value. In addition, the difference between the two positions \ ** cannot exceed UD_MAXVAL. ! swap word-join 0 UDM_SETRANGE SendMessage:Self DROP ;M :M GetRange: ( -- lower upper ) --- 86,90 ---- \ ** the UD_MINVAL value. In addition, the difference between the two positions \ ** cannot exceed UD_MAXVAL. ! swap word-join 0 UDM_SETRANGE SendMessage:SelfDrop ;M :M GetRange: ( -- lower upper ) Index: Calendar.f =================================================================== RCS file: /cvsroot/win32forth/win32forth/src/lib/Calendar.f,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** Calendar.f 6 Jun 2006 02:58:24 -0000 1.1 --- Calendar.f 11 Jun 2006 09:03:49 -0000 1.2 *************** *** 3,7 **** WinLibrary COMCTL32.DLL ! needs sendmessage.f INTERNAL --- 3,7 ---- WinLibrary COMCTL32.DLL ! cr .( Loading Calendar Classes...) INTERNAL *************** *** 128,132 **** \ *P \i Month \d is the month (January = 1; December = 12) \ *P \i year \d is the year (1601 - 30827). ! _SystemTime 0 MCM_GETCURSEL SendMessage:Self drop wday w@ wmonth w@ wyear w@ ;M --- 128,132 ---- \ *P \i Month \d is the month (January = 1; December = 12) \ *P \i year \d is the year (1601 - 30827). ! _SystemTime 0 MCM_GETCURSEL SendMessage:SelfDrop wday w@ wmonth w@ wyear w@ ;M Index: StatusBar.f =================================================================== RCS file: /cvsroot/win32forth/win32forth/src/lib/StatusBar.f,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** StatusBar.f 17 May 2006 20:10:16 -0000 1.1 --- StatusBar.f 11 Jun 2006 09:03:50 -0000 1.2 *************** *** 2,11 **** \ Statusbar control separated from ExControls anew -StatusBar.f WinLibrary COMCTL32.DLL - needs sendmessage.f - INTERNAL EXTERNAL --- 2,11 ---- \ Statusbar control separated from ExControls + cr .( Loading StatusBar Class...) + anew -StatusBar.f WinLibrary COMCTL32.DLL INTERNAL EXTERNAL *************** *** 37,45 **** \ *G Create the control. to parent Z" msctls_statusbar32" create-control ! 0 TRUE SB_SIMPLE SendMessage:Self DROP ;M :M WindowStyle: ( -- style ) ! \ *G Get the window style of the control. Default style is: WS_BORDER. WindowStyle: super style or ;M --- 37,45 ---- \ *G Create the control. to parent Z" msctls_statusbar32" create-control ! 0 TRUE SB_SIMPLE SendMessage:SelfDrop ;M :M WindowStyle: ( -- style ) ! \ *G Get the window style of the control. Default style is: WS_CHILD WS_VISIBLE or. WindowStyle: super style or ;M *************** *** 68,72 **** \ ** of the vertical border of the status window. \ *P An application must use the Redraw: method to redraw the window. ! 0 SWAP SB_SETMINHEIGHT SendMessage:Self DROP ;M :M GetBorders: ( -- hWidth vWidth divWidth ) --- 68,72 ---- \ ** of the vertical border of the status window. \ *P An application must use the Redraw: method to redraw the window. ! 0 SWAP SB_SETMINHEIGHT SendMessage:SelfDrop ;M :M GetBorders: ( -- hWidth vWidth divWidth ) *************** *** 84,88 **** :M Redraw: ( -- ) \ *G Redraw the statusbar after changes (e.g. size). ! 0 0 WM_SIZE SendMessage:Self DROP ;M :M SetText: ( szText -- ) --- 84,88 ---- :M Redraw: ( -- ) \ *G Redraw the statusbar after changes (e.g. size). ! 0 0 WM_SIZE SendMessage:SelfDrop ;M :M SetText: ( szText -- ) *************** *** 98,102 **** :M Setfont: ( handle -- ) \ *G Set the font in the control. ! 1 swap WM_SETFONT SendMessage:Self drop ;M :M Height: ( -- height ) --- 98,102 ---- :M Setfont: ( handle -- ) \ *G Set the font in the control. ! 1 swap WM_SETFONT SendMessage:SelfDrop ;M :M Height: ( -- height ) *************** *** 123,127 **** \ *G Create the control. Start: super ! 0 FALSE SB_SIMPLE SendMessage:Self DROP ;M --- 123,127 ---- \ *G Create the control. Start: super ! 0 FALSE SB_SIMPLE SendMessage:SelfDrop ;M *************** *** 147,155 **** :M SetSimple: ( -- ) \ *G Reset the status bar to show only one part. ! 0 TRUE SB_SIMPLE SendMessage:Self DROP ;M :M SetMulti: ( -- ) \ *G Set the status bar to show all parts set with \i SetParts: \d before. ! 0 FALSE SB_SIMPLE SendMessage:Self DROP ;M :M SetText: ( szText n -- ) --- 147,155 ---- :M SetSimple: ( -- ) \ *G Reset the status bar to show only one part. ! 0 TRUE SB_SIMPLE SendMessage:SelfDrop ;M :M SetMulti: ( -- ) \ *G Set the status bar to show all parts set with \i SetParts: \d before. ! 0 FALSE SB_SIMPLE SendMessage:SelfDrop ;M :M SetText: ( szText n -- ) Index: ScrollBar.f =================================================================== RCS file: /cvsroot/win32forth/win32forth/src/lib/ScrollBar.f,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** ScrollBar.f 6 Jun 2006 02:58:24 -0000 1.1 --- ScrollBar.f 11 Jun 2006 09:03:50 -0000 1.2 *************** *** 3,7 **** WinLibrary COMCTL32.DLL ! needs sendmessage.f INTERNAL --- 3,7 ---- WinLibrary COMCTL32.DLL ! cr .( Loading ScrollBar Class...) INTERNAL Index: Buttons.f =================================================================== RCS file: /cvsroot/win32forth/win32forth/src/lib/Buttons.f,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** Buttons.f 6 Jun 2006 02:58:24 -0000 1.1 --- Buttons.f 11 Jun 2006 09:03:49 -0000 1.2 *************** *** 3,7 **** WinLibrary COMCTL32.DLL ! needs sendmessage.f INTERNAL --- 3,7 ---- WinLibrary COMCTL32.DLL ! cr .( Loading Button Classes...) INTERNAL *************** *** 59,63 **** :M Setfont: ( handle -- ) \ *G Set the font in the control. ! 1 swap WM_SETFONT SendMessage:Self drop ;M ;Class --- 59,63 ---- :M Setfont: ( handle -- ) \ *G Set the font in the control. ! 1 swap WM_SETFONT SendMessage:SelfDrop ;M ;Class *************** *** 119,123 **** :M Setfont: ( handle -- ) \ *G Set the font in the control. ! 1 swap WM_SETFONT SendMessage:Self drop ;M ;Class --- 119,123 ---- :M Setfont: ( handle -- ) \ *G Set the font in the control. ! 1 swap WM_SETFONT SendMessage:SelfDrop ;M ;Class *************** *** 167,171 **** :M Setfont: ( handle -- ) \ *G Set the font in the control. ! 1 swap WM_SETFONT SendMessage:Self drop ;M :M Enable: ( f -- ) --- 167,171 ---- :M Setfont: ( handle -- ) \ *G Set the font in the control. ! 1 swap WM_SETFONT SendMessage:SelfDrop ;M :M Enable: ( f -- ) *************** *** 220,224 **** if \ DeleteBitmap: self to hbitmap ! hbitmap IMAGE_BITMAP BM_SETIMAGE SendMessage:Self drop else drop then ;M --- 220,224 ---- if \ DeleteBitmap: self to hbitmap ! hbitmap IMAGE_BITMAP BM_SETIMAGE SendMessage:SelfDrop else drop then ;M *************** *** 287,291 **** if \ DeleteIcon: self to hicon ! hicon IMAGE_ICON BM_SETIMAGE SendMessage:Self DROP else drop then ;M --- 287,291 ---- if \ DeleteIcon: self to hicon ! hicon IMAGE_ICON BM_SETIMAGE SendMessage:SelfDrop else drop then ;M *************** *** 343,347 **** :M Setfont: ( handle -- ) \ *G Set the font in the control. ! 1 swap WM_SETFONT SendMessage:Self drop ;M :M Enable: ( f -- ) --- 343,347 ---- :M Setfont: ( handle -- ) \ *G Set the font in the control. ! 1 swap WM_SETFONT SendMessage:SelfDrop ;M :M Enable: ( f -- ) Index: ProgressBar.f =================================================================== RCS file: /cvsroot/win32forth/win32forth/src/lib/ProgressBar.f,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** ProgressBar.f 6 Jun 2006 02:58:24 -0000 1.1 --- ProgressBar.f 11 Jun 2006 09:03:50 -0000 1.2 *************** *** 3,7 **** WinLibrary COMCTL32.DLL ! needs sendmessage.f INTERNAL --- 3,7 ---- WinLibrary COMCTL32.DLL ! cr .( Loading Progressbar Class...) INTERNAL *************** *** 42,46 **** \ *G Advances the current position of the progress bar by a specified increment \ ** and redraws the bar to reflect the new position. ! 0 SWAP PBM_DELTAPOS SendMessage:Self DROP ;M :M GetValue: ( -- n ) --- 42,46 ---- \ *G Advances the current position of the progress bar by a specified increment \ ** and redraws the bar to reflect the new position. ! 0 SWAP PBM_DELTAPOS SendMessage:SelfDrop ;M :M GetValue: ( -- n ) *************** *** 51,55 **** \ *G Sets the current position for the progress bar and redraws the bar to \ ** reflect the new position. ! 0 SWAP PBM_SETPOS SendMessage:Self DROP ;M :M SetRange: ( min max -- ) --- 51,55 ---- \ *G Sets the current position for the progress bar and redraws the bar to \ ** reflect the new position. ! 0 SWAP PBM_SETPOS SendMessage:SelfDrop ;M :M SetRange: ( min max -- ) *************** *** 78,82 **** \ *P When the position exceeds the maximum range value, this method resets the current \ ** position so that the progress indicator starts over again from the beginning. ! 0 0 PBM_STEPIT SendMessage:Self DROP ;M ;Class --- 78,82 ---- \ *P When the position exceeds the maximum range value, this method resets the current \ ** position so that the progress indicator starts over again from the beginning. ! 0 0 PBM_STEPIT SendMessage:SelfDrop ;M ;Class Index: TabControl.f =================================================================== RCS file: /cvsroot/win32forth/win32forth/src/lib/TabControl.f,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** TabControl.f 11 Jun 2006 07:37:27 -0000 1.2 --- TabControl.f 11 Jun 2006 09:03:50 -0000 1.3 *************** *** 1,7 **** ! anew -TabControl.f.f WinLibrary COMCTL32.DLL ! needs sendmessage.f INTERNAL --- 1,7 ---- ! anew -TabControl.f WinLibrary COMCTL32.DLL ! cr .( Loading TabControl Class...) INTERNAL *************** *** 144,148 **** \ *G Inserts a new tab into the tab control. \ *P \i mask \d and other members of the TCITEM struct must be set. ! tc_item swap TCM_INSERTITEM SendMessage:Self drop ;M :M GetTabInfo: ( index -- ) --- 144,148 ---- \ *G Inserts a new tab into the tab control. \ *P \i mask \d and other members of the TCITEM struct must be set. ! tc_item swap TCM_INSERTITEM SendMessage:SelfDrop ;M :M GetTabInfo: ( index -- ) *************** *** 176,182 **** \ ** the corresponding window rectangle. If this parameter is FALSE, prc specifies a window \ ** rectangle and receives the corresponding display area. ! TCM_ADJUSTRECT SendMessage:self drop ;M ! :M ClientSize: ( -- x y w h ) \ *G Return size of display area of the tab control. TempRect.addrof GetClientRect: self --- 176,182 ---- \ ** the corresponding window rectangle. If this parameter is FALSE, prc specifies a window \ ** rectangle and receives the corresponding display area. ! TCM_ADJUSTRECT SendMessage:selfDrop ;M ! :M ClientSize: ( -- l t r b ) \ *G Return size of display area of the tab control. TempRect.addrof GetClientRect: self *************** *** 184,188 **** temprect.left temprect.top temprect.right temprect.bottom ;M ! :M WindowSize: ( 0 0 width height -- x y w h ) \ *G Given display area return window size required. SetRect: Temprect --- 184,188 ---- temprect.left temprect.top temprect.right temprect.bottom ;M ! :M WindowSize: ( l t r t -- l t r b ) \ *G Given display area return window size required. SetRect: Temprect *************** *** 198,202 **** \ *P Note: A tab control does not send a TCN_SELCHANGING or TCN_SELCHANGE \ ** notification message when a tab is selected using this message. ! 0 swap TCM_SETCURSEL SendMessage:self drop ;M :M GetRowCount: ( -- n ) --- 198,202 ---- \ *P Note: A tab control does not send a TCN_SELCHANGING or TCN_SELCHANGE \ ** notification message when a tab is selected using this message. ! 0 swap TCM_SETCURSEL SendMessage:selfDrop ;M :M GetRowCount: ( -- n ) *************** *** 214,218 **** :M Setfont: ( handle -- ) \ *G Set the font in the control. ! 1 swap WM_SETFONT SendMessage:Self drop ;M :M WindowTitle: ( -- null$ ) --- 214,218 ---- :M Setfont: ( handle -- ) \ *G Set the font in the control. ! 1 swap WM_SETFONT SendMessage:SelfDrop ;M :M WindowTitle: ( -- null$ ) Index: Label.f =================================================================== RCS file: /cvsroot/win32forth/win32forth/src/lib/Label.f,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** Label.f 6 Jun 2006 02:58:24 -0000 1.1 --- Label.f 11 Jun 2006 09:03:49 -0000 1.2 *************** *** 3,7 **** WinLibrary COMCTL32.DLL ! needs sendmessage.f INTERNAL --- 3,7 ---- WinLibrary COMCTL32.DLL ! cr .( Loading Label Classes...) INTERNAL *************** *** 34,38 **** :M Setfont: ( handle -- ) \ *G Set the font in the control. ! 1 swap WM_SETFONT SendMessage:Self drop ;M :M Enable: ( f -- ) --- 34,38 ---- :M Setfont: ( handle -- ) \ *G Set the font in the control. ! 1 swap WM_SETFONT SendMessage:SelfDrop ;M :M Enable: ( f -- ) *************** *** 66,70 **** \ *G Associate a new image (icon or bitmap) with the control. GetImage: self over <> ! if ImageType: [ self ] STM_SETIMAGE SendMessage:Self DROP else drop then ;M --- 66,70 ---- \ *G Associate a new image (icon or bitmap) with the control. GetImage: self over <> ! if ImageType: [ self ] STM_SETIMAGE SendMessage:SelfDrop else drop then ;M Index: ListBox.f =================================================================== RCS file: /cvsroot/win32forth/win32forth/src/lib/ListBox.f,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** ListBox.f 6 Jun 2006 02:58:24 -0000 1.1 --- ListBox.f 11 Jun 2006 09:03:49 -0000 1.2 *************** *** 3,7 **** WinLibrary COMCTL32.DLL ! needs sendmessage.f INTERNAL --- 3,7 ---- WinLibrary COMCTL32.DLL ! cr .( Loading ListBox Classes...) INTERNAL *************** *** 54,58 **** \ ** match the wildcard expression and have the attributes specified by the wParam parameter \ ** are added to the list displayed in the combo box. ! CB_DIR SendMessage:Self drop ;M :M AddStringTo: ( z"string" -- ) --- 54,58 ---- \ ** match the wildcard expression and have the attributes specified by the wParam parameter \ ** are added to the list displayed in the combo box. ! CB_DIR SendMessage:SelfDrop ;M :M AddStringTo: ( z"string" -- ) *************** *** 60,68 **** \ ** CBS_SORT style, the string is added to the end of the list. Otherwise, the string \ ** is inserted into the list, and the list is sorted. ! 0 CB_ADDSTRING SendMessage:Self drop ;M :M SetSelection: ( n -- ) \ *G Select a string in the list of a combo box. ! 0 swap CB_SETCURSEL SendMessage:Self drop ;M :M GetSelectedString: ( -- addr cnt ) --- 60,68 ---- \ ** CBS_SORT style, the string is added to the end of the list. Otherwise, the string \ ** is inserted into the list, and the list is sorted. ! 0 CB_ADDSTRING SendMessage:SelfDrop ;M :M SetSelection: ( n -- ) \ *G Select a string in the list of a combo box. ! 0 swap CB_SETCURSEL SendMessage:SelfDrop ;M :M GetSelectedString: ( -- addr cnt ) *************** *** 75,79 **** :M Setfont: ( handle -- ) \ *G Set the font in the control. ! 1 swap WM_SETFONT SendMessage:Self drop ;M :M InsertStringAt: ( lpszString posn -- ) --- 75,79 ---- :M Setfont: ( handle -- ) \ *G Set the font in the control. ! 1 swap WM_SETFONT SendMessage:SelfDrop ;M :M InsertStringAt: ( lpszString posn -- ) *************** *** 89,97 **** \ *G Delete a string. \ *P \i index \d specifies the zero-based index of the string to delete. ! 0 SWAP CB_DELETESTRING SendMessage:Self DROP ;M :M Clear: ( -- ) \ *G Remove all strings from the combo box ! 0 0 CB_RESETCONTENT SendMessage:Self DROP ;M :M Find: ( lpszString -- index ) --- 89,97 ---- \ *G Delete a string. \ *P \i index \d specifies the zero-based index of the string to delete. ! 0 SWAP CB_DELETESTRING SendMessage:SelfDrop ;M :M Clear: ( -- ) \ *G Remove all strings from the combo box ! 0 0 CB_RESETCONTENT SendMessage:SelfDrop ;M :M Find: ( lpszString -- index ) *************** *** 199,207 **** \ ** match the wildcard expression and have the attributes specified by the wParam parameter \ ** are added to the list displayed in the combo box. ! LB_DIR SendMessage:Self drop ;M :M Clear: ( -- ) \ *G Remove all items from the list box. ! 0 0 LB_RESETCONTENT SendMessage:Self drop ;M :M AddStringTo: ( z"string" -- ) --- 199,207 ---- \ ** match the wildcard expression and have the attributes specified by the wParam parameter \ ** are added to the list displayed in the combo box. ! LB_DIR SendMessage:SelfDrop ;M :M Clear: ( -- ) \ *G Remove all items from the list box. ! 0 0 LB_RESETCONTENT SendMessage:SelfDrop ;M :M AddStringTo: ( z"string" -- ) *************** *** 209,213 **** \ ** the string is added to the end of the list. Otherwise, the string is inserted \ ** into the list and the list is sorted. ! 0 LB_ADDSTRING SendMessage:Self drop ;M :M SetSelection: ( n -- ) --- 209,213 ---- \ ** the string is added to the end of the list. Otherwise, the string is inserted \ ** into the list and the list is sorted. ! 0 LB_ADDSTRING SendMessage:SelfDrop ;M :M SetSelection: ( n -- ) *************** *** 219,223 **** \ ** cannot contain more than 32,767 items. Although the number of items is restricted, the \ ** total size in bytes of the items in a list box is limited only by available memory. ! 0 swap LB_SETCURSEL SendMessage:Self drop ;M :M GetSelection: ( -- n ) --- 219,223 ---- \ ** cannot contain more than 32,767 items. Although the number of items is restricted, the \ ** total size in bytes of the items in a list box is limited only by available memory. ! 0 swap LB_SETCURSEL SendMessage:SelfDrop ;M :M GetSelection: ( -- n ) *************** *** 244,248 **** :M Setfont: ( handle -- ) \ *G Set the font in the control. ! 1 swap WM_SETFONT SendMessage:Self drop ;M :M AddString: ( lpszString -- ) --- 244,248 ---- :M Setfont: ( handle -- ) \ *G Set the font in the control. ! 1 swap WM_SETFONT SendMessage:SelfDrop ;M :M AddString: ( lpszString -- ) *************** *** 276,280 **** \ ** cannot contain more than 32,767 items. Although the number of items is restricted, the total \ ** size in bytes of the items in a list box is limited only by available memory. ! 0 SWAP LB_DELETESTRING SendMessage:Self DROP ;M :M Find: ( lpszString -- index ) --- 276,280 ---- \ ** cannot contain more than 32,767 items. Although the number of items is restricted, the total \ ** size in bytes of the items in a list box is limited only by available memory. ! 0 SWAP LB_DELETESTRING SendMessage:SelfDrop ;M :M Find: ( lpszString -- index ) *************** *** 334,338 **** \ ** stops must be sorted in ascending order; backward tabs are not allowed. \ *P The list box must have been created with the LBS_USETABSTOPS style. ! LB_SETTABSTOPS SendMessage:Self drop ;M ;Class --- 334,338 ---- \ ** stops must be sorted in ascending order; backward tabs are not allowed. \ *P The list box must have been created with the LBS_USETABSTOPS style. ! LB_SETTABSTOPS SendMessage:SelfDrop ;M ;Class Index: RebarControl.f =================================================================== RCS file: /cvsroot/win32forth/win32forth/src/lib/RebarControl.f,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** RebarControl.f 6 Jun 2006 17:21:02 -0000 1.5 --- RebarControl.f 11 Jun 2006 09:03:50 -0000 1.6 *************** *** 6,9 **** --- 6,10 ---- \ Added more methods - Sunday, June 04 2006 21:20:10 Rod + cr .( Loading RebarControl Class...) WinLibrary COMCTL32.DLL Index: TextBox.f =================================================================== RCS file: /cvsroot/win32forth/win32forth/src/lib/TextBox.f,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** TextBox.f 6 Jun 2006 02:58:24 -0000 1.1 --- TextBox.f 11 Jun 2006 09:03:50 -0000 1.2 *************** *** 4,8 **** WinLibrary RichEd32.DLL ! needs sendmessage.f INTERNAL --- 4,8 ---- WinLibrary RichEd32.DLL ! cr .( Loading TextBox Classes...) INTERNAL *************** *** 73,77 **** \ *P The control displays a flashing caret at the end position regardless of the relative \ ** values of start and end. ! EM_SETSEL SendMessage:self drop ;M :M GetSelection: ( -- nEnd nStart ) --- 73,77 ---- \ *P The control displays a flashing caret at the end position regardless of the relative \ ** values of start and end. ! EM_SETSEL SendMessage:selfDrop ;M :M GetSelection: ( -- nEnd nStart ) *************** *** 107,115 **** \ *G Sets or clears the modification flag for an edit control. The modification flag \ ** indicates whether the text within the edit control has been modified. ! swap 0 EM_SETMODIFY SendMessage:Self drop ;M :M NotModified: ( -- ) \ *G Depreacted method. Use \i SetModify: \d instead. ! 0 0 EM_SETMODIFY SendMessage:Self drop ;M DEPRECATED :M Undo?: ( -- f ) --- 107,115 ---- \ *G Sets or clears the modification flag for an edit control. The modification flag \ ** indicates whether the text within the edit control has been modified. ! swap 0 EM_SETMODIFY SendMessage:SelfDrop ;M :M NotModified: ( -- ) \ *G Depreacted method. Use \i SetModify: \d instead. ! 0 0 EM_SETMODIFY SendMessage:SelfDrop ;M DEPRECATED :M Undo?: ( -- f ) *************** *** 120,124 **** \ *G Undoes the last edit control operation in the control's undo queue. Undo?: self ! IF 0 0 EM_UNDO SendMessage:Self drop ELSE MB_OK Z" Undo notification" --- 120,124 ---- \ *G Undoes the last edit control operation in the control's undo queue. Undo?: self ! IF 0 0 EM_UNDO SendMessage:SelfDrop ELSE MB_OK Z" Undo notification" *************** *** 134,138 **** \ *G Redoes the last edit control operation in the control's redo queue. Redo?: self ! IF 0 0 EM_REDO SendMessage:Self drop ELSE MB_OK Z" Redo notification" --- 134,138 ---- \ *G Redoes the last edit control operation in the control's redo queue. Redo?: self ! IF 0 0 EM_REDO SendMessage:SelfDrop ELSE MB_OK Z" Redo notification" *************** *** 144,152 **** \ *G Delete (cut) the current selection, if any, in the edit control and \ ** copy the deleted text to the clipboard in CF_TEXT format. ! 0 0 WM_CUT SendMessage:Self DROP ;M :M Copy: ( -- ) \ *G Copy the current selection to the clipboard in CF_TEXT format. ! 0 0 WM_COPY SendMessage:Self DROP ;M :M Paste: ( -- ) --- 144,152 ---- \ *G Delete (cut) the current selection, if any, in the edit control and \ ** copy the deleted text to the clipboard in CF_TEXT format. ! 0 0 WM_CUT SendMessage:SelfDrop ;M :M Copy: ( -- ) \ *G Copy the current selection to the clipboard in CF_TEXT format. ! 0 0 WM_COPY SendMessage:SelfDrop ;M :M Paste: ( -- ) *************** *** 154,166 **** \ ** caret position. Data is inserted only if the clipboard contains data in CF_TEXT \ ** format. ! 0 0 WM_PASTE SendMessage:Self DROP ;M :M Clear: ( -- ) \ *G Delete selected text. ! 0 0 WM_CLEAR SendMessage:Self DROP ;M :M SetFont: ( handle -- ) \ *G Set the font in the control. ! 1 swap WM_SETFONT SendMessage:Self drop ;M :M SetTextLimit: ( n -- ) --- 154,166 ---- \ ** caret position. Data is inserted only if the clipboard contains data in CF_TEXT \ ** format. ! 0 0 WM_PASTE SendMessage:SelfDrop ;M :M Clear: ( -- ) \ *G Delete selected text. ! 0 0 WM_CLEAR SendMessage:SelfDrop ;M :M SetFont: ( handle -- ) \ *G Set the font in the control. ! 1 swap WM_SETFONT SendMessage:SelfDrop ;M :M SetTextLimit: ( n -- ) *************** *** 185,189 **** \ ** the value of \i n \d, whichever is smaller. For multiline edit controls, this value is either 0xFFFF bytes \ ** or the value of \i n \d, whichever is smaller. ! 0 swap EM_SETLIMITTEXT SendMessage:Self drop ;M :M GetTextEx: { buffer$ maxlen -- buffer$ len } --- 185,189 ---- \ ** the value of \i n \d, whichever is smaller. For multiline edit controls, this value is either 0xFFFF bytes \ ** or the value of \i n \d, whichever is smaller. ! 0 swap EM_SETLIMITTEXT SendMessage:SelfDrop ;M :M GetTextEx: { buffer$ maxlen -- buffer$ len } *************** *** 264,268 **** word-join [ EC_LEFTMARGIN EC_RIGHTMARGIN OR ] literal EM_SETMARGINS ! SendMessage:self DROP ;M :M SelectAll: ( -- ) --- 264,268 ---- word-join [ EC_LEFTMARGIN EC_RIGHTMARGIN OR ] literal EM_SETMARGINS ! SendMessage:selfDrop ;M :M SelectAll: ( -- ) Index: TrackBar.f =================================================================== RCS file: /cvsroot/win32forth/win32forth/src/lib/TrackBar.f,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** TrackBar.f 6 Jun 2006 02:58:24 -0000 1.1 --- TrackBar.f 11 Jun 2006 09:03:50 -0000 1.2 *************** *** 3,7 **** WinLibrary COMCTL32.DLL ! needs sendmessage.f INTERNAL --- 3,7 ---- WinLibrary COMCTL32.DLL ! cr .( Loading Trackbar Class...) INTERNAL *************** *** 51,55 **** \ ** DOWN ARROW keys. The logical positions are the integer increments in the \ ** trackbar's range of minimum to maximum slider positions. ! 0 TBM_SETLINESIZE SendMessage:Self DROP ;M :M GetPageSize: ( -- n ) --- 51,55 ---- \ ** DOWN ARROW keys. The logical positions are the integer increments in the \ ** trackbar's range of minimum to maximum slider positions. ! 0 TBM_SETLINESIZE SendMessage:SelfDrop ;M :M GetPageSize: ( -- n ) *************** *** 65,69 **** \ ** in the trackbar's channel. The logical positions are the integer increments in the \ ** trackbar's range of minimum to maximum slider positions. ! 0 TBM_SETPAGESIZE SendMessage:Self DROP ;M :M GetValue: ( -- n) --- 65,69 ---- \ ** in the trackbar's channel. The logical positions are the integer increments in the \ ** trackbar's range of minimum to maximum slider positions. ! 0 TBM_SETPAGESIZE SendMessage:SelfDrop ;M :M GetValue: ( -- n) *************** *** 74,78 **** :M SetValue: ( n -- ) \ *G Sets the current logical position of the slider in the trackbar. ! TRUE TBM_SETPOS SendMessage:Self DROP ;M :M GetRangeMax: ( -- n ) --- 74,78 ---- :M SetValue: ( n -- ) \ *G Sets the current logical position of the slider in the trackbar. ! TRUE TBM_SETPOS SendMessage:SelfDrop ;M :M GetRangeMax: ( -- n ) *************** *** 85,89 **** \ ** If this parameter is FALSE, the message sets the range but does not redraw \ ** the trackbar. ! TBM_SETRANGEMAX SendMessage:Self DROP ;M :M GetRangeMin: ( -- n ) --- 85,89 ---- \ ** If this parameter is FALSE, the message sets the range but does not redraw \ ** the trackbar. ! TBM_SETRANGEMAX SendMessage:SelfDrop ;M :M GetRangeMin: ( -- n ) *************** *** 96,100 **** \ ** If this parameter is FALSE, the message sets the range but does not redraw \ ** the trackbar. ! TBM_SETRANGEMIN SendMessage:Self DROP ;M :M GetSelEnd: ( -- n ) --- 96,100 ---- \ ** If this parameter is FALSE, the message sets the range but does not redraw \ ** the trackbar. ! TBM_SETRANGEMIN SendMessage:SelfDrop ;M :M GetSelEnd: ( -- n ) *************** *** 110,114 **** \ ** If this parameter is FALSE, the message sets the range but does not redraw \ ** the trackbar. ! TBM_SETSELEND SendMessage:Self DROP ;M :M GetSelStart: ( -- n) --- 110,114 ---- \ ** If this parameter is FALSE, the message sets the range but does not redraw \ ** the trackbar. ! TBM_SETSELEND SendMessage:SelfDrop ;M :M GetSelStart: ( -- n) *************** *** 124,128 **** \ ** If this parameter is FALSE, the message sets the range but does not redraw \ ** the trackbar. ! TBM_SETSELSTART SendMessage:Self DROP ;M :M GetThumbLength: ( -- n ) --- 124,128 ---- \ ** If this parameter is FALSE, the message sets the range but does not redraw \ ** the trackbar. ! TBM_SETSELSTART SendMessage:SelfDrop ;M :M GetThumbLength: ( -- n ) *************** *** 132,136 **** :M SetThumbLength: ( n -- ) \ *G Set the length (in Pixel) of the slider in the trackbar. ! 0 SWAP TBM_SETTHUMBLENGTH SendMessage:Self DROP ;M :M GetChannelRect: ( lpRect -- ) --- 132,136 ---- :M SetThumbLength: ( n -- ) \ *G Set the length (in Pixel) of the slider in the trackbar. ! 0 SWAP TBM_SETTHUMBLENGTH SendMessage:SelfDrop ;M :M GetChannelRect: ( lpRect -- ) *************** *** 138,147 **** \ ** trackbar's channel. (The channel is the area over which the slider \ ** moves. It contains the highlight when a range is selected.) ! 0 TBM_GETCHANNELRECT SendMessage:Self DROP ;M :M GetThumbRect: ( lpRect -- ) \ *G Retrieves the size and position of the bounding rectangle for the slider \ ** in the trackbar. ! 0 TBM_GETTHUMBRECT SendMessage:Self DROP ;M :M GetTick: ( iTic -- n ) --- 138,147 ---- \ ** trackbar's channel. (The channel is the area over which the slider \ ** moves. It contains the highlight when a range is selected.) ! 0 TBM_GETCHANNELRECT SendMessage:SelfDrop ;M :M GetThumbRect: ( lpRect -- ) \ *G Retrieves the size and position of the bounding rectangle for the slider \ ** in the trackbar. ! 0 TBM_GETTHUMBRECT SendMessage:SelfDrop ;M :M GetTick: ( iTic -- n ) *************** *** 153,157 **** :M SetTick: ( pos -- ) \ *G Sets a tick mark in a trackbar at the specified logical position. ! 0 TBM_SETTIC SendMessage:Self DROP ;M :M ClearTicks: ( f -- ) --- 153,157 ---- :M SetTick: ( pos -- ) \ *G Sets a tick mark in a trackbar at the specified logical position. ! 0 TBM_SETTIC SendMessage:SelfDrop ;M :M ClearTicks: ( f -- ) *************** *** 161,165 **** \ ** If this parameter is FALSE, the message clears the tick marks but does not redraw \ ** the trackbar. ! 0 SWAP TBM_CLEARTICS SendMessage:Self DROP ;M :M GetTickPos: ( iTic -- n ) --- 161,165 ---- \ ** If this parameter is FALSE, the message clears the tick marks but does not redraw \ ** the trackbar. ! 0 SWAP TBM_CLEARTICS SendMessage:SelfDrop ;M :M GetTickPos: ( iTic -- n ) *************** *** 186,190 **** \ ** associated with a tick mark. \ *P The trackbar must have the TBS_AUTOTICKS style to use this method. ! TBM_SETTICFREQ SendMessage:Self DROP ;M :M GetNumTicks: ( -- n ) --- 186,190 ---- \ ** associated with a tick mark. \ *P The trackbar must have the TBS_AUTOTICKS style to use this method. ! TBM_SETTICFREQ SendMessage:SelfDrop ;M :M GetNumTicks: ( -- n ) *************** *** 198,202 **** \ *P If the \i f \d parameter is TRUE, the trackbar is redrawn after the range is set. If this \ ** parameter is FALSE, the message sets the range but does not redraw the trackbar. ! >R word-join R> TBM_SETRANGE SendMessage:Self DROP ;M :M SetSel: ( min max f -- ) --- 198,202 ---- \ *P If the \i f \d parameter is TRUE, the trackbar is redrawn after the range is set. If this \ ** parameter is FALSE, the message sets the range but does not redraw the trackbar. ! >R word-join R> TBM_SETRANGE SendMessage:SelfDrop ;M :M SetSel: ( min max f -- ) *************** *** 205,214 **** \ ** If this parameter is FALSE, the message sets the selection range but does not redraw the trackbar. \ *P This method is ignored if the trackbar does not have the TBS_ENABLESELRANGE style. ! >R word-join R> TBM_SETSEL SendMessage:Self DROP ;M :M ClearSel: ( f -- ) \ *G Clears the current selection range in the trackbar. \ *P If the \i f \d is TRUE, the trackbar is redrawn after the selection is cleared. ! 0 SWAP TBM_CLEARSEL SendMessage:Self DROP ;M :M Enable: ( f -- ) --- 205,214 ---- \ ** If this parameter is FALSE, the message sets the selection range but does not redraw the trackbar. \ *P This method is ignored if the trackbar does not have the TBS_ENABLESELRANGE style. ! >R word-join R> TBM_SETSEL SendMessage:SelfDrop ;M :M ClearSel: ( f -- ) \ *G Clears the current selection range in the trackbar. \ *P If the \i f \d is TRUE, the trackbar is redrawn after the selection is cleared. ! 0 SWAP TBM_CLEARSEL SendMessage:SelfDrop ;M :M Enable: ( f -- ) |
|
From: Dirk B. <db...@us...> - 2006-06-11 09:03:52
|
Update of /cvsroot/win32forth/win32forth/proj In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv26541/proj Modified Files: Win32ForthIDE.fpj Log Message: Some more work on the ProjectManger within the IDE. Index: Win32ForthIDE.fpj =================================================================== RCS file: /cvsroot/win32forth/win32forth/proj/Win32ForthIDE.fpj,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** Win32ForthIDE.fpj 5 Jun 2006 09:20:18 -0000 1.1 --- Win32ForthIDE.fpj 11 Jun 2006 09:03:45 -0000 1.2 *************** *** 1,7 **** ! ProjectName= Project BuildFile= apps\Win32ForthIDE\Main.f SearchPath= .;SRC;SRC\LIB;RES;DEMOS;SRC\CONSOLE;HTM;src\ProMgr;src\ProMgr\res;APPS\PROMGR;APPS\PROMGR\RES;APPS\WIN32FORTHIDE;APPS\WINED\RES;SRC\WINED;SRC\WINED\RES ! Project,0 ! Modules,51 apps\Win32ForthIDE\Main.f SRC\LIB\Mdi.f --- 1,7 ---- ! ProjectName= Win32Forth IDE BuildFile= apps\Win32ForthIDE\Main.f SearchPath= .;SRC;SRC\LIB;RES;DEMOS;SRC\CONSOLE;HTM;src\ProMgr;src\ProMgr\res;APPS\PROMGR;APPS\PROMGR\RES;APPS\WIN32FORTHIDE;APPS\WINED\RES;SRC\WINED;SRC\WINED\RES ! Win32Forth IDE,0 ! Modules,63 apps\Win32ForthIDE\Main.f SRC\LIB\Mdi.f *************** *** 9,14 **** SRC\LIB\MultiOpen.f SRC\LIB\HtmlControl.f ! SRC\LIB\AXControl.f ! SRC\LIB\fcom.f SRC\LIB\ScintillaControl.f SRC\LIB\SendMessage.f --- 9,14 ---- SRC\LIB\MultiOpen.f SRC\LIB\HtmlControl.f ! SRC\LIB\AXControl.F ! SRC\LIB\fcom.F SRC\LIB\ScintillaControl.f SRC\LIB\SendMessage.f *************** *** 20,60 **** SRC\LIB\RecentFiles.f src\lib\Resources.f ! apps\Win32ForthIDE\EdToolbar.f ! apps\Win32ForthIDE\CommandID.f SRC\LIB\bitmap.f SRC\LIB\toolbar.f SRC\LIB\RebarControl.f ! apps\Win32ForthIDE\EdStatusbar.f SRC\LIB\StatusBar.f ! apps\Win32ForthIDE\EdMenu.f ! apps\Win32ForthIDE\AnsLink.f src\tools\SdkHelp.f SRC\LIB\Win32Help.f ! apps\Win32ForthIDE\EdFindInFiles.f SRC\LIB\sub_dirs.f ! apps\Win32ForthIDE\X_Search.f SRC\LIB\w_search.f ! apps\Win32ForthIDE\EdTabControl.f SRC\LIB\ExControls.f SRC\LIB\ListView.f ! apps\Win32ForthIDE\ClassBrowser.f SRC\LIB\TreeView.f ! apps\Win32ForthIDE\ProjectTree.f SRC\LIB\linklist.f SRC\LIB\enum.f - SRC\LIB\ExUtils.f SRC\LIB\fcases.f ! apps\Win32ForthIDE\ScintillaMDI.f SRC\LIB\ScintillaLexer.f ! apps\Win32ForthIDE\ScintillaHyperMDI.f SRC\LIB\HyperLink.f ! apps\Win32ForthIDE\EdDebug.f ! apps\Win32ForthIDE\EdRemote.f ! apps\Win32ForthIDE\EdCompile.f ! apps\Win32ForthIDE\EdCommand.f ! apps\Win32ForthIDE\EdAbout.f ! apps\Win32ForthIDE\EdVersion.f ! DLLs,1 w32fScintilla.dll Forms,0 Auxiliary Files,0 --- 20,73 ---- SRC\LIB\RecentFiles.f src\lib\Resources.f ! APPS\WIN32FORTHIDE\EdToolbar.f ! APPS\WIN32FORTHIDE\CommandID.f SRC\LIB\bitmap.f SRC\LIB\toolbar.f SRC\LIB\RebarControl.f ! APPS\WIN32FORTHIDE\EdStatusbar.f SRC\LIB\StatusBar.f ! APPS\WIN32FORTHIDE\EdMenu.f ! APPS\WIN32FORTHIDE\AnsLink.f src\tools\SdkHelp.f SRC\LIB\Win32Help.f ! SRC\LIB\ExUtils.f ! APPS\WIN32FORTHIDE\EdFindInFiles.f SRC\LIB\sub_dirs.f ! APPS\WIN32FORTHIDE\X_Search.f SRC\LIB\w_search.f ! APPS\WIN32FORTHIDE\EdTabControl.f SRC\LIB\ExControls.f + SRC\LIB\Textbox.f + SRC\LIB\Listbox.f + SRC\LIB\UpDownControl.f + SRC\LIB\Buttons.f + SRC\LIB\Label.f + SRC\LIB\ScrollBar.f + SRC\LIB\TabControl.f SRC\LIB\ListView.f ! APPS\WIN32FORTHIDE\ClassBrowser.f SRC\LIB\TreeView.f ! APPS\WIN32FORTHIDE\ProjectTree.f SRC\LIB\linklist.f SRC\LIB\enum.f SRC\LIB\fcases.f ! SRC\LIB\Task.f ! APPS\WIN32FORTHIDE\ScintillaMDI.f SRC\LIB\ScintillaLexer.f ! APPS\WIN32FORTHIDE\ScintillaHyperMDI.f SRC\LIB\HyperLink.f ! APPS\WIN32FORTHIDE\EdHexViewer.f ! apps\promgr\hexviewer.f ! APPS\WIN32FORTHIDE\EdImageWindow.f ! apps\forthform\imagewindow.f ! APPS\WIN32FORTHIDE\EdDebug.f ! APPS\WIN32FORTHIDE\EdRemote.f ! APPS\WIN32FORTHIDE\EdCompile.f ! APPS\WIN32FORTHIDE\EdCommand.f ! APPS\WIN32FORTHIDE\EdAbout.f ! APPS\WIN32FORTHIDE\EdVersion.f ! DLLs,2 w32fScintilla.dll + FreeImage.dll Forms,0 Auxiliary Files,0 *************** *** 62,66 **** APPS\WINED\RES\WINEDIT.h APPS\WINED\RES\WINEDIT.res ! apps\Win32ForthIDE\res\toolbar.bmp APPS\PROMGR\RES\treeimages.bmp src\res\SciEditMDI.ico --- 75,79 ---- APPS\WINED\RES\WINEDIT.h APPS\WINED\RES\WINEDIT.res ! APPS\WIN32FORTHIDE\res\toolbar.bmp APPS\PROMGR\RES\treeimages.bmp src\res\SciEditMDI.ico |
|
From: Dirk B. <db...@us...> - 2006-06-11 09:03:50
|
Update of /cvsroot/win32forth/win32forth/apps/Win32ForthIDE In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv26541/apps/Win32ForthIDE Modified Files: CommandID.f EdCommand.f EdMenu.f EdTabControl.f Main.f ProjectTree.f Log Message: Some more work on the ProjectManger within the IDE. Index: EdTabControl.f =================================================================== RCS file: /cvsroot/win32forth/win32forth/apps/Win32ForthIDE/EdTabControl.f,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** EdTabControl.f 9 Jun 2006 11:44:56 -0000 1.7 --- EdTabControl.f 11 Jun 2006 09:03:45 -0000 1.8 *************** *** 198,207 **** ReSize: self ;M - :M AutoSize: ( -- ) - \ *G Resize the control to fit in the client area of the parent window. - tempRect.AddrOf GetClientRect: Parent - 0 0 Right: tempRect Bottom: tempRect \ x,y,h,w - Move: self ;M - : ShowFiles ( -- ) SW_SHOW Show: cFileList \ show before hide --- 198,201 ---- Index: EdMenu.f =================================================================== RCS file: /cvsroot/win32forth/win32forth/apps/Win32ForthIDE/EdMenu.f,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** EdMenu.f 10 Jun 2006 17:26:44 -0000 1.7 --- EdMenu.f 11 Jun 2006 09:03:45 -0000 1.8 *************** *** 84,89 **** MenuItem "&Rename...\tCtrl+R" IDM_RENAME_PRJ DoCommand ; MenuSeparator ! MenuItem "&Build \tCtrl+B" IDM_BUILD_PRJ DoCommand ; ! MenuItem "Set search &path for build..." IDM_SET_BUILD_PATH_PRJ DoCommand ; \ MenuSeparator \ MenuItem "&Compile \tF12" IDM_COMPILE_PRJ DoCommand ; --- 84,91 ---- MenuItem "&Rename...\tCtrl+R" IDM_RENAME_PRJ DoCommand ; MenuSeparator ! MenuItem "&Build \tCtrl+B" IDM_BUILD_PRJ DoCommand ; ! MenuItem "&Rebuild \tCtrl+B" IDM_REBUILD_PRJ DoCommand ; ! \ MenuItem "Set build file\tCtrl+B" IDM_SET_BUILD_FILE_PRJ DoCommand ; ! \ MenuItem "Set search &path for build..." IDM_SET_BUILD_PATH_PRJ DoCommand ; \ MenuSeparator \ MenuItem "&Compile \tF12" IDM_COMPILE_PRJ DoCommand ; *************** *** 133,137 **** :MenuItem mp_efle "&Ensure final line ending" IDM_ENSURE_FINAL_LINE_ENDING DoCommand ; MenuSeparator ! :MenuItem mp_sabcompile "&Save all files before Compile" IDM_SAVE_ALL_BEFORE_COMPILE DoCommand ; MenuSeparator :MenuItem mp_tabs "&Set Tab options..." IDM_TABS DoCommand ; --- 135,141 ---- :MenuItem mp_efle "&Ensure final line ending" IDM_ENSURE_FINAL_LINE_ENDING DoCommand ; MenuSeparator ! :MenuItem mp_sabcompile "&Save all files before Compile" IDM_SAVE_ALL_BEFORE_COMPILE DoCommand ; ! :MenuItem mp_compileproject "&Always compile main Project file" IDM_COMPILE_PROJECT DoCommand ; ! MenuSeparator :MenuItem mp_tabs "&Set Tab options..." IDM_TABS DoCommand ; *************** *** 143,146 **** --- 147,151 ---- Popup "&Win32Forth" :MenuItem mp_compile "&Compile\tF12" IDM_COMPILE DoCommand ; + MenuSeparator :MenuItem mp_debug "&Debug...\tF11" IDM_DEBUG DoCommand ; :MenuItem mp_HandleW32FMsg "&Handle debug messages?" IDM_HANDLEW32FMSG DoCommand ; *************** *** 273,279 **** \ Win32Forth menu - dup Enable: mp_compile dup Enable: mp_debug - \ dup Enable: mp_HandleW32FMsg \ Help menu --- 278,282 ---- *************** *** 282,285 **** --- 285,301 ---- drop ; + : CompileActiveChild? ( -- f ) + ActiveChild + if GetTextLength: ActiveChild + else false + then ; + + : Compile? ( -- f ) + CompileProject? + if GetBuildFile: TheProject nip 0= + if CompileActiveChild? else true then + else CompileActiveChild? + then ; + : EnableMenuBar ( -- ) \ enable/disable the menu items IsEditWnd? dup EnableEdit *************** *** 331,344 **** \ Options menu ! EOL SC_EOL_CRLF = Check: mf_windows ! EOL SC_EOL_LF = Check: mf_unix ! EOL SC_EOL_CR = Check: mf_mac ! CreateBackup? Check: mp_backup ! SaveAllBeforeCompile? Check: mp_sabcompile StripTrailingWhitespace? Check: mp_rtwh FinalNewLine? Check: mp_efle \ Win32Forth menu - GetTextLength: ActiveChild Enable: mp_compile ActiveRemote ActiveChild = HandleW32FMsg? and Enable: mp_debug HandleW32FMsg? Check: mp_HandleW32FMsg --- 347,359 ---- \ Options menu ! EOL SC_EOL_CRLF = Check: mf_windows ! EOL SC_EOL_LF = Check: mf_unix ! EOL SC_EOL_CR = Check: mf_mac ! CreateBackup? Check: mp_backup ! SaveAllBeforeCompile? Check: mp_sabcompile StripTrailingWhitespace? Check: mp_rtwh FinalNewLine? Check: mp_efle \ Win32Forth menu ActiveRemote ActiveChild = HandleW32FMsg? and Enable: mp_debug HandleW32FMsg? Check: mp_HandleW32FMsg *************** *** 349,356 **** then ! ShowToolbar? Check: mp_showtb ! ShowStatusbar? Check: mp_showsb ! ShowToolbar? Enable: mp_customizetb ! ForthForm? Enable: me_addforms ActiveChild 0<> dup Enable: mf_saveall --- 364,373 ---- then ! ShowToolbar? Check: mp_showtb ! ShowStatusbar? Check: mp_showsb ! ShowToolbar? Enable: mp_customizetb ! ForthForm? Enable: me_addforms ! CompileProject? Check: mp_compileproject ! Compile? Enable: mp_compile ActiveChild 0<> dup Enable: mf_saveall Index: ProjectTree.f =================================================================== RCS file: /cvsroot/win32forth/win32forth/apps/Win32ForthIDE/ProjectTree.f,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** ProjectTree.f 10 Jun 2006 17:26:44 -0000 1.6 --- ProjectTree.f 11 Jun 2006 09:03:45 -0000 1.7 *************** *** 19,23 **** 0 value ThisList \ temp pointer to list being used 0 value ThisItem \ temp pointer to new item - 0 value TheProject 0 value TheStatusBar 0 value dirty? --- 19,22 ---- *************** *** 128,141 **** :m handle: ( -- n ) ! hwndlist ;m ! :m ishandle: ( hwnd -- ) ! to hwndlist ;m :m itemid: ( -- f ) ! itemid ;m :m isitemid: ( f -- ) ! to itemid ;m :m setname: ( addr cnt -- ) --- 127,140 ---- :m handle: ( -- n ) ! hwndlist ;m ! :m ishandle: ( hwnd -- ) ! to hwndlist ;m :m itemid: ( -- f ) ! itemid ;m :m isitemid: ( f -- ) ! to itemid ;m :m setname: ( addr cnt -- ) *************** *** 177,226 **** \ \\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\ - - Rectangle ItemRect - :class ProjectTreeViewControl <super TreeViewControl - : SendMessage ( lParam wParam message -- result ) hWnd Call SendMessage ; - : SendMessageDrop ( lParam wParam message -- ) SendMessage drop ; - - :M InsertItem: ( -- hItem ) tvins 0 TVM_INSERTITEM SendMessage ;M - :M SetImageList: ( himl iImage -- ) TVM_SETIMAGELIST SendMessageDrop ;M - :M DeleteItem: ( hItem -- f ) 0 TVM_DELETEITEM SendMessage ;M - :M SetItem: ( -- ) tvitem 0 TVM_SETITEM SendMessageDrop ;M - :M Expand: ( hItem f -- ) TVM_EXPAND SendMessageDrop ;M - \ :M ToggleExpandItem: ( hItem -- ) TVE_TOGGLE Expand: self ;M - :M CollapseReset: ( hItem -- ) TVE_COLLAPSERESET TVE_COLLAPSE or Expand: self ;M - :M GetItemRect: ( hItem -- f ) ItemRect ! ItemRect true TVM_GETITEMRECT SendMessage ;M - :M SelectItem: ( hItem -- ) TVGN_CARET TVM_SELECTITEM SendMessageDrop ;M - :M GetNextItem: ( hItem -- h ) TVM_GETNEXTITEM SendMessage ;M - :M GetRoot: ( -- hItem ) 0 TVGN_ROOT GetNextItem: self ;M - :M GetChild: ( hItem -- hItem ) TVGN_CHILD GetNextItem: self ;M - :M GetParentItem: ( hItem -- hItem ) TVGN_PARENT GetNextItem: self ;M - :M GetNext: ( hItem -- hItem ) TVGN_NEXT GetNextItem: self ;M - :M GetPrevious: ( hItem -- hItem ) TVGN_PREVIOUS GetNextItem: self ;M - int maxwidth - : ItemWidthMax ( hItem -- hItem ) - dup GetItemRect: self IF right: ItemRect maxwidth max to maxwidth THEN ; - - :M GetMaxWidth: ( -- n ) - 0 to MaxWidth - GetRoot: self - ItemWidthMax - GetChild: self - Begin dup dup - While - ItemWidthMax - GetChild: self - Begin dup - While - ItemWidthMax - GetNext: self - Repeat drop - GetNext: self - Repeat drop drop - MaxWidth - ;M - File ProjectFile load-bitmap imagelist "treeimages.bmp" --- 176,181 ---- *************** *** 263,269 **** 33 bytes projectname ! : GenerateID ( -- ) ! TreeId to id ! 1 +to TreeId ; :M MainList: ( -- list ) --- 218,224 ---- 33 bytes projectname ! : GenerateID ( -- ) ! TreeId to id ! 1 +to TreeId ; :M MainList: ( -- list ) *************** *** 288,299 **** DocList ;M ! : ?itemimages ( -- i1 i2 ) \ i2= normal image, i1=image to display when selected ThisList case ! ResList of 4 4 endof ! FormList of 5 5 endof ! ModuleList of 3 3 endof ! DLLList of 6 6 endof ! 2 2 rot endcase ; --- 243,254 ---- DocList ;M ! : ?itemimages ( -- i1 i2 ) \ i2= normal image, i1=image to display when selected ThisList case ! ResList of 4 4 endof ! FormList of 5 5 endof ! ModuleList of 3 3 endof ! DLLList of 6 6 endof ! 2 2 rot endcase ; *************** *** 308,313 **** then to pszText ThisItem to lparam ! ?itemimages to iImage ! to iSelectedImage [ TVIF_TEXT TVIF_CHILDREN or TVIF_PARAM or TVIF_IMAGE or TVIF_SELECTEDIMAGE or ] literal to mask tvitem->tvins --- 263,272 ---- then to pszText ThisItem to lparam ! ! GetName: ThisItem zcount mainfile count ISTR= ! if 7 7 \ display the main project file with a different icon ! else ?itemimages ! then to iImage to iSelectedImage ! [ TVIF_TEXT TVIF_CHILDREN or TVIF_PARAM or TVIF_IMAGE or TVIF_SELECTEDIMAGE or ] literal to mask tvitem->tvins *************** *** 320,324 **** self IsParentTree: ThisItem AddChildItem ! 1 +to #addedfiles ; :M AddItem: ( str cnt parentlist -- ) --- 279,284 ---- self IsParentTree: ThisItem AddChildItem ! 1 +to #addedfiles ! ; :M AddItem: ( str cnt parentlist -- ) *************** *** 390,393 **** --- 350,363 ---- ; + :M SortParentLists: ( -- ) + \ Sort the content of the lists + handle: modulelist SortChildren: self + handle: formlist SortChildren: self + handle: DLLList SortChildren: self + handle: auxlist SortChildren: self + handle: reslist SortChildren: self + handle: doclist SortChildren: self + ;M + :m SetProjectName: ( addr cnt -- ) projectname 33 erase *************** *** 724,727 **** --- 694,698 ---- Rename: TheProject SetFocus: TheProject + SortParentLists: TheProject SetProjectTitle reset-results *************** *** 828,862 **** : add-tree-file { \ sitem -- } ! \ add one or more files SelectedItem 0= ?exit SelectedItem dup itemid: [ ] 0= \ if child selected ! if parentitem: [ ] \ use its parent ! then to sitem SelectAFile c@ ! if #SelectedFiles: GetFilesDialog 0 ! do i GetFile: GetFilesDialog sitem AddItem: TheProject ! loop ! Handle: ThisItem SelectItem: TheProject ! true to Modified ! else drop ! then ! ; IDM_ADD_PRJ SetCommand : delete-item ( -- ) ! \ Delete a file from the project ! Delete: TheProject ; IDM_DELETE_PRJ SetCommand : AddForms ( -- ) ! \ Get open forms from ForthForm ! ForthForm? if 0 WANT_FORMS win32forth-message then ! ; IDM_ADD_FORMS_PRJ SetCommand create datfile ," projectpath.dat" : save-path-to-file ( -- ) ! prognam>pad datfile count pad +place ! pad count w/o create-file ! if drop exit ! then >r path-ptr count r@ write-line drop ! r> close-file drop ; : set-build-path ( -- ) --- 799,835 ---- : add-tree-file { \ sitem -- } ! \ Add one or more files to the project SelectedItem 0= ?exit SelectedItem dup itemid: [ ] 0= \ if child selected ! if parentitem: [ ] \ use its parent ! then to sitem SelectAFile c@ ! if #SelectedFiles: GetFilesDialog 0 ! do i GetFile: GetFilesDialog sitem AddItem: TheProject ! loop ! Handle: ThisItem SelectItem: TheProject ! SortParentLists: TheProject ! true to Modified ! else drop ! then ; IDM_ADD_PRJ SetCommand : delete-item ( -- ) ! \ Delete a file from the project. ! Delete: TheProject ; IDM_DELETE_PRJ SetCommand : AddForms ( -- ) ! \ Add the open forms from ForthForm to the project. ! ForthForm? ! if 0 WANT_FORMS win32forth-message ! SortParentLists: TheProject ! then ; IDM_ADD_FORMS_PRJ SetCommand create datfile ," projectpath.dat" : save-path-to-file ( -- ) ! prognam>pad datfile count pad +place ! pad count w/o create-file ! if drop exit then ! >r path-ptr count r@ write-line drop ! r> close-file drop ; : set-build-path ( -- ) *************** *** 1025,1041 **** r> to source-id ; ! : build-project ( -- ) reset-results GetBuildFile: TheProject nip 0= ! if SelectAFile c@ ! if 0 GetFile: GetFilesDialog ! SetBuildFile: TheProject ! else drop exit ! then GetBuildFile: TheProject ModuleList: TheProject ! AddItem: TheProject ! true to Modified ! then \ Close: TheProject Leftpane Start: TheProject \ uncomment to start fresh \ clear-status-bar GetBuildFile: TheProject BuildNeededFiles \ #addedfiles Modified or to Modified \ #addedfiles (.) pad place --- 998,1019 ---- r> to source-id ; ! : (build-project) ( f -- ) reset-results GetBuildFile: TheProject nip 0= ! if SelectAFile c@ ! if 0 GetFile: GetFilesDialog ! SetBuildFile: TheProject ! else 2drop exit ! then ! then ! ! if Clear: TheProject then ! GetBuildFile: TheProject ModuleList: TheProject ! AddItem: TheProject ! true to Modified ! \ clear-status-bar GetBuildFile: TheProject BuildNeededFiles + SortParentLists: TheProject \ #addedfiles Modified or to Modified \ #addedfiles (.) pad place *************** *** 1048,1049 **** --- 1026,1037 ---- \ pad 1+ 0 SetText: ProjectStatusBar ; IDM_BUILD_PRJ SetCommand + + : build-project ( -- ) + \ Build the project + \ The files that are currently added to the project are not removed. + false (build-project) ; IDM_BUILD_PRJ SetCommand + + : rebuild-project ( -- ) + \ Rewbuild the project + \ The files that are currently added to the project are removed first. + true (build-project) ; IDM_REBUILD_PRJ SetCommand Index: EdCommand.f =================================================================== RCS file: /cvsroot/win32forth/win32forth/apps/Win32ForthIDE/EdCommand.f,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** EdCommand.f 9 Jun 2006 04:31:07 -0000 1.3 --- EdCommand.f 11 Jun 2006 09:03:45 -0000 1.4 *************** *** 283,297 **** THEN Update ; IDM_TABS SetCommand \ -------------------------------------------------------------------------- \ Win32Forth menu \ -------------------------------------------------------------------------- : mcCompile ( -- ) ! IsEditWnd? ! if SaveAllBeforeCompile? ! if SaveAllSourceFiles then ! Compile: ActiveChild ! ActiveChild to ActiveRemote \ make the current child to our active ! \ remote window for debugging ! else beep then ; IDM_COMPILE SetCommand --- 283,316 ---- THEN Update ; IDM_TABS SetCommand + : CompileProject ( -- ) + CompileProject? 0= to CompileProject? Update ; IDM_COMPILE_PROJECT SetCommand + \ -------------------------------------------------------------------------- \ Win32Forth menu \ -------------------------------------------------------------------------- + + : CompileProjectFile ( -- f ) + GetBuildFile: TheProject + ?dup + if Compile-File true + else drop false + then ; + + : CompileActiveFile ( -- ) + IsEditWnd? + if Compile: ActiveChild + \ ActiveChild to ActiveRemote \ make the current child to our active + \ \ remote window for debugging + then ; + : mcCompile ( -- ) ! SaveAllBeforeCompile? ! if SaveAllSourceFiles then ! ! CompileProject? ! if CompileProjectFile 0= ! if CompileActiveFile ! then ! else CompileActiveFile then ; IDM_COMPILE SetCommand Index: Main.f =================================================================== RCS file: /cvsroot/win32forth/win32forth/apps/Win32ForthIDE/Main.f,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** Main.f 9 Jun 2006 17:03:35 -0000 1.9 --- Main.f 11 Jun 2006 09:03:45 -0000 1.10 *************** *** 41,44 **** --- 41,45 ---- 0 value ACCEL-HNDL \ handle of the AcceleratorKeyTable 0 value MainWindow \ the address of the main window object + 0 value TheProject \ the address of the Project window object ReadFile ViewerFile *************** *** 58,61 **** --- 59,63 ---- true value StripTrailingWhitespace? true value FinalNewLine? + false value CompileProject? 0 constant FT_SOURCE *************** *** 340,343 **** --- 342,346 ---- FinalNewLine? s>d (d.) s" FinalNewLine" "SetDefault LeftWidth s>d (d.) s" LeftWidth" "SetDefault + CompileProject? s>d (d.) s" CompileProject" "SetDefault SaveAllBeforeCompile? s>d (d.) s" SaveAllBeforeCompile" "SetDefault StripTrailingWhitespace? s>d (d.) s" StripTrailingSpaces" "SetDefault *************** *** 380,383 **** --- 383,387 ---- s" FinalNewLine" "GetDefaultValue 0= IF drop true THEN to FinalNewLine? s" LeftWidth" "GetDefaultValue 0= IF drop 225 THEN to LeftWidth + s" CompileProject" "GetDefaultValue 0= IF drop true THEN to CompileProject? s" SaveAllBeforeCompile" "GetDefaultValue 0= IF drop true THEN to SaveAllBeforeCompile? Index: CommandID.f =================================================================== RCS file: /cvsroot/win32forth/win32forth/apps/Win32ForthIDE/CommandID.f,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** CommandID.f 7 Jun 2006 15:39:34 -0000 1.2 --- CommandID.f 11 Jun 2006 09:03:45 -0000 1.3 *************** *** 86,89 **** --- 86,90 ---- NewID IDM_REMOVE_TRAILING_WHITE NewID IDM_ENSURE_FINAL_LINE_ENDING + NewID IDM_COMPILE_PROJECT \ Win32Forth menu *************** *** 121,124 **** --- 122,126 ---- NewID IDM_RENAME_PRJ NewID IDM_BUILD_PRJ + NewID IDM_REBUILD_PRJ NewID IDM_SET_BUILD_PATH_PRJ NewID IDM_COMPILE_PRJ |
|
From: Dirk B. <db...@us...> - 2006-06-11 07:37:33
|
Update of /cvsroot/win32forth/win32forth/src/lib In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv23478/src/lib Modified Files: AXControl.F ScintillaControl.f TabControl.f treeview.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: TabControl.f =================================================================== RCS file: /cvsroot/win32forth/win32forth/src/lib/TabControl.f,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** TabControl.f 6 Jun 2006 02:58:24 -0000 1.1 --- TabControl.f 11 Jun 2006 07:37:27 -0000 1.2 *************** *** 204,214 **** 0 0 TCM_GETROWCOUNT SendMessage:self ;M - :M AutoSize: ( -- ) - \ *G Resize the control to fit in the client area of the parent window. - tempRect.AddrOf GetClientRect: Parent - 0 0 Right: tempRect Bottom: tempRect \ x,y,h,w - Move: self - ;M - :M Enable: ( f -- ) \ *G Enable the control. --- 204,207 ---- Index: treeview.f =================================================================== RCS file: /cvsroot/win32forth/win32forth/src/lib/treeview.f,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** treeview.f 17 May 2006 15:26:17 -0000 1.5 --- treeview.f 11 Jun 2006 07:37:27 -0000 1.6 *************** *** 86,90 **** \ \\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\ ! :Class TreeViewControl <super Child-Window Record: nmhdr --- 86,90 ---- \ \\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\ ! :Class TreeViewControl <super control Record: nmhdr *************** *** 157,160 **** --- 157,161 ---- ;RecordSize: /nmtv + Rectangle ItemRect : fill-nmhdr ( l -- ) *************** *** 179,205 **** \ -------------------- Create Tree-View Control -------------------- - create treeview-class z," SysTreeView32" \ Pre-registered class - - : create-treeview ( -- hWnd ) - \ Make sure Common Controls are loaded - Call InitCommonControls drop - - NULL \ Creation parameter - appInst \ Instance handle - id \ Child id - Parent conhndl = - if conhndl - else GetHandle: Parent \ parent window handle - then - tempRect.AddrOf GetClientRect: Parent - Bottom: tempRect Right: tempRect \ Size h,w - 0 0 \ Position y,x - WindowStyle: [ self ] \ Style - NULL \ Window name - treeview-class \ Pre-registered class - 0 \ Extended style - Call CreateWindowEx - ; :M WindowStyle: ( -- style ) --- 180,185 ---- \ -------------------- Create Tree-View Control -------------------- + create treeview-class z," SysTreeView32" \ Pre-registered class :M WindowStyle: ( -- style ) *************** *** 209,225 **** :M Start: ( Parent -- ) hWnd ! if drop ! SW_SHOWNOACTIVATE Show: self ! else ! to Parent ! create-treeview to hWnd ! then ! ;M ! ! :M AutoSize: ( -- ) ! tempRect.AddrOf GetClientRect: Parent ! 0 0 Right: tempRect Bottom: tempRect \ x,y,h,w ! Move: self ! ;M :M Handle_Notify: ( h m w l -- f ) --- 189,198 ---- :M Start: ( Parent -- ) hWnd ! if drop ! SW_SHOWNOACTIVATE Show: self ! else to Parent ! Call InitCommonControls drop ! treeview-class Create-Control ! then ;M :M Handle_Notify: ( h m w l -- f ) *************** *** 244,259 **** ;M - :M ToggleExpandItem: ( hItem -- ) ! TVE_TOGGLE TVM_EXPAND hWnd Call SendMessage drop ;M :M ExpandItem: ( hItem -- ) ! TVE_EXPAND TVM_EXPAND hWnd Call SendMessage drop ;M :M CollapseItem: ( hItem -- ) ! TVE_COLLAPSE TVM_EXPAND hWnd Call SendMessage drop ;M :M SortChildren: ( hItem -- ) ! false TVM_SORTCHILDREN hWnd Call SendMessage drop ;M :M DeleteItem: ( hItem -- ) --- 217,231 ---- ;M :M ToggleExpandItem: ( hItem -- ) ! TVE_TOGGLE TVM_EXPAND SendMessage:SelfDrop ;M :M ExpandItem: ( hItem -- ) ! TVE_EXPAND TVM_EXPAND SendMessage:SelfDrop ;M :M CollapseItem: ( hItem -- ) ! TVE_COLLAPSE TVM_EXPAND SendMessage:SelfDrop ;M :M SortChildren: ( hItem -- ) ! false TVM_SORTCHILDREN SendMessage:SelfDrop ;M :M DeleteItem: ( hItem -- ) *************** *** 261,265 **** \ ** hItem is the handle of the item to delete. If hItem is set to TVI_ROOT, \ ** all items are deleted. ! 0 TVM_DELETEITEM hWnd Call SendMessage drop ;M --- 233,276 ---- \ ** hItem is the handle of the item to delete. If hItem is set to TVI_ROOT, \ ** all items are deleted. ! 0 TVM_DELETEITEM hWnd SendMessage:SelfDrop ;M ! ! :M InsertItem: ( -- hItem ) tvins 0 TVM_INSERTITEM SendMessage:Self ;M ! :M SetImageList: ( himl iImage -- ) TVM_SETIMAGELIST SendMessage:SelfDrop ;M ! :M DeleteItem: ( hItem -- f ) 0 TVM_DELETEITEM SendMessage:Self ;M ! :M SetItem: ( -- ) tvitem 0 TVM_SETITEM SendMessage:SelfDrop ;M ! :M Expand: ( hItem f -- ) TVM_EXPAND SendMessage:SelfDrop ;M ! \ :M ToggleExpandItem: ( hItem -- ) TVE_TOGGLE Expand: self ;M ! :M CollapseReset: ( hItem -- ) TVE_COLLAPSERESET TVE_COLLAPSE or Expand: self ;M ! :M GetItemRect: ( hItem -- f ) ItemRect ! ItemRect true TVM_GETITEMRECT SendMessage:Self ;M ! :M SelectItem: ( hItem -- ) TVGN_CARET TVM_SELECTITEM SendMessage:SelfDrop ;M ! :M GetNextItem: ( hItem -- h ) TVM_GETNEXTITEM SendMessage:Self ;M ! :M GetRoot: ( -- hItem ) 0 TVGN_ROOT GetNextItem: self ;M ! :M GetChild: ( hItem -- hItem ) TVGN_CHILD GetNextItem: self ;M ! :M GetParentItem: ( hItem -- hItem ) TVGN_PARENT GetNextItem: self ;M ! :M GetNext: ( hItem -- hItem ) TVGN_NEXT GetNextItem: self ;M ! :M GetPrevious: ( hItem -- hItem ) TVGN_PREVIOUS GetNextItem: self ;M ! ! int maxwidth ! : ItemWidthMax ( hItem -- hItem ) ! dup GetItemRect: self IF right: ItemRect maxwidth max to maxwidth THEN ; ! ! :M GetMaxWidth: ( -- n ) ! 0 to MaxWidth ! GetRoot: self ! ItemWidthMax ! GetChild: self ! Begin dup dup ! While ! ItemWidthMax ! GetChild: self ! Begin dup ! While ! ItemWidthMax ! GetNext: self ! Repeat drop ! GetNext: self ! Repeat drop drop ! MaxWidth ! ;M Index: ScintillaControl.f =================================================================== RCS file: /cvsroot/win32forth/win32forth/src/lib/ScintillaControl.f,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** ScintillaControl.f 13 May 2006 20:27:32 -0000 1.4 --- ScintillaControl.f 11 Jun 2006 07:37:27 -0000 1.5 *************** *** 673,687 **** ;M - :M AutoSize: ( -- ) - tempRect.AddrOf GetClientRect: Parent - 0 0 Right: tempRect Bottom: tempRect \ x,y,h,w - Move: self - ;M - - :M ~: ( -- ) - \ DestroyWindow: self \ first destroy the window - ~: super - ;M - \ ----------------------------------------------------------------------------- \ ----------------------------------------------------------------------------- --- 673,676 ---- *************** *** 1785,1789 **** \ Execute a Keyboard command ! :M KeyCommand: ( n -- ) 0 0 rot SendMessage:Self drop ;M --- 1774,1778 ---- \ Execute a Keyboard command ! :M KeyCommand: ( n -- ) 0 0 rot SendMessage:Self drop ;M *************** *** 1831,1837 **** \ You can enable the drawing of visual flags to indicate a line is wrapped. Bits set ! \ in wrapVisualFlags determine which visual flags are drawn. Symbol Value Effect ! \ SC_WRAPVISUALFLAG_NONE 0 No visual flags ! \ SC_WRAPVISUALFLAG_END 1 Visual flag at end of subline of a wrapped line. \ SC_WRAPVISUALFLAG_START 2 Visual flag at begin of subline of a wrapped line. \ Subline is indented by at least 1 to make room for the flag. --- 1820,1826 ---- \ You can enable the drawing of visual flags to indicate a line is wrapped. Bits set ! \ in wrapVisualFlags determine which visual flags are drawn. Symbol Value Effect ! \ SC_WRAPVISUALFLAG_NONE 0 No visual flags ! \ SC_WRAPVISUALFLAG_END 1 Visual flag at end of subline of a wrapped line. \ SC_WRAPVISUALFLAG_START 2 Visual flag at begin of subline of a wrapped line. \ Subline is indented by at least 1 to make room for the flag. *************** *** 1844,1851 **** \ You can set wether the visual flags to indicate a line is wrapped are drawn near \ the border or near the text. Bits set in wrapVisualFlagsLocation set the location ! \ to near the text for the corresponding visual flag. Symbol Value Effect ! \ SC_WRAPVISUALFLAGLOC_DEFAULT 0 Visual flags drawn near border ! \ SC_WRAPVISUALFLAGLOC_END_BY_TEXT 1 Visual flag at end of subline drawn near text ! \ SC_WRAPVISUALFLAGLOC_START_BY_TEXT 2 Visual flag at begin of subline drawn near text :M SetWrapVisualFlagsLocation: ( wrapVisualFlagsLocation -- ) 0 swap SCI_SETWRAPVISUALFLAGSLOCATION SendMessage:Self ;M --- 1833,1840 ---- \ You can set wether the visual flags to indicate a line is wrapped are drawn near \ the border or near the text. Bits set in wrapVisualFlagsLocation set the location ! \ to near the text for the corresponding visual flag. Symbol Value Effect ! \ SC_WRAPVISUALFLAGLOC_DEFAULT 0 Visual flags drawn near border ! \ SC_WRAPVISUALFLAGLOC_END_BY_TEXT 1 Visual flag at end of subline drawn near text ! \ SC_WRAPVISUALFLAGLOC_START_BY_TEXT 2 Visual flag at begin of subline drawn near text :M SetWrapVisualFlagsLocation: ( wrapVisualFlagsLocation -- ) 0 swap SCI_SETWRAPVISUALFLAGSLOCATION SendMessage:Self ;M *************** *** 1858,1862 **** \ sizes, but values less than 0 or large values may have undesirable effects. \ The indention of sublines is independent of visual flags, but if SC_WRAPVISUALFLAG_START ! \ is set an indent of at least 1 is used. :M SetWrapStartIdent: ( indent -- ) 0 swap SCI_SETWRAPSTARTINDENT SendMessage:Self ;M --- 1847,1851 ---- \ sizes, but values less than 0 or large values may have undesirable effects. \ The indention of sublines is independent of visual flags, but if SC_WRAPVISUALFLAG_START ! \ is set an indent of at least 1 is used. :M SetWrapStartIdent: ( indent -- ) 0 swap SCI_SETWRAPSTARTINDENT SendMessage:Self ;M *************** *** 1866,1874 **** \ You can set cacheMode to one of the symbols in the table: ! \ Symbol Value Layout cached for these lines ! \ SC_CACHE_NONE 0 No lines are cached. ! \ SC_CACHE_CARET 1 The line containing the text caret. This is the default. ! \ SC_CACHE_PAGE 2 Visible lines plus the line containing the caret. ! \ SC_CACHE_DOCUMENT 3 All lines in the document. :M SetLayoutCache: ( cacheMode -- ) 0 swap SCI_SETLAYOUTCACHE SendMessage:Self ;M --- 1855,1863 ---- \ You can set cacheMode to one of the symbols in the table: ! \ Symbol Value Layout cached for these lines ! \ SC_CACHE_NONE 0 No lines are cached. ! \ SC_CACHE_CARET 1 The line containing the text caret. This is the default. ! \ SC_CACHE_PAGE 2 Visible lines plus the line containing the caret. ! \ SC_CACHE_DOCUMENT 3 All lines in the document. :M SetLayoutCache: ( cacheMode -- ) 0 swap SCI_SETLAYOUTCACHE SendMessage:Self ;M *************** *** 1880,1884 **** \ pixelWidth wide. Splitting occurs on word boundaries wherever possible in a \ similar manner to line wrapping. When pixelWidth is 0 then the width of the ! \ window is used. :M LineSplit: ( pixelWidth -- ) 0 swap SCI_LINESSPLIT SendMessage:Self ;M --- 1869,1873 ---- \ pixelWidth wide. Splitting occurs on word boundaries wherever possible in a \ similar manner to line wrapping. When pixelWidth is 0 then the width of the ! \ window is used. :M LineSplit: ( pixelWidth -- ) 0 swap SCI_LINESSPLIT SendMessage:Self ;M *************** *** 1886,1890 **** \ Join a range of lines indicated by the target into one line by removing line \ end characters. Where this would lead to no space between words, an extra space ! \ is inserted. :M LinesJoin: ( -- ) 0 0 SCI_LINESJOIN SendMessage:Self ;M --- 1875,1879 ---- \ Join a range of lines indicated by the target into one line by removing line \ end characters. Where this would lead to no space between words, an extra space ! \ is inserted. :M LinesJoin: ( -- ) 0 0 SCI_LINESJOIN SendMessage:Self ;M *************** *** 1892,1896 **** \ ----------------------------------------------------------------------------- ! \ Tabs \ ----------------------------------------------------------------------------- --- 1881,1885 ---- \ ----------------------------------------------------------------------------- ! \ Tabs \ ----------------------------------------------------------------------------- *************** *** 1917,1928 **** \ ----------------------------------------------------------------------------- ! \ Printing \ ----------------------------------------------------------------------------- Record: RangeToFormat ! int hdcPrinter ! int hdcTarget ! rectangle Pagesize ! rectangle rcPage int cpMin \ CharacterRange int cpMax --- 1906,1917 ---- \ ----------------------------------------------------------------------------- ! \ Printing \ ----------------------------------------------------------------------------- Record: RangeToFormat ! int hdcPrinter ! int hdcTarget ! rectangle Pagesize ! rectangle rcPage int cpMin \ CharacterRange int cpMax *************** *** 1938,1942 **** : SetFormatRange ( -- ) GetHandle: ThePrinter dup to hdcPrinter to hdcTarget ! rtMargin @ Xpixels rtMargin cell+ @ Ypixels Width: ThePrinter rtMargin 2 cells+ @ Xpixels - Height: ThePrinter rtMargin 3 cells+ @ Ypixels - --- 1927,1931 ---- : SetFormatRange ( -- ) GetHandle: ThePrinter dup to hdcPrinter to hdcTarget ! rtMargin @ Xpixels rtMargin cell+ @ Ypixels Width: ThePrinter rtMargin 2 cells+ @ Xpixels - Height: ThePrinter rtMargin 3 cells+ @ Ypixels - *************** *** 1961,1965 **** REPEAT dup nToPage w! nMaxPage w! RestoreDC: ThePrinter ! print-close hDevMode 2! \ restore selected printer \ Number of pages is put into nToPage and nMaxPage --- 1950,1954 ---- REPEAT dup nToPage w! nMaxPage w! RestoreDC: ThePrinter ! print-close hDevMode 2! \ restore selected printer \ Number of pages is put into nToPage and nMaxPage *************** *** 1987,1993 **** WHILE 1+ REPEAT drop ( last PageNo ) ! print-end RestoreDC: ThePrinter ! print-close THEN ;M --- 1976,1982 ---- WHILE 1+ REPEAT drop ( last PageNo ) ! print-end RestoreDC: ThePrinter ! print-close THEN ;M Index: AXControl.F =================================================================== RCS file: /cvsroot/win32forth/win32forth/src/lib/AXControl.F,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** AXControl.F 11 Jan 2006 17:45:20 -0000 1.3 --- AXControl.F 11 Jun 2006 07:37:27 -0000 1.4 *************** *** 53,63 **** \ *G AXControl Base class for ActiveX controls - :M AutoSize: ( -- ) - \ Resize the ActiveX Control to fit into the client area of his parent window. - tempRect.AddrOf GetClientRect: Parent - 0 0 Right: tempRect Bottom: tempRect \ x,y,h,w - Move: self - ;M - :M AXUCreate: ( ustr -- ) \ *G calls unicode creation function --- 53,56 ---- |
|
From: Dirk B. <db...@us...> - 2006-06-11 07:37:32
|
Update of /cvsroot/win32forth/win32forth/apps/Player4 In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv23478/apps/Player4 Modified Files: MCIWnd.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: MCIWnd.f =================================================================== RCS file: /cvsroot/win32forth/win32forth/apps/Player4/MCIWnd.f,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** MCIWnd.f 10 Jun 2006 18:00:04 -0000 1.5 --- MCIWnd.f 11 Jun 2006 07:37:26 -0000 1.6 *************** *** 92,101 **** :M WM_MOUSEMOVE ( h m w l -- res ) old-WndProc CallWindowProc ;M - :M AutoSize: ( -- ) - tempRect.AddrOf GetClientRect: Parent - 0 0 Right: tempRect Bottom: tempRect \ x,y,h,w - Move: self - ;M - \ Window Styles: \ \ \\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\ --- 92,95 ---- |
|
From: Dirk B. <db...@us...> - 2006-06-11 07:37:31
|
Update of /cvsroot/win32forth/win32forth/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv23478/src Modified Files: CHILDWND.F CONTROL.F GENERIC.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: CHILDWND.F =================================================================== RCS file: /cvsroot/win32forth/win32forth/src/CHILDWND.F,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** CHILDWND.F 5 Jun 2006 07:37:15 -0000 1.7 --- CHILDWND.F 11 Jun 2006 07:37:26 -0000 1.8 *************** *** 121,124 **** --- 121,131 ---- then ;M + :M AutoSize: ( -- ) + \ *G Size the window to fit into the client area of the parent window. + tempRect.AddrOf GetClientRect: Parent + 0 0 Right: tempRect Bottom: tempRect \ x,y,h,w + Move: self + ;M + ;Class \ *G End of Child-Window class Index: CONTROL.F =================================================================== RCS file: /cvsroot/win32forth/win32forth/src/CONTROL.F,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** CONTROL.F 31 Dec 2005 11:12:44 -0000 1.6 --- CONTROL.F 11 Jun 2006 07:37:27 -0000 1.7 *************** *** 186,194 **** 0 0 ;M \ ! :M StartPos: ( -- left top ) \ *G Get the start position of this control. \n \ ** Override this method to change it. 0 0 ;M :M CreateStruct: ( -- CreateStrucPointer ) \ *G This pointer to a structure, depends on what kind of window you are --- 186,201 ---- 0 0 ;M \ ! :M StartPos: ( -- left top ) \ *G Get the start position of this control. \n \ ** Override this method to change it. 0 0 ;M + :M AutoSize: ( -- ) + \ *G Size the window to fit into the client area of the parent window. + tempRect.AddrOf GetClientRect: Parent + 0 0 Right: tempRect Bottom: tempRect \ x,y,h,w + Move: self + ;M + :M CreateStruct: ( -- CreateStrucPointer ) \ *G This pointer to a structure, depends on what kind of window you are Index: GENERIC.F =================================================================== RCS file: /cvsroot/win32forth/win32forth/src/GENERIC.F,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** GENERIC.F 8 Jun 2006 07:54:07 -0000 1.12 --- GENERIC.F 11 Jun 2006 07:37:27 -0000 1.13 *************** *** 113,118 **** ! : SendMessage:Self ( lParam wParam message -- result ) hWnd call SendMessage ; ! : SendMessage:SelfDrop ( lParam wParam message -- ) SendMessage:Self drop ; \ ----------------------------------------------------------------- --- 113,123 ---- ! : SendMessage:Self ( lParam wParam message -- result ) ! \ *G Send a windows message to our self. ! hWnd call SendMessage ; ! ! : SendMessage:SelfDrop ( lParam wParam message -- ) ! \ *G Send a windows message to our self and discard the result. ! SendMessage:Self drop ; \ ----------------------------------------------------------------- *************** *** 237,240 **** --- 242,246 ---- then ;M + (( :M GetWindowRect: ( -- left top right bottom ) |
|
From: Dirk B. <db...@us...> - 2006-06-11 07:37:31
|
Update of /cvsroot/win32forth/win32forth/apps/ProMgr In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv23478/apps/ProMgr Modified Files: ProjectManager.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: ProjectManager.f =================================================================== RCS file: /cvsroot/win32forth/win32forth/apps/ProMgr/ProjectManager.f,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** ProjectManager.f 11 Jan 2006 17:45:19 -0000 1.12 --- ProjectManager.f 11 Jun 2006 07:37:26 -0000 1.13 *************** *** 428,472 **** :Object TheProject <super TreeViewControl - : SendMessage ( lParam wParam message -- result ) hWnd Call SendMessage ; - : SendMessageDrop ( lParam wParam message -- ) SendMessage drop ; - - :M InsertItem: ( -- hItem ) tvins 0 TVM_INSERTITEM SendMessage ;M - :M SetImageList: ( himl iImage -- ) TVM_SETIMAGELIST SendMessageDrop ;M - :M DeleteItem: ( hItem -- f ) 0 TVM_DELETEITEM SendMessage ;M - :M SetItem: ( -- ) tvitem 0 TVM_SETITEM SendMessageDrop ;M - :M Expand: ( hItem f -- ) TVM_EXPAND SendMessageDrop ;M - \ :M ToggleExpandItem: ( hItem -- ) TVE_TOGGLE Expand: self ;M - :M CollapseReset: ( hItem -- ) TVE_COLLAPSERESET TVE_COLLAPSE or Expand: self ;M - :M GetItemRect: ( hItem -- f ) ItemRect ! ItemRect true TVM_GETITEMRECT SendMessage ;M - :M SelectItem: ( hItem -- ) TVGN_CARET TVM_SELECTITEM SendMessageDrop ;M - :M GetNextItem: ( hItem -- h ) TVM_GETNEXTITEM SendMessage ;M - :M GetRoot: ( -- hItem ) 0 TVGN_ROOT GetNextItem: self ;M - :M GetChild: ( hItem -- hItem ) TVGN_CHILD GetNextItem: self ;M - :M GetParentItem: ( hItem -- hItem ) TVGN_PARENT GetNextItem: self ;M - :M GetNext: ( hItem -- hItem ) TVGN_NEXT GetNextItem: self ;M - :M GetPrevious: ( hItem -- hItem ) TVGN_PREVIOUS GetNextItem: self ;M - int maxwidth - : ItemWidthMax ( hItem -- hItem ) - dup GetItemRect: self IF right: ItemRect maxwidth max to maxwidth THEN ; - - :M GetMaxWidth: ( -- n ) - 0 to MaxWidth - GetRoot: self - ItemWidthMax - GetChild: self - Begin dup dup - While - ItemWidthMax - GetChild: self - Begin dup - While - ItemWidthMax - GetNext: self - Repeat drop - GetNext: self - Repeat drop drop - MaxWidth - ;M - File ProjectFile load-bitmap imagelist "treeimages.bmp" --- 428,431 ---- *************** *** 974,978 **** 0 0 GetSize: self Move: HtmlBox then ; ! : Start-BinaryBox ( -- ) GetHandle: BinaryBox 0= --- 933,937 ---- 0 0 GetSize: self Move: HtmlBox then ; ! : Start-BinaryBox ( -- ) GetHandle: BinaryBox 0= *************** *** 1047,1051 **** :M Close: ( -- ) Close-Viewers ;M ! ;Object --- 1006,1010 ---- :M Close: ( -- ) Close-Viewers ;M ! ;Object *************** *** 1259,1263 **** ProjectManager SaveSettings false promgr-started ! SaveRecentFiles SaveRecentFiles MenuHandle: CurrentMenu ?dup --- 1218,1222 ---- ProjectManager SaveSettings false promgr-started ! SaveRecentFiles SaveRecentFiles MenuHandle: CurrentMenu ?dup |
|
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 |
|
From: Jos v.d.V. <jo...@us...> - 2006-06-10 18:00:09
|
Update of /cvsroot/win32forth/win32forth/apps/Player4 In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv30849/apps/Player4 Modified Files: Catalog.f MCIWnd.f PLAYER4.F Pl_MciWindow.f Pl_Version.f Log Message: Jos: Added more joystick commands Index: Pl_Version.f =================================================================== RCS file: /cvsroot/win32forth/win32forth/apps/Player4/Pl_Version.f,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** Pl_Version.f 21 May 2006 11:42:10 -0000 1.16 --- Pl_Version.f 10 Jun 2006 18:00:04 -0000 1.17 *************** *** 3,7 **** anew -Pl_Version.f ! 10123 value player_version# \ Version numbers: v.ww.rr --- 3,7 ---- anew -Pl_Version.f ! 10124 value player_version# \ Version numbers: v.ww.rr *************** *** 143,144 **** --- 143,155 ---- dbu Sonntag, Mai 21 2006 - Rewritten the Command handling by using an accelerator-key-table. + + \ changes for Version 1.01.24 + Jos: Added a the following joystick commands: + button1 next + button2 reserved for joystick browsing + button3 decreasevolume + button4 increasevolume + button5 pause/resume + button6 shutdown the pc + + Index: Catalog.f =================================================================== RCS file: /cvsroot/win32forth/win32forth/apps/Player4/Catalog.f,v retrieving revision 1.34 retrieving revision 1.35 diff -C2 -d -r1.34 -r1.35 *** Catalog.f 25 May 2006 18:09:27 -0000 1.34 --- Catalog.f 10 Jun 2006 18:00:04 -0000 1.35 *************** *** 51,56 **** BYTE IgnoreRequests BYTE KeepRequests ! BYTE _SeparatorX BYTE Endless- ;struct --- 51,58 ---- BYTE IgnoreRequests BYTE KeepRequests ! DWORD _SeparatorX BYTE Endless- + \ DWORD Noop + DWORD VolLevel ;struct *************** *** 236,239 **** --- 238,242 ---- r> close-file throw map-config-file + 1000 vadr-config VolLevel ! then ; *************** *** 490,494 **** ; ! : random-shuffle ( - >>> ) vadr-config MaximumRandomLevel @ for-all-records change-randomlevel drop sort_by_RandomLevel RefreshCatalog --- 493,497 ---- ; ! : random-shuffle ( - ) vadr-config MaximumRandomLevel @ for-all-records change-randomlevel drop sort_by_RandomLevel RefreshCatalog Index: MCIWnd.f =================================================================== RCS file: /cvsroot/win32forth/win32forth/apps/Player4/MCIWnd.f,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** MCIWnd.f 21 May 2006 11:42:10 -0000 1.4 --- MCIWnd.f 10 Jun 2006 18:00:04 -0000 1.5 *************** *** 46,50 **** :M GetLength: ( -- n ) 0 0 MCIWNDM_GETLENGTH SendMessage ;M :M GetVolume: ( -- n ) 0 0 MCIWNDM_GETVOLUME SendMessage ;M ! :M SetVolume: ( n -- ) 0 MCIWNDM_GETVOLUME SendMessageDrop ;M :M GetStart: ( -- n ) 0 0 MCIWNDM_GETSTART SendMessage ;M :M GetDest: ( -- l t r b ) AddrOf: Dest 0 MCIWNDM_GET_DEST SendMessageDrop --- 46,50 ---- :M GetLength: ( -- n ) 0 0 MCIWNDM_GETLENGTH SendMessage ;M :M GetVolume: ( -- n ) 0 0 MCIWNDM_GETVOLUME SendMessage ;M ! :M SetVolume: ( n -- ) 0 max 1000 min 0 MCIWNDM_SETVOLUME SendMessageDrop ;M :M GetStart: ( -- n ) 0 0 MCIWNDM_GETSTART SendMessage ;M :M GetDest: ( -- l t r b ) AddrOf: Dest 0 MCIWNDM_GET_DEST SendMessageDrop Index: PLAYER4.F =================================================================== RCS file: /cvsroot/win32forth/win32forth/apps/Player4/PLAYER4.F,v retrieving revision 1.57 retrieving revision 1.58 diff -C2 -d -r1.57 -r1.58 *** PLAYER4.F 27 May 2006 19:13:33 -0000 1.57 --- PLAYER4.F 10 Jun 2006 18:00:04 -0000 1.58 *************** *** 33,36 **** --- 33,37 ---- needs AcceleratorTables.f needs Joystick.f + needs security.f 200 value IDJoystick *************** *** 40,43 **** --- 41,45 ---- defer RequestRecord ' noop is RequestRecord defer MenuChecks ' noop is MenuChecks + defer HandleJoystick ' noop is HandleJoystick needs Pl_Toolset.f *************** *** 238,258 **** if Startsize: self drop 2/ SeparatorX ! then position-windows - addr: self to player-base RefreshCatalog FindFirstJoyStick dup to IDJoystick MaxJoysticks < ! if 0 250 1 hWnd Call SetTimer drop then ;M ! :M WM_TIMER ( hm wl -- res >>> ) \ handle the WM_TIMER events ! 2drop IDJoystick GetJoystickInfo 1 = ! if IDM_NEXT DoCommand ! begin IDJoystick GetJoystickInfo 2nip nip 0= ! until ! 3drop ! then ! 0 ;M --- 240,253 ---- if Startsize: self drop 2/ SeparatorX ! then position-windows addr: self to player-base RefreshCatalog FindFirstJoyStick dup to IDJoystick MaxJoysticks < ! if 0 200 1 hWnd Call SetTimer drop then ;M ! :M WM_TIMER ( hm wl -- res ) \ handle the WM_TIMER events ! 2drop HandleJoystick 0 ;M *************** *** 385,388 **** --- 380,416 ---- needs Commands.f + : GetVolume/timeOut ( - Volume VolumeChange ) 100 ms GetVolume: Player4W dup 10 / ; + : ButtonIn? ( - ButtonIn ) IDJoystick GetJoystickInfo 2nip nip 0= ; + : WaitTillDepressed ( - ) begin ButtonIn? until ; + : SetVolLevel ( Volume - ) dup 1000 min 0 max vadr-config VolLevel ! SetVolume: Player4W ; + + : DecreaseVolume ( - ) + begin GetVolume/timeOut - SetVolLevel + ButtonIn? + until + ; + + : IncreaseVolume ( - ) + begin GetVolume/timeOut + SetVolLevel + ButtonIn? + until + ; + + :Noname ( - ) + IDJoystick GetJoystickInfo + dup JOY_BUTTON1 >= + if case + JOY_BUTTON1 of IDM_NEXT DoCommand endof + JOY_BUTTON3 of DecreaseVolume endof + JOY_BUTTON4 of IncreaseVolume endof + JOY_BUTTON5 of IDM_PAUSE/RESUME DoCommand endof + JOY_BUTTON6 of down endof + endcase + WaitTillDepressed 3drop + else 4drop + then + + ; is HandleJoystick + \ ----------------------------------------------------------------------------- \ Define the Menu bar *************** *** 402,406 **** MENUITEM "S&earch and make a collection..." SearchCatalog ; MENUSEPARATOR ! :MENUITEM mEndless "Endless play" Endless ; \ >>> MENUITEM "&Start/Resume playing\tCtrl+R" IDM_START/RESUME DoCommand ; MENUSEPARATOR --- 430,434 ---- MENUITEM "S&earch and make a collection..." SearchCatalog ; MENUSEPARATOR ! :MENUITEM mEndless "Endless play" Endless ; MENUITEM "&Start/Resume playing\tCtrl+R" IDM_START/RESUME DoCommand ; MENUSEPARATOR *************** *** 502,506 **** \ ----------------------------------------------------------------------------- ! : InitPlayer ( -- ) Start: MainWindow Start: ControlCenter --- 530,534 ---- \ ----------------------------------------------------------------------------- ! : InitPlayer ( -- >>> ) Start: MainWindow Start: ControlCenter Index: Pl_MciWindow.f =================================================================== RCS file: /cvsroot/win32forth/win32forth/apps/Player4/Pl_MciWindow.f,v retrieving revision 1.23 retrieving revision 1.24 diff -C2 -d -r1.23 -r1.24 *** Pl_MciWindow.f 25 May 2006 17:59:20 -0000 1.23 --- Pl_MciWindow.f 10 Jun 2006 18:00:04 -0000 1.24 *************** *** 119,122 **** --- 119,125 ---- Video?: self 0= ;M + :M GetVolume: ( -- vol ) GetVolume: MCI ;M + :M SetVolume: ( vol -- ) SetVolume: MCI ;M + : ReTitle ( addr len -- ) WindowTitle: parent zcount title$ place ?dup *************** *** 220,223 **** --- 223,227 ---- : (PlayOneFile) ( addr len -- ) \ plays a file and waits until playing is finished PlayFile: self \ play this file + vadr-config VolLevel @ SetVolume: Self \ Restore the volume to VolLevel begin PLAYER \ call the main PLAYER Playing? 0= \ and wait until playing is finished |
|
From: Jos v.d.V. <jo...@us...> - 2006-06-10 17:58:18
|
Update of /cvsroot/win32forth/win32forth/src/lib In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv30411/src/lib Added Files: Security.f Log Message: Jos: Enables Forth to shutdown the PC --- NEW FILE: Security.f --- (( April 7th, 2002 - 12:07 A start for security for NT or better. It was started for the use of shutdown. Notes: It can be compiled when W95 is used. Words which are marked with *W95 will also work when W95 is used )) needs struct.f anew security.f \ Is also able to shutdown a PC struct{ \ luid_and_attributes double luid dword attributes }struct luid_and_attributes struct{ \ token_privilege dword PrivilegeCount offset luaa sizeof luid_and_attributes _add-struct }struct token_privilege sizeof token_privilege mkstruct: &token_privilege struct{ \ _osversioninfo DWORD dwOSVersionInfoSize DWORD dwMajorVersion DWORD dwMinorVersion DWORD dwBuildNumber DWORD dwPlatformId 128 add-struct szCSDVersion }struct osversioninfo (( W95 W98 WMe WNT4.0 W2000 WXP PlatformID 1 1 1 2 2 2 Major Version 4 4 4 4 5 5 Minor Version 0 10 90 0 0 1 )) : os! ( adr - ) \ *W95 sizeof osversioninfo over dwOSVersionInfoSize ! call GetVersionEx ?win-error ; : nt-or-better? ( - flag ) pad dup os! dwPlatformId @ 2 >= ; \ *W95 string: systemname : computername$! ( adr - ) \ March 30th, 2002 was GetComputerName 100 pad ! pad \ lpszName over 1+ \ lpdwbuffer call GetComputerName drop pad @ swap c! ; : default-system ( - ) systemname computername$! ; \ *W95 initialization-chain chain-add default-system default-system \ access mask to the access token : get-token ( DesiredAccess - TokenHandle ) nt-or-better? if &token_privilege luaa dup>r swap call GetCurrentProcess call OpenProcessToken ?win-error r> @ else true abort" Need NT for security operations." then ; : luid? ( z"priv" - luid-h luid-l ) &token_privilege luaa dup>r swap systemname 1+ call LookupPrivilegeValue 0= abort" Unknown privilege." r> 2@ ; 1 constant TokenUser 2 constant TokenGroups 3 constant TokenPrivileges 4 constant TokenOwner 5 constant TokenPrimaryGroup 6 constant TokenDefaultDacl 7 constant TokenSource 8 constant TokenType 9 constant TokenImpersonationLevel 10 constant TokenStatistics 11 constant TokenRestrictedSids 12 constant TokenSessionId : GetTokenInformation ( type TokenHandle - buffer-with-info buffer-size ) temp$ 100 erase 2>r pad maxstring temp$ 2r> call GetTokenInformation ?win-error temp$ 4 + pad @ ; : reset_last_error ( - ) 0 call SetLastError drop ; \ *W95 : .attribute ( attribute - ) dup 0 = if drop ." disabled." exit then dup SE_PRIVILEGE_ENABLED_BY_DEFAULT and if ." ENABLED by default." then dup SE_PRIVILEGE_ENABLED and if ." ENABLED * " then SE_PRIVILEGE_USED_FOR_ACCESS and if ." Seen by PrivilegeCheck." then ; : .luid ( luid-h luid-l - ) \ size of string lpName, lpLuid pSystemName pad 2! 500 temp$ ! temp$ here pad systemname 1+ call LookupPrivilegeName ?win-error here temp$ @ type ; : .privs \ Uses the buffer for storage of the privileges ." Priviliges at " systemname count type ." :" reset_last_error TOKENPRIVILEGES TOKEN_QUERY get-token GetTokenInformation 4 - [ sizeof luid_and_attributes ] literal / 0 do cr dup i [ sizeof luid_and_attributes ] literal * + dup luid 2@ .luid attributes @ .attribute loop drop ; : setpriv ( z"Privilege" Attribute - flag ) \ for the current process TOKEN_ADJUST_PRIVILEGES TOKEN_QUERY or get-token >r reset_last_error &token_privilege luaa attributes ! 1 &token_privilege ! luid? &token_privilege luaa 2! 0 temp$ ! temp$ pad 400 &token_privilege false r> call AdjustTokenPrivileges drop call GetLastError ERROR_SUCCESS = ; : shutdown ( type - ) 0 swap call ExitWindowsEx ; \ *W95 \ down will shutdown or logoff depending on your privilege on NT or better. : down ( - ) \ *W95 nt-or-better? if z" SeShutdownPrivilege" SE_PRIVILEGE_ENABLED setpriv else true then if EWX_SHUTDOWN EWX_POWEROFF or \ EWX_REBOOT or else EWX_LOGOFF then shutdown drop ; \s |
|
From: Dirk B. <db...@us...> - 2006-06-10 17:26:49
|
Update of /cvsroot/win32forth/win32forth/apps/Win32ForthIDE In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv17518/apps/Win32ForthIDE Modified Files: EdMenu.f ProjectTree.f Log Message: Made some more of the Project commands work (from the menu only). Index: ProjectTree.f =================================================================== RCS file: /cvsroot/win32forth/win32forth/apps/Win32ForthIDE/ProjectTree.f,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** ProjectTree.f 9 Jun 2006 04:31:07 -0000 1.5 --- ProjectTree.f 10 Jun 2006 17:26:44 -0000 1.6 *************** *** 14,19 **** true value no-duplicates? 0 value #addedfiles ! \ 0 value #linecount ! \ 0 value total-size 0 value SelectedItem 0 value ThisList \ temp pointer to list being used --- 14,19 ---- true value no-duplicates? 0 value #addedfiles ! 0 value #linecount ! 0 value total-size 0 value SelectedItem 0 value ThisList \ temp pointer to list being used *************** *** 301,318 **** tvins /tvins erase tvitem /tvitem erase ! 0 to cChildren ! Handle: ThisList to hParent ! TVI_LAST to hInsertAfter GetName: ThisItem name-only? ! if zcount "to-pathend" asciiz ! then to pszText ! ThisItem to lparam ?itemimages to iImage to iSelectedImage ! TVIF_TEXT TVIF_CHILDREN or TVIF_PARAM or ! TVIF_IMAGE or TVIF_SELECTEDIMAGE or to mask tvitem->tvins ! InsertItem: self ! IsHandle: ThisItem ; : UpdateList ( addr cnt -- ) --- 301,317 ---- tvins /tvins erase tvitem /tvitem erase ! 0 to cChildren ! Handle: ThisList to hParent ! TVI_LAST to hInsertAfter GetName: ThisItem name-only? ! if zcount "to-pathend" asciiz ! then to pszText ! ThisItem to lparam ?itemimages to iImage to iSelectedImage ! [ TVIF_TEXT TVIF_CHILDREN or TVIF_PARAM or TVIF_IMAGE or TVIF_SELECTEDIMAGE or ] literal to mask tvitem->tvins ! InsertItem: self ! IsHandle: ThisItem ; : UpdateList ( addr cnt -- ) *************** *** 371,375 **** ( hParent) to hParent ( hAfter) to hInsertAfter ! ( lparam) to lparam getname: lparam to pszText --- 370,374 ---- ( hParent) to hParent ( hAfter) to hInsertAfter ! ( lparam) to lparam getname: lparam to pszText *************** *** 383,397 **** : AddParentLists ( -- ) mainlist TVI_LAST TVI_ROOT 1 AddParentItem dup to hwndmain ishandle: mainlist ! modulelist TVI_LAST hwndmain 1 AddParentItem isHandle: modulelist ! formlist TVI_LAST hwndmain 1 AddParentItem isHandle: formlist ! DLLList TVI_LAST hwndmain 1 AddParentItem isHandle: DLLList ! auxlist TVI_LAST hwndmain 1 AddParentItem isHandle: auxlist ! reslist TVI_LAST hwndmain 1 AddParentItem isHandle: reslist ! doclist TVI_LAST hwndmain 1 AddParentItem isHandle: doclist ; ! :m SetProjectName: ( addr cnt -- ) ! projectname 33 erase ! 32 min 0max projectname place ;m :m ProjectName: ( -- addr cnt ) --- 382,396 ---- : AddParentLists ( -- ) mainlist TVI_LAST TVI_ROOT 1 AddParentItem dup to hwndmain ishandle: mainlist ! modulelist TVI_LAST hwndmain 1 AddParentItem isHandle: modulelist ! formlist TVI_LAST hwndmain 1 AddParentItem isHandle: formlist ! DLLList TVI_LAST hwndmain 1 AddParentItem isHandle: DLLList ! auxlist TVI_LAST hwndmain 1 AddParentItem isHandle: auxlist ! reslist TVI_LAST hwndmain 1 AddParentItem isHandle: reslist ! doclist TVI_LAST hwndmain 1 AddParentItem isHandle: doclist ; ! :m SetProjectName: ( addr cnt -- ) ! projectname 33 erase ! 32 min 0max projectname place ;m :m ProjectName: ( -- addr cnt ) *************** *** 668,671 **** --- 667,671 ---- \ \\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\ + \ The commands for working with a project \ \\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\ *************** *** 708,713 **** : reset-results ( -- ) 0 to #addedfiles ! \ 0 to #linecount ! \ 0 to total-size ; --- 708,713 ---- : reset-results ( -- ) 0 to #addedfiles ! 0 to #linecount ! 0 to total-size ; *************** *** 727,736 **** reset-results ReleaseBuffer: viewerfile - \ IDM_SHOW_FILE_PRJ DoCommand ; : ?SaveMessage ( -- n ) ! \ IDYES, IDNO or IDCANCEL s" Do you want to save " pad place GetProjectFileName: TheProject ?dup --- 727,735 ---- reset-results ReleaseBuffer: viewerfile \ IDM_SHOW_FILE_PRJ DoCommand ; : ?SaveMessage ( -- n ) ! \ returns IDYES, IDNO or IDCANCEL s" Do you want to save " pad place GetProjectFileName: TheProject ?dup *************** *** 744,748 **** : SaveIfModified ( -- f ) ! \ true if not cancelled or not modified true Modified --- 743,747 ---- : SaveIfModified ( -- f ) ! \ returns true if not cancelled or not modified true Modified *************** *** 764,767 **** --- 763,767 ---- : new-project ( -- ) + \ Create a new project SaveIfModified 0= ?exit *************** *** 774,777 **** --- 774,778 ---- : open-project ( -- ) + \ Open a project SaveIfModified 0= ?exit OpenProjectFile count ?dup *************** *** 781,788 **** --- 782,791 ---- : save-project ( -- ) + \ Save the project SaveProject: TheProject SetProjectTitle ; IDM_SAVE_PRJ SetCommand : save-as ( -- ) + \ Save the project to a new file GetProjectFileName: TheProject \ save filename on stack s" " SetProjectFileName: TheProject *************** *** 794,799 **** --- 797,1049 ---- : rename-project ( -- ) + \ Rename the project GetProjectName 0= ?exit (rename-project) true to Modified ; IDM_RENAME_PRJ SetCommand + + : New-module { \ tempfile -- } + \ Vreate and edit a new .f file + SaveModuleFile count dup 0= + if 2drop exit + then + \ clear-status-bar + 2dup pad place ".ext-only" nip 0= + if s" .f" pad +place + then initbuffer + s" \ " append + pad count "to-pathend" append&crlf + New> File to Tempfile + pad count SetName: TempFile + Create: Tempfile 0= + if TheBuffer Write: TempFile + Close: TempFile + 0= \ test flag from write operation + if pad count AddModule: TheProject + Handle: ThisItem SelectItem: TheProject + \ IDM_EXECUTEFILE DoCommand \ open default editor + true to Modified + then + then TempFile dispose ; IDM_NEW_MODULE_PRJ SetCommand + + : add-tree-file { \ sitem -- } + \ add one or more files + SelectedItem 0= ?exit + SelectedItem dup itemid: [ ] 0= \ if child selected + if parentitem: [ ] \ use its parent + then to sitem SelectAFile c@ + if #SelectedFiles: GetFilesDialog 0 + do i GetFile: GetFilesDialog sitem AddItem: TheProject + loop + Handle: ThisItem SelectItem: TheProject + true to Modified + else drop + then + ; IDM_ADD_PRJ SetCommand + + : delete-item ( -- ) + \ Delete a file from the project + Delete: TheProject ; IDM_DELETE_PRJ SetCommand + + : AddForms ( -- ) + \ Get open forms from ForthForm + ForthForm? if 0 WANT_FORMS win32forth-message then + ; IDM_ADD_FORMS_PRJ SetCommand + + create datfile ," projectpath.dat" + + : save-path-to-file ( -- ) + prognam>pad datfile count pad +place + pad count w/o create-file + if drop exit + then >r path-ptr count r@ write-line drop + r> close-file drop ; + + : set-build-path ( -- ) + path-ptr MainWindow Start: GetPathDialog + dup if true to Modified then + 2 = if save-path-to-file then + ; IDM_SET_BUILD_PATH_PRJ SetCommand + + : AddFile ( a n -- ) \ add this file to needed list + 2dup ".ext-only" FileExt place + FileExt dup count lower + Case + s" .f" "of addmodule: TheProject endof + s" .frm" "of addform: TheProject endof + s" .dll" "of adddll: TheProject endof + s" .bmp" "of addresource: TheProject endof + s" .ico" "of addresource: TheProject endof + s" .cur" "of addresource: TheProject endof + s" .res" "of addresource: TheProject endof + s" .h" "of addresource: TheProject endof + s" .txt" "of adddoc: TheProject endof + s" .htm" "of adddoc: TheProject endof + s" .html" "of adddoc: TheProject endof + ( default ) -rot addaux: TheProject + EndCase + ; + + false value skip-recurse? + false value dialog? + false value comment? + \ // -- -1 \S + ( 1 ) + (( 2 )) + /* 4 */ + (* 8 *) + comment: 16 comment; + DOC keep this for adding files like docs ENDDOC + + : +Comment ( n -- ) comment? IF drop ELSE comment? or to comment? THEN ; + : -Comment ( n -- ) invert comment? and to comment? ; + : \Comment ( -- ) comment? 0= IF source nip >in ! THEN ; \ ignore till end of line + + Create squote ,$ 's"' + Create zquote ,$ 'z"' + Create fpathplus ,$ '"fpath+' + + : "fpath+? ( -- ) \ if next word but one is "fpath+ then append to search path + >in @ + bl word count '"' -TrailChars pad place + bl word count fpathplus count caps-compare 0= + IF pad count "fpath+ drop + ELSE >in ! + THEN ; + + : needed-file? ( -- f ) \ if 2nd word is needed-file or loadbitmapfile + >in @ \ or 4th/5th word is AddAppIcon then add file to project + bl word drop \ skip 1st word + bl word dup count lower \ 2nd word + Case + s" loadbitmapfile" "of true endof + s" needed-file" "of true endof + s" addcursor" "of true endof + s" addicon" "of true endof + ( default ) false swap + Endcase + bl word drop bl word count s" AddAppIcon" caps-compare 0= or \ 4th word + bl word count s" AddAppIcon" caps-compare 0= or \ 5th word + swap >in ! + ; + + : LoadLibrary? ( -- f ) \ if next word but two is LoadLibrary then add file to project + >in @ + bl word drop bl word drop + bl word count s" LoadLibrary" caps-compare 0= + swap >in ! + ; + + : include-word? ( -- f ) \ search input stream for include strings, true if found + false to dialog? + false to skip-recurse? + bl word dup count lower dup c@ + IF + Case + s" \" "of \comment false endof + s" //" "of \comment false endof + s" --" "of \comment false endof + s" \s" "of -1 +Comment false endof + s" (" "of 1 +Comment false endof + s" )" "of 1 -Comment false endof + s" ((" "of 2 +Comment false endof + s" ))" "of 2 -Comment false endof + s" /*" "of 4 +Comment false endof + s" */" "of 4 -Comment false endof + s" (*" "of 8 +Comment false endof + s" *)" "of 8 -Comment false endof + s" comment:" "of 16 +Comment false endof + s" comment;" "of 16 -Comment false endof + squote count "of "fpath+? needed-file? true to skip-recurse? endof + zquote count "of LoadLibrary? true to skip-recurse? endof + s" needs" "of true endof + s" fload" "of true endof + s" include" "of true endof + s" sys-fload" "of true endof + s" winlibrary" "of true to skip-recurse? true endof \ don't search .dll file + s" sys-winlibrary" "of true to skip-recurse? true endof \ don't search .dll file + s" load-dialog" "of true to skip-recurse? true to dialog? true endof \ add .res and .h later + s" thisfile" "of true to skip-recurse? true endof \ special word for PM ??? + s" load-bitmap" "of bl word drop true to skip-recurse? true endof \ skip bitmap name + s" toolbar" "of bl word drop true to skip-recurse? true endof \ skip bitmap name + ( default ) false swap + EndCase + comment? 0= and + ELSE drop false + THEN ; + + : is-file? ( -- name len true | false ) \ scan input stream for next word, return true if it is a valid filename + bl word count ?dup + IF + '"' skip '"' -TrailChars \ remove opening and closing quotes in event it is from load-bitmap + dialog? IF pad place s" .h" pad +place pad count THEN \ add .h to file if from load-dialog + "path-file + IF 2drop false \ missing-file + ELSE true + THEN + ELSE drop false + THEN ; + + \ Given file name search for needed files + : BuildNeededFiles { fname fcnt \ tmp$ -- } \ recursive routine + false to comment? + maxstring localalloc: tmp$ + fname fcnt "open + if drop exit + then source-ID >r to source-ID + source-ID file-size 2drop +to total-size + >in @ >r + source 2>r \ save current source + tmp$ (source) cell+ ! + refill + if 1 +to #linecount + then + begin more? dup 0= + if drop refill dup + if 1 +to #linecount \ bump line count + then + then + while include-word? + if is-file? + if + 2dup addfile + \ 2dup asciiz 0 SetText: ProjectStatusBar + dialog? IF + 2dup pad place -2 pad c+! s" .res" pad +place + pad count addfile + \ 2dup asciiz 0 SetText: ProjectStatusBar + THEN + skip-recurse? + if 2drop + else comment? -rot recurse to comment? \ save comment? on stack + then + then + then ( false to skip-recurse? ) + repeat source-id close-file drop + 2r> (source) 2! + r> >in ! + r> to source-id ; + + : build-project ( -- ) + reset-results + GetBuildFile: TheProject nip 0= + if SelectAFile c@ + if 0 GetFile: GetFilesDialog + SetBuildFile: TheProject + else drop exit + then GetBuildFile: TheProject ModuleList: TheProject + AddItem: TheProject + true to Modified + then \ Close: TheProject Leftpane Start: TheProject \ uncomment to start fresh + \ clear-status-bar + GetBuildFile: TheProject BuildNeededFiles + \ #addedfiles Modified or to Modified + \ #addedfiles (.) pad place + \ s" files added " pad +place + \ #linecount (.) pad +place + \ s" total lines search of " pad +place + \ total-size (.) pad +place + \ s" bytes" pad +place + \ pad +NULL + \ pad 1+ 0 SetText: ProjectStatusBar + ; IDM_BUILD_PRJ SetCommand Index: EdMenu.f =================================================================== RCS file: /cvsroot/win32forth/win32forth/apps/Win32ForthIDE/EdMenu.f,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** EdMenu.f 9 Jun 2006 17:03:35 -0000 1.6 --- EdMenu.f 10 Jun 2006 17:26:44 -0000 1.7 *************** *** 16,19 **** --- 16,20 ---- needs AnsLink.f needs src/tools/SdkHelp.f + needs ExUtils.f MenuBar MainMenu *************** *** 82,97 **** MenuSeparator MenuItem "&Rename...\tCtrl+R" IDM_RENAME_PRJ DoCommand ; ! \ MenuSeparator ! \ MenuItem "&Build \tCtrl+B" IDM_BUILD_PRJ DoCommand ; ! \ MenuItem "Set search &path for build..." IDM_SET_BUILD_PATH_PRJ DoCommand ; \ MenuSeparator \ MenuItem "&Compile \tF12" IDM_COMPILE_PRJ DoCommand ; \ MenuItem "&Set Forth Name..." IDM_SET_FORTH_PRJ DoCommand ; ! \ MenuSeparator ! \ MenuItem "&New Module... \tCtrl+M" IDM_NEW_MODULE_PRJ DoCommand ; ! \ MenuSeparator ! \ MenuItem "&Add files to project... \tCtrl+A" IDM_ADD_PRJ DoCommand ; ! \ MenuItem "&Delete from project \tCtrl+D" IDM_DELETE_PRJ DoCommand ; ! \ MenuItem "Add open &forms \tCtrl+F" IDM_ADD_FORMS_PRJ DoCommand ; \ MenuSeparator \ SubMenu "Copy/&Zip files" --- 83,98 ---- MenuSeparator MenuItem "&Rename...\tCtrl+R" IDM_RENAME_PRJ DoCommand ; ! MenuSeparator ! MenuItem "&Build \tCtrl+B" IDM_BUILD_PRJ DoCommand ; ! MenuItem "Set search &path for build..." IDM_SET_BUILD_PATH_PRJ DoCommand ; \ MenuSeparator \ MenuItem "&Compile \tF12" IDM_COMPILE_PRJ DoCommand ; \ MenuItem "&Set Forth Name..." IDM_SET_FORTH_PRJ DoCommand ; ! MenuSeparator ! MenuItem "&New Module... \tCtrl+M" IDM_NEW_MODULE_PRJ DoCommand ; ! MenuSeparator ! MenuItem "&Add files to project... \tCtrl+A" IDM_ADD_PRJ DoCommand ; ! MenuItem "&Delete from project \tCtrl+D" IDM_DELETE_PRJ DoCommand ; ! :MenuItem me_addforms "Add open &forms \tCtrl+F" IDM_ADD_FORMS_PRJ DoCommand ; \ MenuSeparator \ SubMenu "Copy/&Zip files" *************** *** 207,210 **** --- 208,217 ---- then ; + : ForthForm? ( -- f ) + \ returns true if ForthForm is running + msg-buffer 0= if false exit then \ shared memory not initialized + msg-buffer @ FFORMID <> if false exit then \ ForthForm not running + true ; + : EnableEdit ( f -- ) \ File menu *************** *** 345,348 **** --- 352,356 ---- ShowStatusbar? Check: mp_showsb ShowToolbar? Enable: mp_customizetb + ForthForm? Enable: me_addforms ActiveChild 0<> dup Enable: mf_saveall |
|
From: George H. <geo...@us...> - 2006-06-10 13:17:28
|
Update of /cvsroot/win32forth/win32forth/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv15202/win32forth/src Modified Files: CLASSDBG.F Log Message: gah: Tidied up search order so added vocabularies are removed. Index: CLASSDBG.F =================================================================== RCS file: /cvsroot/win32forth/win32forth/src/CLASSDBG.F,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** CLASSDBG.F 4 Feb 2006 16:12:24 -0000 1.8 --- CLASSDBG.F 10 Jun 2006 13:17:24 -0000 1.9 *************** *** 37,42 **** --- 37,46 ---- 2dup upper method-hash #matches ; + previous + external + also classes + \ *S Glossary *************** *** 108,112 **** MODULE ! classes also hidden also bug also \ GetMethod and [GetMethod] have been moved to Class.f --- 112,116 ---- MODULE ! also classes also hidden also bug \ GetMethod and [GetMethod] have been moved to Class.f *************** *** 136,139 **** --- 140,144 ---- >in @ mdebug >in ! ; + previous previous previous \ *Z |
|
From: Jos v.d.V. <jo...@us...> - 2006-06-10 11:41:13
|
Update of /cvsroot/win32forth/win32forth/src/lib In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv32332/src/lib Modified Files: Joystick.f Log Message: Jos: Optimized and extended the code. Index: Joystick.f =================================================================== RCS file: /cvsroot/win32forth/win32forth/src/lib/Joystick.f,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** Joystick.f 30 May 2006 09:40:48 -0000 1.2 --- Joystick.f 10 Jun 2006 11:41:09 -0000 1.3 *************** *** 35,38 **** --- 35,40 ---- + (( \ Not needed joyinfo is on the stack + :struct joyinfo UINT wXpos /* x position */ *************** *** 42,46 **** ;struct ! sizeof joyinfo mkstruct: *lpjoyinfo --- 44,48 ---- ;struct ! sizeof joyinfo mkstruct: *lpjoyinfo \ )) *************** *** 76,87 **** Result JOYERR_NOERROR if successful or one of the following error values. ! Value Description ! MMSYSERR_NODRIVER The joystick driver is not present. ! MMSYSERR_INVALPARAM An invalid parameter was passed. Windows 95/98/Me: The specified joystick identifier is invalid. ! ! MMSYSERR_BADDEVICEID Windows 95/98/Me: The specified joystick identifier is invalid. ! JOYERR_UNPLUGGED The specified joystick is not connected to the system. ! JOYERR_PARMS Windows NT/2000/XP: The specified joystick identifier is invalid. --- 78,89 ---- Result JOYERR_NOERROR if successful or one of the following error values. ! Value Description ! MMSYSERR_NODRIVER The joystick driver is not present. ! MMSYSERR_INVALPARAM An invalid parameter was passed. Windows 95/98/Me: The specified joystick identifier is invalid. ! ! MMSYSERR_BADDEVICEID Windows 95/98/Me: The specified joystick identifier is invalid. ! JOYERR_UNPLUGGED The specified joystick is not connected to the system. ! JOYERR_PARMS Windows NT/2000/XP: The specified joystick identifier is invalid. *************** *** 94,109 **** )) ! : GetJoystickInfo ( id -- x y z buttons ) ! *lpjoyinfo [ sizeof joyinfo ] literal erase ! *lpjoyinfo swap Call joyGetPos drop ! struct, *lpjoyinfo joyinfo wXpos @ ! struct, *lpjoyinfo joyinfo wYpos @ ! struct, *lpjoyinfo joyinfo wZpos @ ! struct, *lpjoyinfo joyinfo wButtons @ ! ; ! 15 constant MaxJoysticks ! : FindFirstJoyStick ( - *lpjoycapsa ID ) \ ID should be <= MaxJoysticks *lpjoycapsa [ sizeof JOYCAPSA ] literal 2dup erase swap MaxJoysticks 0 do 2dup i Call joyGetDevCaps 0= --- 96,106 ---- )) ! : GetJoystickInfo ( id -- x y z buttons ) ! >r 0 0 0 0 sp@ r> Call joyGetPos drop 4reverse ! ; ! : MaxJoysticks ( - #MaxJoysticks ) call joyGetNumDevs ; ! : FindFirstJoyStick ( - *lpjoycapsa ID ) \ ID should be <= MaxJoysticks *lpjoycapsa [ sizeof JOYCAPSA ] literal 2dup erase swap MaxJoysticks 0 do 2dup i Call joyGetDevCaps 0= *************** *** 111,123 **** then loop ! ; \s Tests and demo: ! : JoystickTest ( - ) \ Move the joystick and press some buttons FindFirstJoyStick nip dup MaxJoysticks < ! if begin cr dup GetJoystickInfo dup>r . . . . 20 ms ! r> 1 = until \ the fire button has been pressed drop ." The fire button has been pressed." --- 108,123 ---- then loop ! ; + : JoystickSetup ( - ) + z" control joy.cpl" zEXEC-CMD abort" Can't use the setup in the control panel" + ; \s Tests and demo: ! : JoystickTest ( - ) \ Move the joystick and press some buttons FindFirstJoyStick nip dup MaxJoysticks < ! if begin cr dup GetJoystickInfo dup>r .s 4drop 20 ms ! r> JOY_BUTTON1 = until \ the fire button has been pressed drop ." The fire button has been pressed." |
|
From: Dirk B. <db...@us...> - 2006-06-09 17:03:44
|
Update of /cvsroot/win32forth/win32forth/doc In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv2660/doc Added Files: FreeImagePublicLicense.txt Log Message: - FreeImage.dll added --- NEW FILE: FreeImagePublicLicense.txt --- FreeImage Public License - Version 1.0 --------------------------------------------- 1. Definitions. 1.1. "Contributor" means each entity that creates or contributes to the creation of Modifications. 1.2. "Contributor Version" means the combination of the Original Code, prior Modifications used by a Contributor, and the Modifications made by that particular Contributor. 1.3. "Covered Code" means the Original Code or Modifications or the combination of the Original Code and Modifications, in each case including portions thereof. 1.4. "Electronic Distribution Mechanism" means a mechanism generally accepted in the software development community for the electronic transfer of data. 1.5. "Executable" means Covered Code in any form other than Source Code. 1.6. "Initial Developer" means the individual or entity identified as the Initial Developer in the Source Code notice required by Exhibit A. 1.7. "Larger Work" means a work which combines Covered Code or portions thereof with code not governed by the terms of this License. 1.8. "License" means this document. 1.9. "Modifications" means any addition to or deletion from the substance or structure of either the Original Code or any previous Modifications. When Covered Code is released as a series of files, a Modification is: A. Any addition to or deletion from the contents of a file containing Original Code or previous Modifications. B. Any new file that contains any part of the Original Code or previous Modifications. 1.10. "Original Code" means Source Code of computer software code which is described in the Source Code notice required by Exhibit A as Original Code, and which, at the time of its release under this License is not already Covered Code governed by this License. 1.11. "Source Code" means the preferred form of the Covered Code for making modifications to it, including all modules it contains, plus any associated interface definition files, scripts used to control compilation and installation of an Executable, or a list of source code differential comparisons against either the Original Code or another well known, available Covered Code of the Contributor's choice. The Source Code can be in a compressed or archival form, provided the appropriate decompression or de-archiving software is widely available for no charge. 1.12. "You" means an individual or a legal entity exercising rights under, and complying with all of the terms of, this License or a future version of this License issued under Section 6.1. For legal entities, "You" includes any entity which controls, is controlled by, or is under common control with You. For purposes of this definition, "control" means (a) the power, direct or indirect, to cause the direction or management of such entity, whether by contract or otherwise, or (b) ownership of fifty percent (50%) or more of the outstanding shares or beneficial ownership of such entity. 2. Source Code License. 2.1. The Initial Developer Grant. The Initial Developer hereby grants You a world-wide, royalty-free, non-exclusive license, subject to third party intellectual property claims: (a) to use, reproduce, modify, display, perform, sublicense and distribute the Original Code (or portions thereof) with or without Modifications, or as part of a Larger Work; and (b) under patents now or hereafter owned or controlled by Initial Developer, to make, have made, use and sell ("Utilize") the Original Code (or portions thereof), but solely to the extent that any such patent is reasonably necessary to enable You to Utilize the Original Code (or portions thereof) and not to any greater extent that may be necessary to Utilize further Modifications or combinations. 2.2. Contributor Grant. Each Contributor hereby grants You a world-wide, royalty-free, non-exclusive license, subject to third party intellectual property claims: (a) to use, reproduce, modify, display, perform, sublicense and distribute the Modifications created by such Contributor (or portions thereof) either on an unmodified basis, with other Modifications, as Covered Code or as part of a Larger Work; and (b) under patents now or hereafter owned or controlled by Contributor, to Utilize the Contributor Version (or portions thereof), but solely to the extent that any such patent is reasonably necessary to enable You to Utilize the Contributor Version (or portions thereof), and not to any greater extent that may be necessary to Utilize further Modifications or combinations. 3. Distribution Obligations. 3.1. Application of License. The Modifications which You create or to which You contribute are governed by the terms of this License, including without limitation Section 2.2. The Source Code version of Covered Code may be distributed only under the terms of this License or a future version of this License released under Section 6.1, and You must include a copy of this License with every copy of the Source Code You distribute. You may not offer or impose any terms on any Source Code version that alters or restricts the applicable version of this License or the recipients' rights hereunder. However, You may include an additional document offering the additional rights described in Section 3.5. 3.2. Availability of Source Code. Any Modification which You create or to which You contribute must be made available in Source Code form under the terms of this License either on the same media as an Executable version or via an accepted Electronic Distribution Mechanism to anyone to whom you made an Executable version available; and if made available via Electronic Distribution Mechanism, must remain available for at least twelve (12) months after the date it initially became available, or at least six (6) months after a subsequent version of that particular Modification has been made available to such recipients. You are responsible for ensuring that the Source Code version remains available even if the Electronic Distribution Mechanism is maintained by a third party. 3.3. Description of Modifications. You must cause all Covered Code to which you contribute to contain a file documenting the changes You made to create that Covered Code and the date of any change. You must include a prominent statement that the Modification is derived, directly or indirectly, from Original Code provided by the Initial Developer and including the name of the Initial Developer in (a) the Source Code, and (b) in any notice in an Executable version or related documentation in which You describe the origin or ownership of the Covered Code. 3.4. Intellectual Property Matters (a) Third Party Claims. If You have knowledge that a party claims an intellectual property right in particular functionality or code (or its utilization under this License), you must include a text file with the source code distribution titled "LEGAL" which describes the claim and the party making the claim in sufficient detail that a recipient will know whom to contact. If you obtain such knowledge after You make Your Modification available as described in Section 3.2, You shall promptly modify the LEGAL file in all copies You make available thereafter and shall take other steps (such as notifying appropriate mailing lists or newsgroups) reasonably calculated to inform those who received the Covered Code that new knowledge has been obtained. (b) Contributor APIs. If Your Modification is an application programming interface and You own or control patents which are reasonably necessary to implement that API, you must also include this information in the LEGAL file. 3.5. Required Notices. You must duplicate the notice in Exhibit A in each file of the Source Code, and this License in any documentation for the Source Code, where You describe recipients' rights relating to Covered Code. If You created one or more Modification(s), You may add your name as a Contributor to the notice described in Exhibit A. If it is not possible to put such notice in a particular Source Code file due to its structure, then you must include such notice in a location (such as a relevant directory file) where a user would be likely to look for such a notice. You may choose to offer, and to charge a fee for, warranty, support, indemnity or liability obligations to one or more recipients of Covered Code. However, You may do so only on Your own behalf, and not on behalf of the Initial Developer or any Contributor. You must make it absolutely clear than any such warranty, support, indemnity or liability obligation is offered by You alone, and You hereby agree to indemnify the Initial Developer and every Contributor for any liability incurred by the Initial Developer or such Contributor as a result of warranty, support, indemnity or liability terms You offer. 3.6. Distribution of Executable Versions. You may distribute Covered Code in Executable form only if the requirements of Section 3.1-3.5 have been met for that Covered Code, and if You include a notice stating that the Source Code version of the Covered Code is available under the terms of this License, including a description of how and where You have fulfilled the obligations of Section 3.2. The notice must be conspicuously included in any notice in an Executable version, related documentation or collateral in which You describe recipients' rights relating to the Covered Code. You may distribute the Executable version of Covered Code under a license of Your choice, which may contain terms different from this License, provided that You are in compliance with the terms of this License and that the license for the Executable version does not attempt to limit or alter the recipient's rights in the Source Code version from the rights set forth in this License. If You distribute the Executable version under a different license You must make it absolutely clear that any terms which differ from this License are offered by You alone, not by the Initial Developer or any Contributor. You hereby agree to indemnify the Initial Developer and every Contributor for any liability incurred by the Initial Developer or such Contributor as a result of any such terms You offer. 3.7. Larger Works. You may create a Larger Work by combining Covered Code with other code not governed by the terms of this License and distribute the Larger Work as a single product. In such a case, You must make sure the requirements of this License are fulfilled for the Covered Code. 4. Inability to Comply Due to Statute or Regulation. If it is impossible for You to comply with any of the terms of this License with respect to some or all of the Covered Code due to statute or regulation then You must: (a) comply with the terms of this License to the maximum extent possible; and (b) describe the limitations and the code they affect. Such description must be included in the LEGAL file described in Section 3.4 and must be included with all distributions of the Source Code. Except to the extent prohibited by statute or regulation, such description must be sufficiently detailed for a recipient of ordinary skill to be able to understand it. 5. Application of this License. This License applies to code to which the Initial Developer has attached the notice in Exhibit A, and to related Covered Code. 6. Versions of the License. 6.1. New Versions. Floris van den Berg may publish revised and/or new versions of the License from time to time. Each version will be given a distinguishing version number. 6.2. Effect of New Versions. Once Covered Code has been published under a particular version of the License, You may always continue to use it under the terms of that version. You may also choose to use such Covered Code under the terms of any subsequent version of the License published by Floris van den Berg No one other than Floris van den Berg has the right to modify the terms applicable to Covered Code created under this License. 6.3. Derivative Works. If you create or use a modified version of this License (which you may only do in order to apply it to code which is not already Covered Code governed by this License), you must (a) rename Your license so that the phrases "FreeImage", `FreeImage Public License", "FIPL", or any confusingly similar phrase do not appear anywhere in your license and (b) otherwise make it clear that your version of the license contains terms which differ from the FreeImage Public License. (Filling in the name of the Initial Developer, Original Code or Contributor in the notice described in Exhibit A shall not of themselves be deemed to be modifications of this License.) 7. DISCLAIMER OF WARRANTY. COVERED CODE IS PROVIDED UNDER THIS LICENSE ON AN "AS IS" BASIS, WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, WITHOUT LIMITATION, WARRANTIES THAT THE COVERED CODE IS FREE OF DEFECTS, MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE OR NON-INFRINGING. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE COVERED CODE IS WITH YOU. SHOULD ANY COVERED CODE PROVE DEFECTIVE IN ANY RESPECT, YOU (NOT THE INITIAL DEVELOPER OR ANY OTHER CONTRIBUTOR) ASSUME THE COST OF ANY NECESSARY SERVICING, REPAIR OR CORRECTION. THIS DISCLAIMER OF WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS LICENSE. NO USE OF ANY COVERED CODE IS AUTHORIZED HEREUNDER EXCEPT UNDER THIS DISCLAIMER. 8. TERMINATION. This License and the rights granted hereunder will terminate automatically if You fail to comply with terms herein and fail to cure such breach within 30 days of becoming aware of the breach. All sublicenses to the Covered Code which are properly granted shall survive any termination of this License. Provisions which, by their nature, must remain in effect beyond the termination of this License shall survive. 9. LIMITATION OF LIABILITY. UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, WHETHER TORT (INCLUDING NEGLIGENCE), CONTRACT, OR OTHERWISE, SHALL THE INITIAL DEVELOPER, ANY OTHER CONTRIBUTOR, OR ANY DISTRIBUTOR OF COVERED CODE, OR ANY SUPPLIER OF ANY OF SUCH PARTIES, BE LIABLE TO YOU OR ANY OTHER PERSON FOR ANY INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES OF ANY CHARACTER INCLUDING, WITHOUT LIMITATION, DAMAGES FOR LOSS OF GOODWILL, WORK STOPPAGE, COMPUTER FAILURE OR MALFUNCTION, OR ANY AND ALL OTHER COMMERCIAL DAMAGES OR LOSSES, EVEN IF SUCH PARTY SHALL HAVE BEEN INFORMED OF THE POSSIBILITY OF SUCH DAMAGES. THIS LIMITATION OF LIABILITY SHALL NOT APPLY TO LIABILITY FOR DEATH OR PERSONAL INJURY RESULTING FROM SUCH PARTY'S NEGLIGENCE TO THE EXTENT APPLICABLE LAW PROHIBITS SUCH LIMITATION. SOME JURISDICTIONS DO NOT ALLOW THE EXCLUSION OR LIMITATION OF INCIDENTAL OR CONSEQUENTIAL DAMAGES, SO THAT EXCLUSION AND LIMITATION MAY NOT APPLY TO YOU. 10. U.S. GOVERNMENT END USERS. The Covered Code is a "commercial item," as that term is defined in 48 C.F.R. 2.101 (Oct. 1995), consisting of "commercial computer software" and "commercial computer software documentation," as such terms are used in 48 C.F.R. 12.212 (Sept. 1995). Consistent with 48 C.F.R. 12.212 and 48 C.F.R. 227.7202-1 through 227.7202-4 (June 1995), all U.S. Government End Users acquire Covered Code with only those rights set forth herein. 11. MISCELLANEOUS. This License represents the complete agreement concerning subject matter hereof. If any provision of this License is held to be unenforceable, such provision shall be reformed only to the extent necessary to make it enforceable. This License shall be governed by Dutch law provisions (except to the extent applicable law, if any, provides otherwise), excluding its conflict-of-law provisions. With respect to disputes in which at least one party is a citizen of, or an entity chartered or registered to do business in, the The Netherlands: (a) unless otherwise agreed in writing, all disputes relating to this License (excepting any dispute relating to intellectual property rights) shall be subject to final and binding arbitration, with the losing party paying all costs of arbitration; (b) any arbitration relating to this Agreement shall be held in Almelo, The Netherlands; and (c) any litigation relating to this Agreement shall be subject to the jurisdiction of the court of Almelo, The Netherlands with the losing party responsible for costs, including without limitation, court costs and reasonable attorneys fees and expenses. Any law or regulation which provides that the language of a contract shall be construed against the drafter shall not apply to this License. 12. RESPONSIBILITY FOR CLAIMS. Except in cases where another Contributor has failed to comply with Section 3.4, You are responsible for damages arising, directly or indirectly, out of Your utilization of rights under this License, based on the number of copies of Covered Code you made available, the revenues you received from utilizing such rights, and other relevant factors. You agree to work with affected parties to distribute responsibility on an equitable basis. EXHIBIT A. "The contents of this file are subject to the FreeImage Public License Version 1.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at http://home.wxs.nl/~flvdberg/freeimage-license.txt Software distributed under the License is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License for the specific language governing rights and limitations under the License. |
|
From: Dirk B. <db...@us...> - 2006-06-09 17:03:44
|
Update of /cvsroot/win32forth/win32forth In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv2660 Added Files: FreeImage.dll Log Message: - FreeImage.dll added --- NEW FILE: FreeImage.dll --- (This appears to be a binary file; contents omitted.) |
|
From: Dirk B. <db...@us...> - 2006-06-09 17:03:44
|
Update of /cvsroot/win32forth/win32forth/apps/Win32ForthIDE In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv2660/apps/Win32ForthIDE Modified Files: EdAbout.f EdImageWindow.f EdMenu.f EdStatusbar.f Main.f Log Message: - FreeImage.dll added Index: Main.f =================================================================== RCS file: /cvsroot/win32forth/win32forth/apps/Win32ForthIDE/Main.f,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** Main.f 9 Jun 2006 11:44:56 -0000 1.8 --- Main.f 9 Jun 2006 17:03:35 -0000 1.9 *************** *** 12,16 **** \ See www.scintilla.org for more information about the control. ! cr .( Loading Win32ForthIDE...) ANEW -Main.f --- 12,16 ---- \ See www.scintilla.org for more information about the control. ! cr .( Loading Win32Forth IDE...) ANEW -Main.f *************** *** 62,65 **** --- 62,66 ---- 1 constant FT_HTML 2 constant FT_BINARY + 3 constant FT_BITMAP needs EdToolbar.f *************** *** 273,277 **** :M WindowTitle: ( -- z" ) ! z" Win32ForthIDE" ;M :M MinSize: ( -- width height ) --- 274,278 ---- :M WindowTitle: ( -- z" ) ! z" Win32Forth IDE" ;M :M MinSize: ( -- width height ) *************** *** 553,557 **** GetFileName: ChildParent count "to-pathend" pad +place s" ?" pad +place pad +NULL ! pad 1+ z" Win32ForthIDE" [ MB_ICONEXCLAMATION MB_YESNOCANCEL or ] literal hWnd MessageBox ; --- 554,558 ---- GetFileName: ChildParent count "to-pathend" pad +place s" ?" pad +place pad +NULL ! pad 1+ z" Win32Forth IDE" [ MB_ICONEXCLAMATION MB_YESNOCANCEL or ] literal hWnd MessageBox ; *************** *** 755,761 **** \ This is called from the File listview when a file is selected. \ addr is the object address of the mdi child window ! GetHandle: [ ] Activate: Frame Update ! \ SetFocus: Frame ! ; is OnSelect \ \\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\ --- 756,760 ---- \ This is called from the File listview when a file is selected. \ addr is the object address of the mdi child window ! GetHandle: [ ] Activate: Frame Update ; is OnSelect \ \\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\ Index: EdAbout.f =================================================================== RCS file: /cvsroot/win32forth/win32forth/apps/Win32ForthIDE/EdAbout.f,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** EdAbout.f 5 Jun 2006 09:19:00 -0000 1.1 --- EdAbout.f 9 Jun 2006 17:03:35 -0000 1.2 *************** *** 22,26 **** create about-head ! z," Win32ForthIDE (Public Domain since June 2006)" create about-msg1 --- 22,26 ---- create about-head ! z," Win32Forth IDE (Public Domain since June 2006)" create about-msg1 *************** *** 30,45 **** sciedit-compile-version >date" +z", +z," , " ! sciedit-compile-version >time" +z", +z," " create about-msg2 ! z," Written in 2006 by: Dirk Busch (dbu)\n" ! +z," eMail: di...@wi...\n" ! +z," This Win32Forth IDE based on:" ! +z," 'SciEdit' written by Dirk Busch and \n" +z," 'Project Manager' written by Ezra Boyce." create about-msg3 ! z," This Editor is based on the: 'Scintilla source code edit control'." ! +z," See www.scintilla.org for more information about the control." :M On_Init: ( hWnd-focus -- f ) --- 30,51 ---- sciedit-compile-version >date" +z", +z," , " ! sciedit-compile-version >time" +z", ! +z," \n\n" ! +z," Written in 2006 by: " ! +z," Dirk Busch, Ezra Boyce, George Hubert, " ! +z," Rod Oakford and some others." create about-msg2 ! z," This Win32Forth IDE based on:\n" ! +z," 'SciEdit' written by Dirk Busch and\n" +z," 'Project Manager' written by Ezra Boyce." create about-msg3 ! z," The Win32Forth IDE is using the:\n" ! +z," - 'Scintilla source code edit control' " ! +z," See www.scintilla.org for details.\n" ! +z," - 'FreeImage open source image library' " ! +z," See http://freeimage.sourceforge.net for details. " ! +z," FreeImage is used under the FreeImage Public License." :M On_Init: ( hWnd-focus -- f ) Index: EdStatusbar.f =================================================================== RCS file: /cvsroot/win32forth/win32forth/apps/Win32ForthIDE/EdStatusbar.f,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** EdStatusbar.f 7 Jun 2006 15:39:34 -0000 1.2 --- EdStatusbar.f 9 Jun 2006 17:03:35 -0000 1.3 *************** *** 46,50 **** : SetHtmlView ( -- ) Clear: self ! z" HTML view" EdPart SetText: self ; : SetEditView ( -- ) --- 46,50 ---- : SetHtmlView ( -- ) Clear: self ! z" HTML" EdPart SetText: self ; : SetEditView ( -- ) *************** *** 65,69 **** : SetBinaryView ( -- ) Clear: self ! z" BIN view" EdPart SetText: self ; :M Update: ( -- ) --- 65,73 ---- : SetBinaryView ( -- ) Clear: self ! z" BINARY" EdPart SetText: self ; ! ! : SetBitmapView ( -- ) ! Clear: self ! z" BITMAP" EdPart SetText: self ; :M Update: ( -- ) *************** *** 77,80 **** --- 81,85 ---- FT_HTML of SetHtmlView endof FT_BINARY of SetBinaryView endof + FT_BITMAP of SetBitmapView endof endcase then Index: EdMenu.f =================================================================== RCS file: /cvsroot/win32forth/win32forth/apps/Win32ForthIDE/EdMenu.f,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** EdMenu.f 9 Jun 2006 04:31:07 -0000 1.5 --- EdMenu.f 9 Jun 2006 17:03:35 -0000 1.6 *************** *** 183,186 **** --- 183,189 ---- GetFileType FT_BINARY = ; + : IsBitmapWnd? ( -- f ) + GetFileType FT_BITMAP = ; + : NoTextToPad ( -- addr len ) \ copy empty string to PAD 0 pad ! pad count ; Index: EdImageWindow.f =================================================================== RCS file: /cvsroot/win32forth/win32forth/apps/Win32ForthIDE/EdImageWindow.f,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** EdImageWindow.f 9 Jun 2006 04:31:07 -0000 1.1 --- EdImageWindow.f 9 Jun 2006 17:03:35 -0000 1.2 *************** *** 47,51 **** :M GetFileType: ( -- n ) ! FT_BINARY ;M :M Update: ( -- ) --- 47,51 ---- :M GetFileType: ( -- n ) ! FT_BITMAP ;M :M Update: ( -- ) *************** *** 55,60 **** : NewImageViewWnd ( -- ) ! New> ImageViewChild to ActiveChild ! MDIClientWindow: Frame Start: ActiveChild ; ! ! \s --- 55,58 ---- : NewImageViewWnd ( -- ) ! New> ImageViewChild to ActiveChild ! MDIClientWindow: Frame Start: ActiveChild ; |
|
From: George H. <geo...@us...> - 2006-06-09 12:11:39
|
Update of /cvsroot/win32forth/win32forth/apps/Win32ForthIDE In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv13704/win32forth/apps/Win32ForthIDE Modified Files: ClassBrowser.f Log Message: gah: Modified to show :OBJECT OBJ_NAME instead of [UNKNOWN] for objets. Index: ClassBrowser.f =================================================================== RCS file: /cvsroot/win32forth/win32forth/apps/Win32ForthIDE/ClassBrowser.f,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** ClassBrowser.f 9 Jun 2006 11:44:56 -0000 1.2 --- ClassBrowser.f 9 Jun 2006 12:10:32 -0000 1.3 *************** *** 66,76 **** create NameBuf$ MAXSTRING 1+ allot : AddName ( xt hPrev hRoot fChildren -- ) \ show name, if can't find name, [UNKNOWN] >r rot DUP >NAME DUP NAME> ['] [UNKNOWN] = \ if not found ! IF DROP z" [UNKNOWN]" ELSE COUNT NameBuf$ ascii-z \ make a z-String THEN 2swap 1 r> AddItem ; - \ ------------------------------------------------------------------------------ \ ------------------------------------------------------------------------------ --- 66,101 ---- create NameBuf$ MAXSTRING 1+ allot + \ The following definitions enable us to find the name of an object defined with :OBJECT + \ from the xt of it's nameless class; gah + + 0 value SearchClass + + : (objname) ( nfa -- ) + dup name> dup @ doobj = + if >body @ SearchClass = + if s" :OBJECT " NameBuf$ place + nfa-count NameBuf$ +place NameBuf$ +null + 0 to SearchClass + else drop + then + else 2drop + then ; + + + : objname ( xt -- ) + >body to SearchClass NameBuf$ off + \in-system-ok ['] (objname) on-allwords ; + : AddName ( xt hPrev hRoot fChildren -- ) \ show name, if can't find name, [UNKNOWN] >r rot DUP >NAME DUP NAME> ['] [UNKNOWN] = \ if not found ! IF DROP dup ?IsClass ! IF dup objname Namebuf$ count 0= ! IF drop z" [UNKNOWN]" ! THEN ! ELSE z" [UNKNOWN]" ! THEN ELSE COUNT NameBuf$ ascii-z \ make a z-String THEN 2swap 1 r> AddItem ; \ ------------------------------------------------------------------------------ \ ------------------------------------------------------------------------------ |
|
From: George H. <geo...@us...> - 2006-06-09 12:10:38
|
Update of /cvsroot/win32forth/win32forth/apps/SciEdit In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv13704/win32forth/apps/SciEdit Modified Files: ClassBrowser.f Log Message: gah: Modified to show :OBJECT OBJ_NAME instead of [UNKNOWN] for objets. Index: ClassBrowser.f =================================================================== RCS file: /cvsroot/win32forth/win32forth/apps/SciEdit/ClassBrowser.f,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** ClassBrowser.f 14 May 2006 09:05:17 -0000 1.4 --- ClassBrowser.f 9 Jun 2006 12:10:32 -0000 1.5 *************** *** 52,62 **** create NameBuf$ MAXSTRING 1+ allot : AddName ( xt hPrev hRoot fChildren -- ) \ show name, if can't find name, [UNKNOWN] >r rot DUP >NAME DUP NAME> ['] [UNKNOWN] = \ if not found ! IF DROP z" [UNKNOWN]" ELSE COUNT NameBuf$ ascii-z \ make a z-String THEN 2swap 1 r> AddItem ; - \ ------------------------------------------------------------------------------ \ ------------------------------------------------------------------------------ --- 52,87 ---- create NameBuf$ MAXSTRING 1+ allot + \ The following definitions enable us to find the name of an object defined with :OBJECT + \ from the xt of it's nameless class; gah + + 0 value SearchClass + + : (objname) ( nfa -- ) + dup name> dup @ doobj = + if >body @ SearchClass = + if s" :OBJECT " NameBuf$ place + nfa-count NameBuf$ +place NameBuf$ +null + 0 to SearchClass + else drop + then + else 2drop + then ; + + + : objname ( xt -- ) + >body to SearchClass NameBuf$ off + \in-system-ok ['] (objname) on-allwords ; + : AddName ( xt hPrev hRoot fChildren -- ) \ show name, if can't find name, [UNKNOWN] >r rot DUP >NAME DUP NAME> ['] [UNKNOWN] = \ if not found ! IF DROP dup ?IsClass ! IF dup objname Namebuf$ count 0= ! IF drop z" [UNKNOWN]" ! THEN ! ELSE z" [UNKNOWN]" ! THEN ELSE COUNT NameBuf$ ascii-z \ make a z-String THEN 2swap 1 r> AddItem ; \ ------------------------------------------------------------------------------ \ ------------------------------------------------------------------------------ |
|
From: George H. <geo...@us...> - 2006-06-09 11:44:59
|
Update of /cvsroot/win32forth/win32forth/apps/Win32ForthIDE In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv31274/win32forth/apps/Win32ForthIDE Modified Files: ClassBrowser.f EdTabControl.f Main.f Log Message: gah: Added Task to initialise voc and classe trees at start-up. Index: Main.f =================================================================== RCS file: /cvsroot/win32forth/win32forth/apps/Win32ForthIDE/Main.f,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** Main.f 9 Jun 2006 04:31:07 -0000 1.7 --- Main.f 9 Jun 2006 11:44:56 -0000 1.8 *************** *** 95,98 **** --- 95,105 ---- TabWindow cTabWindow + Needs Task.f + + 0 :NoName ( -- ) InitBrowsers: cTabWindow ; Task-Block Constant BrowseInitTask + + : InitClassBrowsers ( -- ) + BrowseInitTask run-task 0= abort" Failed to start background Task" ; + :Object LeftPane <Super Child-Window *************** *** 879,882 **** --- 886,890 ---- init-shared-type ['] sciedit_win32forth-message is win32forth-message + InitClassBrowsers \+ sysgen HandleCmdLine Turnkeyed? IF Begin key drop again THEN *************** *** 885,888 **** --- 893,900 ---- [defined] sysgen [IF] + : InitDir current-dir$ count SetDir: SourceFileOpenDialog ; + + Initialization-chain Chain-add InitDir + : my-hello ( -- ) init-console *************** *** 905,908 **** --- 917,921 ---- debug breaker + Main [then] Index: ClassBrowser.f =================================================================== RCS file: /cvsroot/win32forth/win32forth/apps/Win32ForthIDE/ClassBrowser.f,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** ClassBrowser.f 5 Jun 2006 09:19:00 -0000 1.1 --- ClassBrowser.f 9 Jun 2006 11:44:56 -0000 1.2 *************** *** 199,207 **** :M AddVocabularies: ( -- ) VocabulariesAdded? 0= ! if SW_HIDE Show: self ! IDC_WAIT NULL call LoadCursor call SetCursor \ set wait cursor ! AddVocabularies ! call SetCursor drop \ restore cursor ! SW_RESTORE Show: self true to VocabulariesAdded? then ;M --- 199,203 ---- :M AddVocabularies: ( -- ) VocabulariesAdded? 0= ! if AddVocabularies true to VocabulariesAdded? then ;M *************** *** 209,217 **** :M AddClasses: ( -- ) ClassesAdded? 0= ! if SW_HIDE Show: self ! IDC_WAIT NULL call LoadCursor call SetCursor \ set wait cursor ! AddClasses ! call SetCursor drop \ restore cursor ! SW_RESTORE Show: self true to ClassesAdded? then ;M --- 205,209 ---- :M AddClasses: ( -- ) ClassesAdded? 0= ! if AddClasses true to ClassesAdded? then ;M Index: EdTabControl.f =================================================================== RCS file: /cvsroot/win32forth/win32forth/apps/Win32ForthIDE/EdTabControl.f,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** EdTabControl.f 9 Jun 2006 04:31:07 -0000 1.6 --- EdTabControl.f 9 Jun 2006 11:44:56 -0000 1.7 *************** *** 219,223 **** : ShowVocs ( -- ) - AddVocabularies: cVocTree SW_SHOW Show: cVocTree SW_HIDE Show: cFileList --- 219,222 ---- *************** *** 227,231 **** : ShowClasses ( -- ) - AddClasses: cClassTree SW_SHOW Show: cClassTree SW_HIDE Show: cFileList --- 226,229 ---- *************** *** 234,237 **** --- 232,239 ---- ; + :M InitBrowsers: ( -- ) + AddVocabularies: cVocTree + AddClasses: cClassTree ;M + :M SelChange: ( -- ) \ Show the control for the currently selected tab. |
|
From: George H. <geo...@us...> - 2006-06-09 10:42:44
|
Update of /cvsroot/win32forth/win32forth/src/tools In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv31243/win32forth/src/tools Modified Files: ClassBrowser.f Log Message: gah: Modified to show :OBJECT OBJ_NAME instead of [UNKNOWN] for objets (SciEd and IDE not done yet). Index: ClassBrowser.f =================================================================== RCS file: /cvsroot/win32forth/win32forth/src/tools/ClassBrowser.f,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** ClassBrowser.f 14 May 2006 10:46:19 -0000 1.3 --- ClassBrowser.f 9 Jun 2006 10:42:37 -0000 1.4 *************** *** 3,7 **** \ Created: Samstag, Mai 22 2004 - dbu \ Updated: Samstag, Mai 29 2004 - 10:58 - dbu ! \ \ Win32Forth class and vocabulary browser --- 3,8 ---- \ Created: Samstag, Mai 22 2004 - dbu \ Updated: Samstag, Mai 29 2004 - 10:58 - dbu ! \ Updated: Friday, June 09 2006 - gah ! \ Win32Forth class and vocabulary browser *************** *** 48,54 **** create NameBuf$ MAXSTRING 1+ allot : AddName ( xt hPrev hRoot fChildren -- ) \ show name, if can't find name, [UNKNOWN] >r rot DUP >NAME DUP NAME> ['] [UNKNOWN] = \ if not found ! IF DROP z" [UNKNOWN]" ELSE COUNT NameBuf$ ascii-z \ make a z-String THEN 2swap 1 r> AddItem ; --- 49,81 ---- create NameBuf$ MAXSTRING 1+ allot + \ The following definitions enable us to find the name of an object defined with :OBJECT + \ from the xt of it's nameless class; gah + + 0 value SearchClass + + : (objname) ( nfa -- ) + dup name> dup @ doobj = + if >body @ SearchClass = + if s" :OBJECT " NameBuf$ place + nfa-count NameBuf$ +place NameBuf$ +null + 0 to SearchClass + else drop + then + else 2drop + then ; + + + : objname ( xt -- ) + >body to SearchClass NameBuf$ off + \in-system-ok ['] (objname) on-allwords ; + : AddName ( xt hPrev hRoot fChildren -- ) \ show name, if can't find name, [UNKNOWN] >r rot DUP >NAME DUP NAME> ['] [UNKNOWN] = \ if not found ! IF DROP dup ?IsClass ! IF dup objname Namebuf$ count 0= ! IF drop z" [UNKNOWN]" ! THEN ! ELSE z" [UNKNOWN]" ! THEN ELSE COUNT NameBuf$ ascii-z \ make a z-String THEN 2swap 1 r> AddItem ; *************** *** 314,317 **** --- 341,345 ---- cr .( 'Class and vocabulary browser' loaded ) + class-browser |
|
From: Ezra B. <ezr...@us...> - 2006-06-09 04:34:04
|
Update of /cvsroot/win32forth/win32forth/apps/ForthForm In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv4388/apps/ForthForm Modified Files: IMAGEWINDOW.F Log Message: Bug fix in popup menu. Readded ability to load supported image types from memory. Index: IMAGEWINDOW.F =================================================================== RCS file: /cvsroot/win32forth/win32forth/apps/ForthForm/IMAGEWINDOW.F,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** IMAGEWINDOW.F 5 May 2005 09:43:26 -0000 1.2 --- IMAGEWINDOW.F 9 Jun 2006 04:34:00 -0000 1.3 *************** *** 100,103 **** --- 100,117 ---- FIF_LBM Constant FIF_IFF + /* * Image type used in FreeImage. */ + 0 to enum-value + enum: + FIT_UNKNOWN // unknown type + FIT_BITMAP // standard image : 1-, 4-, 8-, 16-, 24-, 32-bit + FIT_UINT16 // array of unsigned short : unsigned 16-bit + FIT_INT16 // array of short : signed 16-bit + FIT_UINT32 // array of unsigned long : unsigned 32-bit + FIT_INT32 // array of long : signed 32-bit + FIT_FLOAT // array of float : 32-bit IEEE floating point + FIT_DOUBLE // array of double : 64-bit IEEE floating point + FIT_COMPLEX // array of FICOMPLEX : 2 x 64-bit IEEE floating point + ; + /* Image color type used in FreeImage. */ 0 to enum-value *************** *** 153,156 **** --- 167,175 ---- FICC_ALPHA // Use alpha channel FICC_BLACK // Use black channel + FICC_REAL // Complex images: use real part + FICC_IMAG // Complex images: use imaginary part + FICC_MAG // Complex images: use magnitude + FICC_PHASE // Complex images: use phase + ; *************** *** 181,184 **** --- 200,204 ---- 4 proc _FreeImage_Rescale@16 as FIReScale 2 proc _FreeImage_AdjustGamma@12 as FIAdjustGamma + 4 proc _FreeImage_LoadFromHandle@16 as FILoadFromHandle 1 to enum-value *************** *** 250,255 **** --- 270,316 ---- max-path bytes ImageFileName 256 value image-id + int &bitmap + int >&bitmap int DrawDibDC + 4 CallBack: FIReadProc { &buffer size cnt fihandle -- cnt } + fihandle &bitmap <> abort" Attempted read from wrong bitmap!" + cnt 0 + do >&bitmap &buffer size move + size +to >&bitmap + size +to &buffer + loop cnt ; + + 4 CallBack: FIWriteProc { &buffer size cnt fihandle -- size } + size ; + + 3 CallBack: FISeekProc { fihandle offset origin -- 0 } + fihandle &bitmap <> abort" Attempted seek from wrong bitmap!" + origin + case + SEEK_SET of fihandle offset + to >&bitmap endof + SEEK_END of abort" Invalid seek" endof + offset +to >&bitmap + endcase 0 ; + + 1 CallBack: FITellProc { fihandle -- res } + fihandle &bitmap <> abort" Attempted query from wrong bitmap!" + fihandle >&bitmap > abort" Invalid handle!" + >&bitmap fihandle - ; + + create IOProcs + &FIReadProc , + &FIWriteProc , + &FISeekProc , + &FITellProc , + + :M LoadFromHandle: { FIF_FORMAT addr -- FIBITMP } + addr to &bitmap addr to >&bitmap + 0 + &bitmap + IOProcs + FIF_FORMAT + FILoadFromHandle ;M + : gen-id ( -- id ) image-id *************** *** 369,414 **** 8 of true Check: mnu8 false Enable: mnu8 ! false dup Check: mnu16 ! dup Check: mnu24 ! dup Check: mnu32 ! true dup Enable: mnu16 ! dup Enable: mnu24 ! Enable: mnu32 endof ! 16 of true Check: mnu16 false Enable: mnu16 ! false dup Check: mnu8 ! dup Check: mnu24 ! dup Check: mnu32 ! true dup Enable: mnu8 ! dup Enable: mnu24 ! Enable: mnu32 endof ! 24 of true Check: mnu24 ! false Enable: mnu24 ! false dup Check: mnu8 ! dup Check: mnu16 ! Check: mnu32 ! true dup Enable: mnu8 ! dup Enable: mnu16 ! Enable: mnu32 endof ! 32 of true Check: mnu32 false Enable: mnu32 ! false dup Check: mnu8 ! dup Check: mnu16 ! dup Check: mnu24 ! true dup Enable: mnu8 ! dup Enable: mnu16 ! Enable: mnu24 endof ! ( default ) false dup Check: mnu8 ! dup Check: mnu16 ! dup Check: mnu24 ! Check: mnu32 ! true dup Enable: mnu8 ! dup Enable: mnu16 ! dup Enable: mnu24 ! Enable: mnu32 endcase ; --- 430,475 ---- 8 of true Check: mnu8 false Enable: mnu8 ! false Check: mnu16 ! false Check: mnu24 ! false Check: mnu32 ! true Enable: mnu16 ! true Enable: mnu24 ! true Enable: mnu32 endof ! 16 of true Check: mnu16 false Enable: mnu16 ! false Check: mnu8 ! false Check: mnu24 ! false Check: mnu32 ! true Enable: mnu8 ! true Enable: mnu24 ! true Enable: mnu32 endof ! 24 of true Check: mnu24 ! false Enable: mnu24 ! false Check: mnu8 ! false Check: mnu16 ! false Check: mnu32 ! true Enable: mnu8 ! true Enable: mnu16 ! true Enable: mnu32 endof ! 32 of true Check: mnu32 false Enable: mnu32 ! false Check: mnu8 ! false Check: mnu16 ! false Check: mnu24 ! true Enable: mnu8 ! true Enable: mnu16 ! true Enable: mnu24 endof ! ( default ) false Check: mnu8 ! false Check: mnu16 ! false Check: mnu24 ! false Check: mnu32 ! true Enable: mnu8 ! true Enable: mnu16 ! true Enable: mnu24 ! true Enable: mnu32 endcase ; *************** *** 433,437 **** endcase BackGroundColor WHITE = dup not Check: mnuBlack Check: mnuWhite ! check-bits ; : DisplayImage ( -- ) --- 494,499 ---- endcase BackGroundColor WHITE = dup not Check: mnuBlack Check: mnuWhite ! check-bits ! ; : DisplayImage ( -- ) *************** *** 513,516 **** --- 575,587 ---- then ;M + :M LoadMemoryBitmap: ( &bitmap -- ) + FIF_BMP swap LoadFromHandle: self + dup FIF_UNKNOWN <> + if UnLoadImage: self + to FIBITMAP + DisplayImage + else drop + then ;M + :M ReLoad: ( -- ) \ redraw using earlier set image LoadImage *************** *** 537,543 **** ;M ! :M On_Size: ( -- ) ! \ Refresh: self ! ;M :M AutoSize: ( -- ) --- 608,614 ---- ;M ! \ :M On_Size: ( -- ) ! \ \ Refresh: self ! \ ;M :M AutoSize: ( -- ) *************** *** 553,559 **** :M On_Init: ( -- ) On_Init: super - (( wincnt 0= - if -1 call _FreeImage_Initialise@4 drop - then 1 +to wincnt )) ImagePopupBar SetPopupBar: self GetDc: self dup Puthandle: ImageDC --- 624,627 ---- *************** *** 566,577 **** DrawDIBDC Call DrawDibClose drop UnLoadImage: self ! (( wincnt 1- dup to wincnt 0= ! if Call _FreeImage_DeInitialise@0 ! then )) On_Done: super ;M :M WM_RBUTTONDOWN ( h m w l -- ) dopopup? ! if self to ThisImage \ for popup menu WM_RBUTTONDOWN WM: Super else DefWindowProc: self --- 634,643 ---- DrawDIBDC Call DrawDibClose drop UnLoadImage: self ! On_Done: super ;M :M WM_RBUTTONDOWN ( h m w l -- ) dopopup? ! if self to ThisImage check-mode \ for popup menu WM_RBUTTONDOWN WM: Super else DefWindowProc: self *************** *** 850,852 **** _FreeImage_ZLibCompress@16 _FreeImage_ZLibUncompress@16 ! |
|
From: Ezra B. <ezr...@us...> - 2006-06-09 04:31:12
|
Update of /cvsroot/win32forth/win32forth/apps/Win32ForthIDE In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv2891 Modified Files: EdCommand.f EdMenu.f EdTabControl.f Main.f ProjectTree.f Added Files: EdImageWindow.f Log Message: Win32ForthIDE updated to use FreeImageWindow class to view image files in project window. Requires FreeImage.dll EAB Index: EdTabControl.f =================================================================== RCS file: /cvsroot/win32forth/win32forth/apps/Win32ForthIDE/EdTabControl.f,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** EdTabControl.f 8 Jun 2006 17:13:47 -0000 1.5 --- EdTabControl.f 9 Jun 2006 04:31:07 -0000 1.6 *************** *** 322,326 **** :M UpdateFileName: ( addr -- ) \ Update the filename in the file list view. ! cr ." UpdateFileName: " dup h. UpdateFileName: cFileList ;M --- 322,326 ---- :M UpdateFileName: ( addr -- ) \ Update the filename in the file list view. ! \ cr ." UpdateFileName: " dup h. UpdateFileName: cFileList ;M --- NEW FILE: EdImageWindow.f --- \ EdImageWindow.f cr .( Loading Image Viewer...) fload apps\forthform\imagewindow.f create imagefiles \ image files that can be viewed z," *.bmp;*.dib;*.rle;*.jpg;*.jpeg;*.ico;*.pcd;*.psd;*.pcx;*.ppm;*.pgm;" +z," *.pbm;*.png;*.ras;*.tga;*.tif;*.gif" : is-image-file? ( addr cnt -- f ) ".ext-only" dup \ must have an extension if imagefiles zcount 2swap caps-search nip nip else 2drop false then ; :Class ImageViewChild <Super MDIChild :M Start: ( parent -- ) New> FreeImageWindow to ChildWindow self to ChildParent Start: super ;M :M On_Close: ( -- ) On_Close: super self ActiveChild = if 0 to ActiveChild then UpdateStatusBar EnableToolbar ;M :M GetFileName: ( -- addr ) ImageFileName: ChildWindow new$ dup>r place r> ;M :M SetWindowTitle: ( -- ) GetFileName: self count SetText: super ;M :M SetFileName: ( addr len -- ) SetImageFile: ChildWindow SetWindowTitle: self UpdateFileName: super ;M :M ?Modified: ( -- f ) false ;M :M GetFileType: ( -- n ) FT_BINARY ;M :M Update: ( -- ) ;M ;Class : NewImageViewWnd ( -- ) New> ImageViewChild to ActiveChild MDIClientWindow: Frame Start: ActiveChild ; \s Index: EdMenu.f =================================================================== RCS file: /cvsroot/win32forth/win32forth/apps/Win32ForthIDE/EdMenu.f,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** EdMenu.f 8 Jun 2006 17:13:47 -0000 1.4 --- EdMenu.f 9 Jun 2006 04:31:07 -0000 1.5 *************** *** 166,170 **** EndBar ! 6 constant WINDOW-MENU : GetFileType ( -- n ) --- 166,170 ---- EndBar ! 7 constant WINDOW-MENU : GetFileType ( -- n ) Index: ProjectTree.f =================================================================== RCS file: /cvsroot/win32forth/win32forth/apps/Win32ForthIDE/ProjectTree.f,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** ProjectTree.f 8 Jun 2006 17:13:47 -0000 1.4 --- ProjectTree.f 9 Jun 2006 04:31:07 -0000 1.5 *************** *** 517,526 **** #items: SelectedItem (.) pad +place pad dup +NULL 1+ - \ ReleaseBuffer: viewerfile FileExt off else GetName: SelectedItem dup zcount 2dup ".ext-only" 2dup lower FileExt place \ set FileExt - \ LoadFile: viewerfile drop GetName: SelectedItem zcount pad place --- 517,524 ---- Index: EdCommand.f =================================================================== RCS file: /cvsroot/win32forth/win32forth/apps/Win32ForthIDE/EdCommand.f,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** EdCommand.f 7 Jun 2006 01:41:26 -0000 1.2 --- EdCommand.f 9 Jun 2006 04:31:07 -0000 1.3 *************** *** 94,98 **** count LoadFile: ViewerFile 0= ?exit GetName: ViewerFile count is-binary-file? ! if (OpenBinaryFile) else 2dup IsHtmlFile? if (OpenHtmlFile) --- 94,101 ---- count LoadFile: ViewerFile 0= ?exit GetName: ViewerFile count is-binary-file? ! if 2dup is-image-file? ! if (OpenImageFile) ! else (OpenBinaryFile) ! then else 2dup IsHtmlFile? if (OpenHtmlFile) Index: Main.f =================================================================== RCS file: /cvsroot/win32forth/win32forth/apps/Win32ForthIDE/Main.f,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** Main.f 8 Jun 2006 17:13:47 -0000 1.6 --- Main.f 9 Jun 2006 04:31:07 -0000 1.7 *************** *** 611,614 **** --- 611,615 ---- fload ScintillaHyperMDI.f fload EdHexViewer.f + fload EdImageWindow.f \ \\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\ \ Define HTML Child Window class *************** *** 687,693 **** \ used by 'the class and vocabulary browser' and the \ 'Find text in Files' dialog ! ActiveBrowser 0= if NewEditWnd ActiveChild to ActiveBrowser ! then GetHandle: ActiveBrowser Activate: Frame ; is NewBrowseChild : NewRemoteChild ( -- ) \ open a new child window used to open a file --- 688,694 ---- \ used by 'the class and vocabulary browser' and the \ 'Find text in Files' dialog ! ActiveBrowser 0= if NewEditWnd ActiveChild to ActiveBrowser ! then GetHandle: ActiveBrowser Activate: Frame ; is NewBrowseChild : NewRemoteChild ( -- ) \ open a new child window used to open a file *************** *** 725,728 **** --- 726,738 ---- then Update ; + : (OpenImageFile) ( adr len -- ) + { \ temp$ -- } + MAX-PATH 2 + LocalAlloc: temp$ + temp$ place + temp$ FileNotFound: Frame + if NewImageViewWnd + temp$ count SetFileName: ActiveChild + then Update ; + : (OpenRemoteFile) ( adr len -- ) { \ temp$ -- } |
|
From: Dirk B. <db...@us...> - 2006-06-08 17:13:56
|
Update of /cvsroot/win32forth/win32forth/apps/Win32ForthIDE In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv14965/apps/Win32ForthIDE Modified Files: EdMenu.f EdTabControl.f Main.f ProjectTree.f Log Message: Made some of the Project commands work (from the menu only). Index: Main.f =================================================================== RCS file: /cvsroot/win32forth/win32forth/apps/Win32ForthIDE/Main.f,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** Main.f 7 Jun 2006 16:04:21 -0000 1.5 --- Main.f 8 Jun 2006 17:13:47 -0000 1.6 *************** *** 72,76 **** defer Update ' noop is Update defer OnSelect ' drop is OnSelect \ called when item is selected in the file listview - defer ResetProject ' noop is ResetProject AcceleratorTable AccelTable \ create the Accelerator-Key-Table --- 72,75 ---- *************** *** 114,121 **** ;Object - :noname ( -- ) - \ Reset the project window (close the current project; and open a new empty one) - ResetProject cTabWindow ; is ResetProject - \ \\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\ \ \\\\\ Splitter window \\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\ --- 113,116 ---- Index: ProjectTree.f =================================================================== RCS file: /cvsroot/win32forth/win32forth/apps/Win32ForthIDE/ProjectTree.f,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** ProjectTree.f 7 Jun 2006 15:39:34 -0000 1.3 --- ProjectTree.f 8 Jun 2006 17:13:47 -0000 1.4 *************** *** 11,28 **** s" apps\ProMgr\res" "fpath+ ! [undefined] name-only? [if] ! true value name-only? ! true value no-duplicates? ! 0 value #addedfiles ! 0 value SelectedItem ! 0 value ThisList \ temp pointer to list being used ! 0 value ThisItem \ temp pointer to new item ! 0 value TheProject ! 0 value TheStatusBar ! 0 value dirty? ! 0 value Modified ! Create FileExt 16 allot ! [then] \ \\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\ --- 11,28 ---- s" apps\ProMgr\res" "fpath+ ! true value name-only? ! true value no-duplicates? ! 0 value #addedfiles ! \ 0 value #linecount ! \ 0 value total-size ! 0 value SelectedItem ! 0 value ThisList \ temp pointer to list being used ! 0 value ThisItem \ temp pointer to new item ! 0 value TheProject ! 0 value TheStatusBar ! 0 value dirty? ! 0 value Modified ! create FileExt 16 allot \ \\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\ *************** *** 395,401 **** 32 min 0max projectname place ;m ! :m ProjectName: ( -- addr ) projectname count ;m : .buildfile ( -- ) \ mainfile c@ dup --- 395,404 ---- 32 min 0max projectname place ;m ! :m ProjectName: ( -- addr cnt ) projectname count ;m + :m &ProjectName: ( -- addr ) + projectname ;m + : .buildfile ( -- ) \ mainfile c@ dup *************** *** 698,701 **** --- 701,717 ---- )) + : SetProjectTitle ( -- ) + \ s" Forth Project Manager - " pad place + \ GetProjectFileName: TheProject dup 0= + \ if 2drop s" untitled.fpj" + \ then pad +place pad count SetText: TheProjectWindow + ; + + : reset-results ( -- ) + 0 to #addedfiles + \ 0 to #linecount + \ 0 to total-size + ; + : (open-project) ( a1 n1 -- ) \ clear-status-bar *************** *** 705,710 **** "path-only" 2dup SetDir: OpenProjectDialog 2dup SetDir: SaveFileDialog SetDir: GetFilesDialog - \ Close: TheProject Leftpane Start: TheProject - \ ResetProject \ Reset the project window (close the current project; and open a new empty one) Clear: TheProject --- 721,724 ---- *************** *** 712,717 **** Rename: TheProject SetFocus: TheProject ! \ SetProjectTitle ! \ reset-results ReleaseBuffer: viewerfile --- 726,731 ---- Rename: TheProject SetFocus: TheProject ! SetProjectTitle ! reset-results ReleaseBuffer: viewerfile *************** *** 719,726 **** ; ! : new-project ( -- ) ! \ SaveIfModified 0= ?exit ! s" Project" SetProjectName: TheProject ! pad 0 SetBuildFile: TheProject pad 0 (open-project) ! ; IDM_NEW_PRJ SetCommand --- 733,801 ---- ; ! : ?SaveMessage ( -- n ) ! \ IDYES, IDNO or IDCANCEL ! s" Do you want to save " pad place ! GetProjectFileName: TheProject ?dup ! IF "to-pathend" ! ELSE drop ProjectName: TheProject ! THEN pad +place ! s" ?" pad +place pad +NULL ! pad 1+ z" Project Manager" ! [ MB_ICONEXCLAMATION MB_YESNOCANCEL or ] literal ! NULL MessageBox ; ! ! : SaveIfModified ( -- f ) ! \ true if not cancelled or not modified ! true ! Modified ! IF ?SaveMessage ! Case ! IDCANCEL Of drop false Endof ! IDYES Of SaveProject: TheProject Endof ! ( otherwise IDNO ) false to Modified ! EndCase ! THEN ; ! ! : GetProjectName ( -- f1 ) ! &ProjectName: TheProject MainWindow Start: GetProjectNameDlg ; ! ! : (rename-project) ( -- ) ! ProjectName: TheProject nip 0= ! if s" Project" SetProjectName: TheProject ! then Rename: TheProject ; ! ! : new-project ( -- ) ! SaveIfModified 0= ?exit ! ! GetProjectName 0= ?exit ! (rename-project) ! ! pad 0 SetBuildFile: TheProject pad 0 (open-project) ! ; IDM_NEW_PRJ SetCommand ! ! : open-project ( -- ) ! SaveIfModified 0= ?exit ! OpenProjectFile count ?dup ! if (open-project) ! else drop ! then ; IDM_OPEN_PRJ SetCommand ! ! : save-project ( -- ) ! SaveProject: TheProject ! SetProjectTitle ; IDM_SAVE_PRJ SetCommand ! ! : save-as ( -- ) ! GetProjectFileName: TheProject \ save filename on stack ! s" " SetProjectFileName: TheProject ! SaveProject: TheProject ! GetProjectFileName: TheProject nip ! IF 2drop SetProjectTitle \ if not cancelled set new title ! ELSE SetProjectFileName: TheProject \ else restore filename ! THEN ; IDM_SAVE_AS_PRJ SetCommand ! ! : rename-project ( -- ) ! GetProjectName 0= ?exit ! (rename-project) ! true to Modified ! ; IDM_RENAME_PRJ SetCommand Index: EdMenu.f =================================================================== RCS file: /cvsroot/win32forth/win32forth/apps/Win32ForthIDE/EdMenu.f,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** EdMenu.f 7 Jun 2006 15:39:34 -0000 1.3 --- EdMenu.f 8 Jun 2006 17:13:47 -0000 1.4 *************** *** 75,95 **** Popup "&Project" ! MenuItem "&New... \tCtrl+N" IDM_NEW_PRJ DoCommand ; ! MenuItem "&Open... \tCtrl+O" IDM_OPEN_PRJ DoCommand ; ! MenuItem "&Save \tCtrl+S" IDM_SAVE_PRJ DoCommand ; ! MenuItem "Save &As..." IDM_SAVE_AS_PRJ DoCommand ; ! MenuItem "&Rename...\tCtrl+R" IDM_RENAME_PRJ DoCommand ; ! MenuSeparator ! MenuItem "&Build \tCtrl+B" IDM_BUILD_PRJ DoCommand ; ! MenuItem "Set search &path for build..." IDM_SET_BUILD_PATH_PRJ DoCommand ; ! MenuSeparator ! MenuItem "&Compile \tF12" IDM_COMPILE_PRJ DoCommand ; ! MenuItem "&Set Forth Name..." IDM_SET_FORTH_PRJ DoCommand ; MenuSeparator ! MenuItem "&New Module... \tCtrl+M" IDM_NEW_MODULE_PRJ DoCommand ; MenuSeparator ! MenuItem "&Add files to project... \tCtrl+A" IDM_ADD_PRJ DoCommand ; ! MenuItem "&Delete from project \tCtrl+D" IDM_DELETE_PRJ DoCommand ; ! MenuItem "Add open &forms \tCtrl+F" IDM_ADD_FORMS_PRJ DoCommand ; \ MenuSeparator \ SubMenu "Copy/&Zip files" --- 75,97 ---- Popup "&Project" ! MenuItem "&New project... \tCtrl+N" IDM_NEW_PRJ DoCommand ; MenuSeparator ! MenuItem "&Open project... \tCtrl+O" IDM_OPEN_PRJ DoCommand ; ! MenuItem "&Save project\tCtrl+S" IDM_SAVE_PRJ DoCommand ; ! MenuItem "Save project &as..." IDM_SAVE_AS_PRJ DoCommand ; MenuSeparator ! MenuItem "&Rename...\tCtrl+R" IDM_RENAME_PRJ DoCommand ; ! \ MenuSeparator ! \ MenuItem "&Build \tCtrl+B" IDM_BUILD_PRJ DoCommand ; ! \ MenuItem "Set search &path for build..." IDM_SET_BUILD_PATH_PRJ DoCommand ; ! \ MenuSeparator ! \ MenuItem "&Compile \tF12" IDM_COMPILE_PRJ DoCommand ; ! \ MenuItem "&Set Forth Name..." IDM_SET_FORTH_PRJ DoCommand ; ! \ MenuSeparator ! \ MenuItem "&New Module... \tCtrl+M" IDM_NEW_MODULE_PRJ DoCommand ; ! \ MenuSeparator ! \ MenuItem "&Add files to project... \tCtrl+A" IDM_ADD_PRJ DoCommand ; ! \ MenuItem "&Delete from project \tCtrl+D" IDM_DELETE_PRJ DoCommand ; ! \ MenuItem "Add open &forms \tCtrl+F" IDM_ADD_FORMS_PRJ DoCommand ; \ MenuSeparator \ SubMenu "Copy/&Zip files" Index: EdTabControl.f =================================================================== RCS file: /cvsroot/win32forth/win32forth/apps/Win32ForthIDE/EdTabControl.f,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** EdTabControl.f 7 Jun 2006 21:55:03 -0000 1.4 --- EdTabControl.f 8 Jun 2006 17:13:47 -0000 1.5 *************** *** 274,284 **** self Start: cTab \ must be started last - \ TEST ONLY... - s" proj\Win32ForthIDE.fpj" Prepend<home>\ - SetProjectFileName: cProjectTree - OpenProject: cProjectTree - \ ExpandAll - \ ... - \ ------------------------------------------------------------------------ --- 274,277 ---- |
|
From: George H. <geo...@us...> - 2006-06-08 11:10:56
|
Update of /cvsroot/win32forth/win32forth/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv3028/win32forth/src Modified Files: GENERIC.F Log Message: gah: Modified Show: to prevent hanging/deadlocking in multitasking apps. Index: GENERIC.F =================================================================== RCS file: /cvsroot/win32forth/win32forth/src/GENERIC.F,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** GENERIC.F 6 Jun 2006 17:22:15 -0000 1.11 --- GENERIC.F 8 Jun 2006 07:54:07 -0000 1.12 *************** *** 183,188 **** \ *| SW_SHOWNOACTIVATE | Displays a window in its most recent size and position. This value is similar to SW_SHOWNORMAL, except the window is not actived. | \ *| SW_SHOWNORMAL | Activates and displays a window. If the window is minimized or maximized, the system restores it to its original size and position. An application should specify this flag when displaying the window for the first time. | hWnd ! if hWnd Call ShowWindow then drop ;M --- 183,195 ---- \ *| SW_SHOWNOACTIVATE | Displays a window in its most recent size and position. This value is similar to SW_SHOWNORMAL, except the window is not actived. | \ *| SW_SHOWNORMAL | Activates and displays a window. If the window is minimized or maximized, the system restores it to its original size and position. An application should specify this flag when displaying the window for the first time. | + \ *P If the window belongs to a different task or application the WM_SHOW is posted to the + \ ** the message queue to prevent the current task hanging. If the window belongs to the + \ ** current task the message is sent. hWnd ! if 0 hWnd call GetWindowThreadProcessId ! call GetCurrentThreadId = ! if hWnd Call ShowWindow ! else hWnd call ShowWindowAsync ! then then drop ;M |
1040 messages has been excluded from this view by a project administrator.
