Menu
▾
▴
[Win32forth-cvs] win32forth/apps/ForthForm CreateMenu.f, 1.4, 1.5 CreateToolBarForm.ff, 1.2, 1.3 FORMCONTROLS.F, 1.7, 1.8 FORMOBJECT.F, 1.20, 1.21 FORMPROPERTY.F, 1.5, 1.6 FORMTOOLBAR.F, 1.3, 1.4 FORTHFORM.F, 1.22, 1.23 FormMonitor.f, 1.1, 1.2 Forms.frm, 1.5, 1.6 POINT.F, 1.1, 1.2 PREFERENCES.ff, 1.4, 1.5 TabPropertyWindow.ff, 1.1, 1.2
|
From: Ezra B. <ezr...@us...> - 2008-04-28 05:22:55
|
Update of /cvsroot/win32forth/win32forth/apps/ForthForm In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv6208/apps/ForthForm Modified Files: CreateMenu.f CreateToolBarForm.ff FORMCONTROLS.F FORMOBJECT.F FORMPROPERTY.F FORMTOOLBAR.F FORTHFORM.F FormMonitor.f Forms.frm POINT.F PREFERENCES.ff TabPropertyWindow.ff Log Message: ForthForm update (probably the last). EAB Index: Forms.frm =================================================================== RCS file: /cvsroot/win32forth/win32forth/apps/ForthForm/Forms.frm,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** Forms.frm 27 Dec 2006 18:43:57 -0000 1.5 --- Forms.frm 28 Apr 2008 05:22:44 -0000 1.6 *************** *** 8,12 **** ' 2drop value WmCommand-Func \ function pointer for WM_COMMAND ColorObject FrmColor \ the background color ! 150 175 2value XYPos \ save screen location of form TabControl TabProperties --- 8,12 ---- ' 2drop value WmCommand-Func \ function pointer for WM_COMMAND ColorObject FrmColor \ the background color ! 720 70 2value XYPos \ save screen location of form TabControl TabProperties *************** *** 145,149 **** ClassInit: super +dialoglist \ allow handling of dialog messages ! 442 to id \ set child id, changeable \ Insert your code here ;M --- 145,149 ---- ClassInit: super +dialoglist \ allow handling of dialog messages ! 419 to id \ set child id, changeable \ Insert your code here ;M *************** *** 1398,1402 **** ClassInit: super +dialoglist \ allow handling of dialog messages ! 443 to id \ set child id, changeable \ Insert your code here ;M --- 1398,1402 ---- ClassInit: super +dialoglist \ allow handling of dialog messages ! 420 to id \ set child id, changeable \ Insert your code here ;M *************** *** 1635,1639 **** ClassInit: super +dialoglist \ allow handling of dialog messages ! 444 to id \ set child id, changeable \ Insert your code here ;M --- 1635,1639 ---- ClassInit: super +dialoglist \ allow handling of dialog messages ! 421 to id \ set child id, changeable \ Insert your code here ;M *************** *** 1803,1806 **** --- 1803,1808 ---- CheckBox chkShowMonitor CheckBox chkShowReleaseNotes + CheckBox chkSingleControl + CheckBox chkAutoProperty GroupRadioButton radAlignTop RadioButton radAlignBottom *************** *** 1844,1848 **** :M StartSize: ( -- width height ) ! 302 199 ;M --- 1846,1850 ---- :M StartSize: ( -- width height ) ! 302 257 ;M *************** *** 1871,1903 **** self Start: grpOther ! 11 78 139 79 Move: grpOther Handle: Winfont SetFont: grpOther s" Options" SetText: grpOther self Start: grpToolBar ! 11 6 140 65 Move: grpToolBar Handle: Winfont SetFont: grpToolBar s" Toolbar" SetText: grpToolBar self Start: chkFlatToolBar ! 18 21 79 18 Move: chkFlatToolBar Handle: Winfont SetFont: chkFlatToolBar s" Flat Style" SetText: chkFlatToolBar self Start: chkButtonText ! 18 43 122 18 Move: chkButtonText Handle: Winfont SetFont: chkButtonText s" Show Text in Buttons" SetText: chkButtonText self Start: chkShowMonitor ! 18 101 89 18 Move: chkShowMonitor Handle: Winfont SetFont: chkShowMonitor s" Show Monitor" SetText: chkShowMonitor self Start: chkShowReleaseNotes ! 18 121 120 25 Move: chkShowReleaseNotes Handle: Winfont SetFont: chkShowReleaseNotes s" Show Release Notes" SetText: chkShowReleaseNotes self Start: radAlignTop 180 21 61 19 Move: radAlignTop --- 1873,1915 ---- self Start: grpOther ! 8 77 158 109 Move: grpOther Handle: Winfont SetFont: grpOther s" Options" SetText: grpOther self Start: grpToolBar ! 9 6 140 65 Move: grpToolBar Handle: Winfont SetFont: grpToolBar s" Toolbar" SetText: grpToolBar self Start: chkFlatToolBar ! 16 21 79 18 Move: chkFlatToolBar Handle: Winfont SetFont: chkFlatToolBar s" Flat Style" SetText: chkFlatToolBar self Start: chkButtonText ! 16 43 122 18 Move: chkButtonText Handle: Winfont SetFont: chkButtonText s" Show Text in Buttons" SetText: chkButtonText self Start: chkShowMonitor ! 16 102 114 18 Move: chkShowMonitor Handle: Winfont SetFont: chkShowMonitor s" Show Monitor" SetText: chkShowMonitor self Start: chkShowReleaseNotes ! 16 121 125 18 Move: chkShowReleaseNotes Handle: Winfont SetFont: chkShowReleaseNotes s" Show Release Notes" SetText: chkShowReleaseNotes + self Start: chkSingleControl + 16 141 137 18 Move: chkSingleControl + Handle: Winfont SetFont: chkSingleControl + s" Click adds single control" SetText: chkSingleControl + + self Start: chkAutoProperty + 16 161 145 18 Move: chkAutoProperty + Handle: Winfont SetFont: chkAutoProperty + s" Auto display properties" SetText: chkAutoProperty + self Start: radAlignTop 180 21 61 19 Move: radAlignTop *************** *** 1921,1925 **** self Start: btnOk ! 74 170 58 22 Move: btnOk WS_GROUP +Style: btnOk Handle: Winfont SetFont: btnOk --- 1933,1937 ---- self Start: btnOk ! 74 218 58 22 Move: btnOk WS_GROUP +Style: btnOk Handle: Winfont SetFont: btnOk *************** *** 1927,1931 **** self Start: btnCancel ! 144 170 58 22 Move: btnCancel Handle: Winfont SetFont: btnCancel s" &Cancel" SetText: btnCancel --- 1939,1943 ---- self Start: btnCancel ! 144 218 58 22 Move: btnCancel Handle: Winfont SetFont: btnCancel s" &Cancel" SetText: btnCancel Index: FORTHFORM.F =================================================================== RCS file: /cvsroot/win32forth/win32forth/apps/ForthForm/FORTHFORM.F,v retrieving revision 1.22 retrieving revision 1.23 diff -C2 -d -r1.22 -r1.23 *** FORTHFORM.F 13 May 2007 07:52:26 -0000 1.22 --- FORTHFORM.F 28 Apr 2008 05:22:44 -0000 1.23 *************** *** 37,41 **** needs HtmlControl.f \ for viewing the help file needs ScintillaControl.f \ editor for FormPad ! needs FileLister.f \ directory viewer needs Win32Help.f needs Resources.f --- 37,42 ---- needs HtmlControl.f \ for viewing the help file needs ScintillaControl.f \ editor for FormPad ! \ needs FileLister.f \ directory viewer using treeview ! needs folderview.f needs Win32Help.f needs Resources.f *************** *** 104,113 **** 0 value ctrldata-size \ before opening it true value show-notes? \ display release notes on startup? ! false value one-click? \ allow one control to be added at a time? ! variable formwindow-link \ all forthform windows, allow simple closing formwindow-link off ! WM_USER 256 + constant FF_PASTE \ message to tell Win32forth to paste source text ColorObject FormColor \ background form color --- 105,114 ---- 0 value ctrldata-size \ before opening it true value show-notes? \ display release notes on startup? ! true value SingleControl? \ allow only one control to be added at a time? ! false value AutoProperty? \ automatically display appropriate property dialog? variable formwindow-link \ all forthform windows, allow simple closing formwindow-link off ! WM_USER 256 + constant FF_PASTE \ message to tell Win32forthIDE to paste source text ColorObject FormColor \ background form color *************** *** 119,123 **** \ adapted from WinEd ! 20208 constant fform_version# \ 2.02.08 \ Version numbers: v.ww.rr --- 120,124 ---- \ adapted from WinEd ! 20209 constant fform_version# \ 2.02.09 \ Version numbers: v.ww.rr *************** *** 348,364 **** needs formmonitor.f \ monitor window for positioning forms ! Form DummyForm ! ControlObject DummyControl : UpdateFormPicker ( -- ) \ update combolist control ! GetHandle: FormPicker 0= ?exit ! Clear: FormPicker ! #Forms ?dup if 1+ 1 ?do i >Link#: FormList Data@: FormList FormName: [ ] ! count asciiz AddStringTo: FormPicker loop ActiveForm ?dup ! if ?FormNumber 1- 0max SetSelection: FormPicker then then ; --- 349,365 ---- needs formmonitor.f \ monitor window for positioning forms ! Form DummyForm \ dummy ! ControlObject DummyControl \ objects : UpdateFormPicker ( -- ) \ update combolist control ! GetHandle: FormPicker 0= ?exit \ not opened ! Clear: FormPicker \ reset it ! #Forms ?dup \ if we have any if 1+ 1 ?do i >Link#: FormList Data@: FormList FormName: [ ] ! count asciiz AddStringTo: FormPicker \ add string loop ActiveForm ?dup ! if ?FormNumber 1- 0max SetSelection: FormPicker \ show active form then then ; *************** *** 411,417 **** Monitor.OriginY s>d (d.) s" MonitorTop" SetSetting then ! \+ withbgnd ImageFileName: BkGndImageWindow s" BackGroundImage" SetSetting FlatToolbar? s>d (d.) s" ToolbarStyle" SetSetting ShowMonitor? s>d (d.) s" ShowMonitor" SetSetting align_rebar s>d (d.) s" AlignRebar" SetSetting RebarHeight s>d (d.) s" RebarHeight" SetSetting --- 412,424 ---- Monitor.OriginY s>d (d.) s" MonitorTop" SetSetting then ! #IFDEF withbgnd ImageHandle: BKGndImageWindow ! if ImageFileName: BkGndImageWindow ! else pad 0 ! then s" BackGroundImage" SetSetting ! #THEN FlatToolbar? s>d (d.) s" ToolbarStyle" SetSetting ShowMonitor? s>d (d.) s" ShowMonitor" SetSetting + SingleControl? s>d (d.) s" SingleClick" SetSetting + AutoProperty? s>d (d.) s" AutoProperty" SetSetting align_rebar s>d (d.) s" AlignRebar" SetSetting RebarHeight s>d (d.) s" RebarHeight" SetSetting *************** *** 432,435 **** --- 439,444 ---- s" ToolbarStyle" "GetDefaultValue if to FlatToolBar? else drop then s" ShowMonitor" "GetDefaultValue if to ShowMonitor? else drop then + s" SingleClick" "GetDefaultValue if to SingleControl? else drop then + s" AutoProperty" "GetDefaultValue if to AutoProperty? else drop then s" AlignRebar" "GetDefaultValue if to align_rebar else drop then s" RebarHeight" "GetDefaultValue if to RebarHeight else drop then *************** *** 595,600 **** if UpdatePropertyWindow then ! then ! UpdateFormPicker #Forms 2 < if Close: frmCreatePropertyForm --- 604,608 ---- if UpdatePropertyWindow then ! then UpdateFormPicker #Forms 2 < if Close: frmCreatePropertyForm *************** *** 661,675 **** ; ! :M Canvas: { \ x y w h winw winh -- x y w h } rebar_position ! to h to w to y to x ! width height Height: statuswindow - to winh to winw align_rebar top = ! if 0 h winw winh h - exitm then align_rebar bottom = ! if 0 0 winw winh h - exitm then align_rebar left = ! if w 0 winw winh exitm ! then ( align right ) 0 0 winw w - winh ;M --- 669,683 ---- ; ! :M Canvas: { \ rebarx rebary rebarw rebarh mainw mainh -- x y w h } rebar_position ! to rebarh to rebarw to rebary to rebarx ! width height Height: statuswindow - to mainh to mainw align_rebar top = ! if 0 rebarh mainw mainh rebarh - exitm then align_rebar bottom = ! if 0 0 mainw mainh rebarh - exitm then align_rebar left = ! if rebarw 0 mainw mainh exitm ! then ( align right ) 0 0 mainw rebarw - mainh ;M *************** *** 678,681 **** --- 686,722 ---- ;M + #IFDEF withbgnd + :M ReDrawImage: ( -- ) + Canvas: self Move: BkGndImageWindow ;M + #ENDIF + + :M On_Paint: ( -- ) + 0 0 Width Height BackGroundColor FillArea: dc + \+ withbgnd ReDrawImage: self + ;M + + : InitBitmaps ( -- ) \ create default bitmap handles for bitmap buttons + PictureBitmap usebitmap \ create bitmap handle + GetDc: self dup>r CreateDIBitmap to picturebmp + Static_Bitmap usebitmap + r@ CreateDIBitmap to staticbmp + r> ReleaseDc: self ; + + #IFDEF withbgnd + : StartImageWindow ( -- ) + self Start: BkGndImageWindow + FIT_SIZE SetViewMode: BkGndImageWindow + GetBackGroundImage + if 2drop \ file wasn't found + else SetImageFile: BkGndImageWindow + then ; + #ENDIF + + : StartStatusWIndow ( -- ) + self Start: controlstats \ set up status window + Handle: ControlFont SetFont: controlstats + Addr: controlstats to statuswindow + bardivisions 5 SetParts: controlstats ; + :M On_Init: ( -- ) On_Init: super *************** *** 694,710 **** COLOR_BTNFACE Call GetSysColor NewColor: FormColor - #IFDEF withbgnd - self Start: BkGndImageWindow - FIT_SIZE SetViewMode: BkGndImageWindow - GetBackGroundImage - if 2drop \ file wasn't found - else SetImageFile: BkGndImageWindow - then - #ENDIF - self Start: controlstats \ set up status window - Handle: ControlFont SetFont: controlstats - Addr: controlstats to statuswindow - bardivisions 5 SetParts: controlstats - self Start: TheRebar --- 735,738 ---- *************** *** 713,723 **** then ! \ create default bitmap handles for bitmap buttons ! PictureBitmap usebitmap \ create bitmap handle ! GetDc: self dup>r CreateDIBitmap to picturebmp ! Static_Bitmap usebitmap ! r@ CreateDIBitmap to staticbmp ! r> ReleaseDc: self ! UpdateSystem --- 741,747 ---- then ! StartStatusWIndow ! \+ withbgnd StartImageWindow ! InitBitmaps UpdateSystem *************** *** 725,733 **** ;M - #IFDEF withbgnd - :M ReDrawImage: ( -- ) - Canvas: self Move: BkGndImageWindow ;M - #ENDIF - :M On_Size: ( -- ) AutoSize: ControlToolBar --- 749,752 ---- *************** *** 856,864 **** 0 ;M - :M On_Paint: ( -- ) - \+ withbgnd ReDrawImage: self - Canvas: self BackGroundColor FillArea: dc - ;M - :M Close: ( -- ) SaveDefaults --- 875,878 ---- *************** *** 1085,1088 **** --- 1099,1104 ---- IsButtonChecked?: chkShowMonitor to ShowMonitor? IsButtonChecked?: chkShowReleaseNotes to show-notes? + IsButtonChecked?: chkSingleControl to SingleControl? + IsButtonChecked?: chkAutoProperty to AutoProperty? IsButtonChecked?: radAlignTop if top then IsButtonChecked?: radAlignBottom if bottom then *************** *** 1115,1118 **** --- 1131,1136 ---- ShowMonitor? Check: chkShowMonitor show-notes? Check: chkSHowReleaseNotes + SingleControl? Check: chkSingleControl + AutoProperty? Check: chkAutoProperty align_rebar case Index: FormMonitor.f =================================================================== RCS file: /cvsroot/win32forth/win32forth/apps/ForthForm/FormMonitor.f,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** FormMonitor.f 27 Dec 2006 18:43:58 -0000 1.1 --- FormMonitor.f 28 Apr 2008 05:22:44 -0000 1.2 *************** *** 6,10 **** int wx int wy ! Point MyPoint :M ClassInit: ( -- ) --- 6,10 ---- int wx int wy ! ffPoint MyPoint :M ClassInit: ( -- ) Index: FORMCONTROLS.F =================================================================== RCS file: /cvsroot/win32forth/win32forth/apps/ForthForm/FORMCONTROLS.F,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** FORMCONTROLS.F 27 Dec 2006 18:43:57 -0000 1.7 --- FORMCONTROLS.F 28 Apr 2008 05:22:44 -0000 1.8 *************** *** 487,491 **** :Class FFFileWindow <Super Child-Window ! FileWindow TheFileLister :M WM_LBUTTONDOWN { h m w l -- res } --- 487,491 ---- :Class FFFileWindow <Super Child-Window ! FolderViewer TheFileLister :M WM_LBUTTONDOWN { h m w l -- res } Index: FORMPROPERTY.F =================================================================== RCS file: /cvsroot/win32forth/win32forth/apps/ForthForm/FORMPROPERTY.F,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** FORMPROPERTY.F 27 Dec 2006 18:43:57 -0000 1.5 --- FORMPROPERTY.F 28 Apr 2008 05:22:44 -0000 1.6 *************** *** 5,8 **** --- 5,12 ---- load-bitmap stopbmp2 "stop2.bmp" + \ The following not working from within the TabControl form, just a litle help info + s" When a control or form is selected display its property" BInfo: chkAutoProperty place + s" Add only one selected control when form is clicked" BInfo: chkSingleControl place + : GetBitmap ( -- ) Gethandle: frmEditProperties Start: GetBitmapDlg dup c@ *************** *** 43,47 **** dup Enable: radLefttext dup Enable: grpOrientation ; ! : ?EnableSpinner ( -- ) GetType: eActiveControl TypeTextBox = dup Enable: chkSpinner --- 47,51 ---- dup Enable: radLefttext dup Enable: grpOrientation ; ! : ?EnableSpinner ( -- ) GetType: eActiveControl TypeTextBox = dup Enable: chkSpinner *************** *** 180,184 **** :Noname ( -- ) ! frmEditProperties.hwnd 0= ?exit \ window is not open \ Remove comment from the following if you will need to save the properties first \ If you do and you are just browsing controls the form(s) will be marked as --- 184,188 ---- :Noname ( -- ) ! frmEditProperties.hwnd 0= ?exit \ window is not open \ Remove comment from the following if you will need to save the properties first \ If you do and you are just browsing controls the form(s) will be marked as *************** *** 186,190 **** \ SaveProperties \ save first ! initload \ reload for new control ; is UpDatePropertyWindow --- 190,194 ---- \ SaveProperties \ save first ! initload \ reload for new control ; is UpDatePropertyWindow *************** *** 297,301 **** 1 of SaveProperties ( control ) endof endcase ; ! :M Close: ( -- ) Close: frmEditForm --- 301,305 ---- 1 of SaveProperties ( control ) endof endcase ; ! :M Close: ( -- ) Close: frmEditForm *************** *** 315,323 **** IDOK SetId: btnApply IDCANCEL SetID: btnClose ! ! TCS_BUTTONS AddStyle: TabProperties On_Init: Super ! self Start: btnApply btnApplyX btnApplyY btnApplyW btnApplyH Move: btnApply --- 319,327 ---- IDOK SetId: btnApply IDCANCEL SetID: btnClose ! ! TCS_BUTTONS TCS_FLATBUTTONS or AddStyle: TabProperties On_Init: Super ! self Start: btnApply btnApplyX btnApplyY btnApplyW btnApplyH Move: btnApply *************** *** 328,332 **** s" Apply" SetText: btnApply Handle: WinFont SetFont: btnApply ! self Start: btnClose btnCloseX btnCloseY btnCloseW btnCloseH Move: btnClose --- 332,336 ---- s" Apply" SetText: btnApply Handle: WinFont SetFont: btnApply ! self Start: btnClose btnCloseX btnCloseY btnCloseW btnCloseH Move: btnClose *************** *** 371,375 **** 0 Addr: TabProperties ontab ;M ! :M ClassInit: ( -- ) ClassInit: Super --- 375,379 ---- 0 Addr: TabProperties ontab ;M ! :M ClassInit: ( -- ) ClassInit: Super Index: TabPropertyWindow.ff =================================================================== RCS file: /cvsroot/win32forth/win32forth/apps/ForthForm/TabPropertyWindow.ff,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 Binary files /tmp/cvsUG1RI2 and /tmp/cvsAUR8nc differ Index: CreateToolBarForm.ff =================================================================== RCS file: /cvsroot/win32forth/win32forth/apps/ForthForm/CreateToolBarForm.ff,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 Binary files /tmp/cvsFAFXvl and /tmp/cvsqNCgCv differ Index: PREFERENCES.ff =================================================================== RCS file: /cvsroot/win32forth/win32forth/apps/ForthForm/PREFERENCES.ff,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 Binary files /tmp/cvstButGr and /tmp/cvsSqpzcC differ Index: POINT.F =================================================================== RCS file: /cvsroot/win32forth/win32forth/apps/ForthForm/POINT.F,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** POINT.F 21 Dec 2004 00:18:45 -0000 1.1 --- POINT.F 28 Apr 2008 05:22:45 -0000 1.2 *************** *** 4,8 **** \ define point class ! :Class Point <Super Object Record: xy --- 4,8 ---- \ define point class ! :Class ffPoint <Super Object Record: xy Index: FORMTOOLBAR.F =================================================================== RCS file: /cvsroot/win32forth/win32forth/apps/ForthForm/FORMTOOLBAR.F,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** FORMTOOLBAR.F 27 Dec 2006 18:43:57 -0000 1.3 --- FORMTOOLBAR.F 28 Apr 2008 05:22:44 -0000 1.4 *************** *** 400,407 **** : add-children ( -- ) rebar$ c@ 0= \ from scratch? ! if align_rebar 1 and 0= if add-combobox ! then add-maintoolbar ! add-controltoolbar exit then rebar$ count bounds ?do i c@ --- 400,408 ---- : add-children ( -- ) rebar$ c@ 0= \ from scratch? ! if add-maintoolbar ! add-controltoolbar ! align_rebar 1 and 0= if add-combobox ! then exit then rebar$ count bounds ?do i c@ Index: FORMOBJECT.F =================================================================== RCS file: /cvsroot/win32forth/win32forth/apps/ForthForm/FORMOBJECT.F,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -d -r1.20 -r1.21 *** FORMOBJECT.F 10 Jun 2007 03:44:27 -0000 1.20 --- FORMOBJECT.F 28 Apr 2008 05:22:44 -0000 1.21 *************** *** 91,96 **** int selecting? \ true if selecting a group of controls LTGRAY value BackGroundColor \ duh! ! Point upperleft \ bounding coordinates ! Point lowerright \ for active control File FormFile \ file name for this window 5 constant hsize \ square handle size --- 91,96 ---- int selecting? \ true if selecting a group of controls LTGRAY value BackGroundColor \ duh! ! ffPoint upperleft \ bounding coordinates ! ffPoint lowerright \ for active control File FormFile \ file name for this window 5 constant hsize \ square handle size *************** *** 149,152 **** --- 149,155 ---- to ActiveControl self to Activeform + AutoProperty? + if doedit + then UpdatePropertyWindow UpdateStatus: self ; *************** *** 821,825 **** : clicked ( -- ) hwnd call SetCapture drop ! one-click? if ButtonID IDC_BITMAP IDC_Generic between if false ButtonID CheckButton: TheControlToolBar \ uncheck it --- 824,828 ---- : clicked ( -- ) hwnd call SetCapture drop ! SingleControl? if ButtonID IDC_BITMAP IDC_Generic between if false ButtonID CheckButton: TheControlToolBar \ uncheck it *************** *** 902,908 **** hwnd Call ReleaseCapture drop locked? ?exit ! adjust-box newcontrol? ! if one-click? if false to newcontrol? then --- 905,911 ---- hwnd Call ReleaseCapture drop locked? ?exit ! adjust-box newcontrol? ! if SingleControl? if false to newcontrol? then *************** *** 925,929 **** Left: FormBox Top: FormBox Right: FormBox Bottom: FormBox d= if false to selecting? NoActiveControl \ no box drawn ! then Paint: self ; : dosize { \ deltax deltay -- } --- 928,938 ---- Left: FormBox Top: FormBox Right: FormBox Bottom: FormBox d= if false to selecting? NoActiveControl \ no box drawn ! then ! ActiveControl 0= ! if AutoProperty? ! if doform ! then ! then ! Paint: self ; : dosize { \ deltax deltay -- } *************** *** 1063,1068 **** Update: self else SetFocus: self ! then ! ;M :M On_Size: ( -- ) --- 1072,1078 ---- Update: self else SetFocus: self ! then AutoProperty? ! if doform ! then ;M :M On_Size: ( -- ) *************** *** 1513,1517 **** then TypeFileWindow get-array \ do we have any? ! if s" \- -filelister.f needs filelister.f \ folder browser" append&crlf then then GetSuperClass: self MDIDIALOG-CLASS = --- 1523,1527 ---- then TypeFileWindow get-array \ do we have any? ! if s" \- -FolderView.f needs folderview.f \ folder browser" append&crlf then then GetSuperClass: self MDIDIALOG-CLASS = *************** *** 1584,1588 **** TypeStaticBitmap of s" StaticBitmap " endof TypeMultiListBox of s" MultiListBox " endof ! TypeFileWindow of s" FileWindow " endof TypeTabControl of s" TabControl " endof TypeGeneric of write-child-params --- 1594,1598 ---- TypeStaticBitmap of s" StaticBitmap " endof TypeMultiListBox of s" MultiListBox " endof ! TypeFileWindow of s" FolderViewer " endof TypeTabControl of s" TabControl " endof TypeGeneric of write-child-params *************** *** 1627,1631 **** TypeStaticBitmap of s" StaticBitmap " endof TypeMultiListBox of s" MultiListBox " endof ! TypeFileWindow of s" FileWindow " endof TypeTabControl of s" TabControl " endof TypeGeneric of write-child-params --- 1637,1641 ---- TypeStaticBitmap of s" StaticBitmap " endof TypeMultiListBox of s" MultiListBox " endof ! TypeFileWindow of s" FolderViewer " endof TypeTabControl of s" TabControl " endof TypeGeneric of write-child-params *************** *** 1737,1741 **** +crlf s" :M Close:" append 1 +tabs s" ( -- )" append&crlf ! \ we close any FileWindow object, avoid head scratching bugs :-p TypeFileWindow get-array \ do we have any? if #controls 1+ 1 --- 1747,1751 ---- +crlf s" :M Close:" append 1 +tabs s" ( -- )" append&crlf ! \ we close any FolderViewer object, avoid head scratching bugs :-p TypeFileWindow get-array \ do we have any? if #controls 1+ 1 Index: CreateMenu.f =================================================================== RCS file: /cvsroot/win32forth/win32forth/apps/ForthForm/CreateMenu.f,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** CreateMenu.f 27 Dec 2006 18:43:57 -0000 1.4 --- CreateMenu.f 28 Apr 2008 05:22:44 -0000 1.5 *************** *** 26,29 **** --- 26,30 ---- defer OnMenuEnd \ ' drop is OnMenuEnd defer OnExit ' drop is OnExit + 0 value ThisItem :Class MenuEntry <super Object *************** *** 106,110 **** int SelectedItem - int ThisItem int hwndmain \ handle to root int hwndimage --- 107,110 ---- *************** *** 595,599 **** GetMenuName: TheMenu pad +place pad count ; ! : DoMenuCommand { mid obj -- } mid --- 595,599 ---- GetMenuName: TheMenu pad +place pad count ; ! : DoMenuCommand { mid obj -- } mid *************** *** 601,605 **** GetID: btnPopup of GetText: txtMenutext AddPopup: TheMenu endof GetID: btnSubMenu of GetText: txtMenutext AddSubMenu: TheMenu endof ! GetID: btnMenuItem of GetText: txtMenutext AddMenuitem: TheMenu endof GetID: btnRename of GetText: txtMenutext Rename: TheMenu endof GetID: btnSeparator of MenuSeparator: TheMenu endof --- 601,607 ---- GetID: btnPopup of GetText: txtMenutext AddPopup: TheMenu endof GetID: btnSubMenu of GetText: txtMenutext AddSubMenu: TheMenu endof ! GetID: btnMenuItem of GetText: txtMenutext AddMenuitem: TheMenu ! GetText: txtName SetMenuName: ThisItem ! endof GetID: btnRename of GetText: txtMenutext Rename: TheMenu endof GetID: btnSeparator of MenuSeparator: TheMenu endof |
