diff --git a/designer/udesignerproject.tsf b/designer/udesignerproject.tsf index 4ee3db3..d59acdf 100644 --- a/designer/udesignerproject.tsf +++ b/designer/udesignerproject.tsf @@ -196,31 +196,6 @@ type TProjectView = class(TVCForm) // private FAddtoolbtn; FTreePopUpMenu; - type TMyToolBar=class(TToolBar) - function Create(AOwner);override; - begin - inherited; - end - function WMCOMMAND(o,e):WM_COMMAND;override; - begin - class(TWinControl).WMCOMMAND(o,e); - end - function ContextMenu(o,e);override; - begin - //inherited; - e.skip := true; - end - function DoClick(o,e); - begin - xy := array(0,height+1); - xy := clienttoscreen(xy[0],xy[1]); - if PopupMenu is class(TPopUpmenu)then - begin - uf := TPM_LEFTALIGN .| TPM_TOPALIGN .| TPM_RIGHTBUTTON; - _wapi.TrackPopupMenu(PopupMenu.Handle,uf,xy[0],xy[1],0,self.Handle,nil); - end - end - end //**************目录树筛选功能*********************************** FFilter; FFilterList; @@ -379,7 +354,7 @@ type TProjectView = class(TVCForm) // //FTslEditer.Parent := AOwner; FTmfParser := new TTmfParser(); FTslParser := new ttslscripparser(); - FTreeTool := new TMyToolBar(self); + FTreeTool := new TToolBar(self); FTreeTool.parent := self; imgs := New TControlImageList(self); imgs.width := 24; @@ -431,7 +406,7 @@ type TProjectView = class(TVCForm) // bmps[i]:= bi; end FAddMenu := new TPopUpMenu(self); - FTreeTool.PopUpMenu := FAddMenu; + FAddtoolbtn.PopUpMenu := FAddMenu; FAddMenu.bitmap := EditToolBmps["添加"]; FAddMenu.Caption := "添加"; FSetMainMenu := new TMenu(self); @@ -2559,7 +2534,7 @@ type tinheritedimput = class(TVCForm) object tinheritedinput1:tinheritedinput visible = false caption="通过继承构建窗口" - height=338 + height=328 left=420 top=232 width=300 @@ -2575,7 +2550,7 @@ type tinheritedimput = class(TVCForm) left=6 top=40 visible=true - width=274 + width=280 onselchanged=listselchanged end object btn1:tbtn @@ -2601,7 +2576,7 @@ type tinheritedimput = class(TVCForm) caption="edit1" left=62 top=226 - width=208 + width=218 end end %%; @@ -2630,8 +2605,7 @@ type tinheritedimput = class(TVCForm) begin idx := o.getCurrentSelection(); if idx>=0 then - begin - + begin s := o.getItemText(idx); n := 1; while true do @@ -2674,8 +2648,7 @@ type tinheritedimput = class(TVCForm) btn1; btn2; label1; - edit1; - + edit1; end type TNameInput=class(TCustomControl) //输入文件名窗口 function Create(AOwner);override; @@ -2706,17 +2679,6 @@ type TNameInput=class(TCustomControl) // begin Endmodal(1); end - FEidt.OnKeyUp := function(o,e) - begin - if ssCtrl in e.shiftstate then - begin - if e.CharCode=Ord("A")then - begin - sellAllText(); - e.skip := true; - end - end - end FEidt.OnKeyPress := function(o,e) begin if e.wparam=13 then diff --git a/funcext/tvclib/utslvclstdctl.tsf b/funcext/tvclib/utslvclstdctl.tsf index e36b558..8363e41 100644 --- a/funcext/tvclib/utslvclstdctl.tsf +++ b/funcext/tvclib/utslvclstdctl.tsf @@ -4465,7 +4465,7 @@ type TcustomToolButton=class(tcomponent) begin if d=ShortCut then begin - DoOnClick(self,new tuieventbase(0,0,0,0)); + DoOnClick(self(true),new tuieventbase(0,0,0,0)); return "havedoshortcut"; end end