diff --git a/wst/trunk/type_lib_edtr/edit_helper.pas b/wst/trunk/type_lib_edtr/edit_helper.pas index 6da300cf9..46674a718 100644 --- a/wst/trunk/type_lib_edtr/edit_helper.pas +++ b/wst/trunk/type_lib_edtr/edit_helper.pas @@ -733,6 +733,7 @@ var sym : TPasElement; moduleList, decList : TList; mdl : TPasModule; + locExtName : string; begin moduleList := AContainer.Package.Modules; for i := 0 to Pred(moduleList.Count) do begin @@ -740,14 +741,24 @@ begin decList := mdl.InterfaceSection.Declarations; for j := 0 to Pred(decList.Count) do begin sym := TPasElement(decList[j]); - if sym.InheritsFrom(TPasType) and ( not sym.InheritsFrom(TPasNativeSimpleContentClassType) ) then begin + if sym.InheritsFrom(TPasType) {and ( not sym.InheritsFrom(TPasNativeSimpleContentClassType) )} then begin if ( ALs.IndexOfObject(sym) = -1 ) then begin if sym.InheritsFrom(TPasNativeSpecialSimpleType) or sym.InheritsFrom(TPasNativeSpecialSimpleContentClassType) then begin - ALs.AddObject(sym.Name,sym); + //ALs.AddObject(sym.Name,sym); + locExtName := AContainer.GetExternalName(sym); + if ( sym.Name = locExtName ) then + ALs.AddObject(sym.Name,sym) + else + ALs.AddObject(Format('%s - ( %s )',[sym.Name,AContainer.GetExternalName(sym)]),sym); end else begin - ALs.AddObject(AContainer.GetExternalName(sym),sym); + //ALs.AddObject(AContainer.GetExternalName(sym),sym); + locExtName := AContainer.GetExternalName(sym); + if ( sym.Name = locExtName ) then + ALs.AddObject(AContainer.GetExternalName(sym),sym) + else + ALs.AddObject(Format('%s - ( %s )',[AContainer.GetExternalName(sym),sym.Name]),sym); end; end; end; diff --git a/wst/trunk/type_lib_edtr/typ_lib_edtr.lpi b/wst/trunk/type_lib_edtr/typ_lib_edtr.lpi index 5ee7e3225..0ec5ad7d7 100644 --- a/wst/trunk/type_lib_edtr/typ_lib_edtr.lpi +++ b/wst/trunk/type_lib_edtr/typ_lib_edtr.lpi @@ -40,24 +40,24 @@ + - + - + - @@ -78,30 +78,30 @@ + - - + - + - + @@ -117,8 +117,8 @@ - + @@ -129,50 +129,50 @@ - + - + - + - + - + - + - + diff --git a/wst/trunk/type_lib_edtr/uinterfaceedit.lfm b/wst/trunk/type_lib_edtr/uinterfaceedit.lfm index ab0597882..83b18137a 100644 --- a/wst/trunk/type_lib_edtr/uinterfaceedit.lfm +++ b/wst/trunk/type_lib_edtr/uinterfaceedit.lfm @@ -12,8 +12,9 @@ object fInterfaceEdit: TfInterfaceEdit ClientWidth = 531 OnCreate = FormCreate Position = poDesktopCenter - LCLVersion = '0.9.25' + LCLVersion = '0.9.29' object Panel1: TPanel + Left = 0 Height = 50 Top = 514 Width = 531 @@ -46,7 +47,9 @@ object fInterfaceEdit: TfInterfaceEdit end end object PC: TPageControl + Left = 0 Height = 514 + Top = 0 Width = 531 ActivePage = TabSheet1 Align = alClient @@ -66,7 +69,7 @@ object fInterfaceEdit: TfInterfaceEdit end object edtName: TEdit Left = 60 - Height = 23 + Height = 21 Top = 26 Width = 443 Anchors = [akTop, akLeft, akRight] @@ -83,7 +86,9 @@ object fInterfaceEdit: TfInterfaceEdit ClientWidth = 480 TabOrder = 1 object trvMethods: TTreeView + Left = 0 Height = 350 + Top = 0 Width = 480 Align = alClient DefaultItemHeight = 15 @@ -135,30 +140,25 @@ object fInterfaceEdit: TfInterfaceEdit top = 200 object actOK: TAction Caption = 'OK' - DisableIfNoHandler = True OnExecute = actOKExecute OnUpdate = actOKUpdate end object actNewMethod: TAction Caption = 'New operation' - DisableIfNoHandler = True OnExecute = actNewMethodExecute end object actUpdateOperation: TAction Caption = 'Edit Operation' - DisableIfNoHandler = True OnExecute = actUpdateOperationExecute OnUpdate = actUpdateOperationUpdate end object actDeleteOperation: TAction Caption = 'Delete Operation' - DisableIfNoHandler = True OnExecute = actDeleteOperationExecute OnUpdate = actUpdateOperationUpdate end object actBindingEdit: TAction Caption = 'Edit Binding' - DisableIfNoHandler = True OnExecute = actBindingEditExecute OnUpdate = actBindingEditUpdate end diff --git a/wst/trunk/type_lib_edtr/uinterfaceedit.lrs b/wst/trunk/type_lib_edtr/uinterfaceedit.lrs index d4f39d138..192cfdcb8 100644 --- a/wst/trunk/type_lib_edtr/uinterfaceedit.lrs +++ b/wst/trunk/type_lib_edtr/uinterfaceedit.lrs @@ -1,57 +1,54 @@ -{ Ceci est un fichier ressource généré automatiquement par Lazarus } - LazarusResources.Add('TfInterfaceEdit','FORMDATA',[ 'TPF0'#15'TfInterfaceEdit'#14'fInterfaceEdit'#4'Left'#3'i'#1#6'Height'#3'4'#2 +#3'Top'#3'%'#1#5'Width'#3#19#2#18'HorzScrollBar.Page'#3#18#2#18'VertScrollBa' +'r.Page'#3'3'#2#13'ActiveControl'#7#7'Button1'#11'BorderStyle'#7#13'bsSizeTo' +'olWin'#7'Caption'#6#14'fInterfaceEdit'#12'ClientHeight'#3'4'#2#11'ClientWid' +'th'#3#19#2#8'OnCreate'#7#10'FormCreate'#8'Position'#7#15'poDesktopCenter'#10 - +'LCLVersion'#6#6'0.9.25'#0#6'TPanel'#6'Panel1'#6'Height'#2'2'#3'Top'#3#2#2#5 - +'Width'#3#19#2#5'Align'#7#8'alBottom'#12'ClientHeight'#2'2'#11'ClientWidth'#3 - +#19#2#8'TabOrder'#2#0#0#7'TButton'#7'Button1'#4'Left'#3#180#1#6'Height'#2#25 - +#3'Top'#2#10#5'Width'#2'K'#7'Anchors'#11#5'akTop'#7'akRight'#0#25'BorderSpac' - +'ing.InnerBorder'#2#4#6'Cancel'#9#7'Caption'#6#6'Cancel'#11'ModalResult'#2#2 - +#8'TabOrder'#2#0#0#0#7'TButton'#7'Button2'#4'Left'#3'Z'#1#6'Height'#2#25#3'T' - +'op'#2#10#5'Width'#2'K'#6'Action'#7#5'actOK'#7'Anchors'#11#5'akTop'#7'akRigh' - +'t'#0#25'BorderSpacing.InnerBorder'#2#4#7'Default'#9#8'TabOrder'#2#1#0#0#0#12 - +'TPageControl'#2'PC'#6'Height'#3#2#2#5'Width'#3#19#2#10'ActivePage'#7#9'TabS' - +'heet1'#5'Align'#7#8'alClient'#8'TabIndex'#2#0#8'TabOrder'#2#1#0#9'TTabSheet' - +#9'TabSheet1'#7'Caption'#6#20'Interface definition'#12'ClientHeight'#3#232#1 - +#11'ClientWidth'#3#11#2#0#6'TLabel'#6'Label1'#4'Left'#2#20#6'Height'#2#14#3 - +'Top'#2#26#5'Width'#2#28#7'Caption'#6#4'Name'#11'ParentColor'#8#0#0#5'TEdit' - +#7'edtName'#4'Left'#2'<'#6'Height'#2#23#3'Top'#2#26#5'Width'#3#187#1#7'Ancho' - +'rs'#11#5'akTop'#6'akLeft'#7'akRight'#0#8'TabOrder'#2#0#0#0#9'TGroupBox'#9'G' - +'roupBox1'#4'Left'#2#20#6'Height'#3'p'#1#3'Top'#2'J'#5'Width'#3#228#1#7'Anch' - +'ors'#11#5'akTop'#6'akLeft'#7'akRight'#8'akBottom'#0#7'Caption'#6#11' Metho' - +'ds '#12'ClientHeight'#3'^'#1#11'ClientWidth'#3#224#1#8'TabOrder'#2#1#0#9'T' - +'TreeView'#10'trvMethods'#6'Height'#3'^'#1#5'Width'#3#224#1#5'Align'#7#8'alC' - +'lient'#17'DefaultItemHeight'#2#15#9'PopupMenu'#7#10'PopupMenu1'#8'TabOrder' - +#2#0#0#0#0#7'TButton'#7'Button3'#4'Left'#2#20#6'Height'#2#25#3'Top'#3#194#1#5 - +'Width'#2'c'#6'Action'#7#12'actNewMethod'#25'BorderSpacing.InnerBorder'#2#4#8 - +'TabOrder'#2#2#0#0#7'TButton'#7'Button4'#4'Left'#3#132#0#6'Height'#2#25#3'To' - +'p'#3#194#1#5'Width'#2'k'#6'Action'#7#18'actUpdateOperation'#25'BorderSpacin' - +'g.InnerBorder'#2#4#8'TabOrder'#2#3#0#0#7'TButton'#7'Button5'#4'Left'#3#252#0 - +#6'Height'#2#25#3'Top'#3#194#1#5'Width'#2'h'#6'Action'#7#18'actDeleteOperati' - +'on'#25'BorderSpacing.InnerBorder'#2#4#8'TabOrder'#2#4#0#0#7'TButton'#7'Butt' - +'on6'#4'Left'#3#140#1#6'Height'#2#25#3'Top'#3#194#1#5'Width'#2'k'#6'Action'#7 - +#14'actBindingEdit'#7'Anchors'#11#5'akTop'#7'akRight'#0#25'BorderSpacing.Inn' - +'erBorder'#2#4#8'TabOrder'#2#5#0#0#0#0#11'TActionList'#2'AL'#4'left'#3#130#0 - +#3'top'#3#200#0#0#7'TAction'#5'actOK'#7'Caption'#6#2'OK'#18'DisableIfNoHandl' - +'er'#9#9'OnExecute'#7#12'actOKExecute'#8'OnUpdate'#7#11'actOKUpdate'#0#0#7'T' - +'Action'#12'actNewMethod'#7'Caption'#6#13'New operation'#18'DisableIfNoHandl' - +'er'#9#9'OnExecute'#7#19'actNewMethodExecute'#0#0#7'TAction'#18'actUpdateOpe' - +'ration'#7'Caption'#6#14'Edit Operation'#18'DisableIfNoHandler'#9#9'OnExecut' - +'e'#7#25'actUpdateOperationExecute'#8'OnUpdate'#7#24'actUpdateOperationUpdat' - +'e'#0#0#7'TAction'#18'actDeleteOperation'#7'Caption'#6#16'Delete Operation' - +#18'DisableIfNoHandler'#9#9'OnExecute'#7#25'actDeleteOperationExecute'#8'OnU' - +'pdate'#7#24'actUpdateOperationUpdate'#0#0#7'TAction'#14'actBindingEdit'#7'C' - +'aption'#6#12'Edit Binding'#18'DisableIfNoHandler'#9#9'OnExecute'#7#21'actBi' - +'ndingEditExecute'#8'OnUpdate'#7#20'actBindingEditUpdate'#0#0#0#10'TPopupMen' - +'u'#10'PopupMenu1'#4'left'#2'T'#3'top'#3#233#0#0#9'TMenuItem'#9'MenuItem1'#6 - +'Action'#7#12'actNewMethod'#7'OnClick'#7#19'actNewMethodExecute'#0#0#9'TMenu' - +'Item'#9'MenuItem2'#6'Action'#7#18'actUpdateOperation'#7'OnClick'#7#25'actUp' - +'dateOperationExecute'#0#0#9'TMenuItem'#9'MenuItem3'#6'Action'#7#18'actDelet' - +'eOperation'#7'OnClick'#7#25'actDeleteOperationExecute'#0#0#9'TMenuItem'#9'M' - +'enuItem4'#7'Caption'#6#1'-'#0#0#9'TMenuItem'#9'MenuItem5'#6'Action'#7#14'ac' - +'tBindingEdit'#7'OnClick'#7#21'actBindingEditExecute'#0#0#0#0 + +'LCLVersion'#6#6'0.9.29'#0#6'TPanel'#6'Panel1'#4'Left'#2#0#6'Height'#2'2'#3 + +'Top'#3#2#2#5'Width'#3#19#2#5'Align'#7#8'alBottom'#12'ClientHeight'#2'2'#11 + +'ClientWidth'#3#19#2#8'TabOrder'#2#0#0#7'TButton'#7'Button1'#4'Left'#3#180#1 + +#6'Height'#2#25#3'Top'#2#10#5'Width'#2'K'#7'Anchors'#11#5'akTop'#7'akRight'#0 + +#25'BorderSpacing.InnerBorder'#2#4#6'Cancel'#9#7'Caption'#6#6'Cancel'#11'Mod' + +'alResult'#2#2#8'TabOrder'#2#0#0#0#7'TButton'#7'Button2'#4'Left'#3'Z'#1#6'He' + +'ight'#2#25#3'Top'#2#10#5'Width'#2'K'#6'Action'#7#5'actOK'#7'Anchors'#11#5'a' + +'kTop'#7'akRight'#0#25'BorderSpacing.InnerBorder'#2#4#7'Default'#9#8'TabOrde' + +'r'#2#1#0#0#0#12'TPageControl'#2'PC'#4'Left'#2#0#6'Height'#3#2#2#3'Top'#2#0#5 + +'Width'#3#19#2#10'ActivePage'#7#9'TabSheet1'#5'Align'#7#8'alClient'#8'TabInd' + +'ex'#2#0#8'TabOrder'#2#1#0#9'TTabSheet'#9'TabSheet1'#7'Caption'#6#20'Interfa' + +'ce definition'#12'ClientHeight'#3#232#1#11'ClientWidth'#3#11#2#0#6'TLabel'#6 + +'Label1'#4'Left'#2#20#6'Height'#2#14#3'Top'#2#26#5'Width'#2#28#7'Caption'#6#4 + +'Name'#11'ParentColor'#8#0#0#5'TEdit'#7'edtName'#4'Left'#2'<'#6'Height'#2#21 + +#3'Top'#2#26#5'Width'#3#187#1#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#0#8 + +'TabOrder'#2#0#0#0#9'TGroupBox'#9'GroupBox1'#4'Left'#2#20#6'Height'#3'p'#1#3 + +'Top'#2'J'#5'Width'#3#228#1#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#8'ak' + +'Bottom'#0#7'Caption'#6#11' Methods '#12'ClientHeight'#3'^'#1#11'ClientWid' + +'th'#3#224#1#8'TabOrder'#2#1#0#9'TTreeView'#10'trvMethods'#4'Left'#2#0#6'Hei' + +'ght'#3'^'#1#3'Top'#2#0#5'Width'#3#224#1#5'Align'#7#8'alClient'#17'DefaultIt' + +'emHeight'#2#15#9'PopupMenu'#7#10'PopupMenu1'#8'TabOrder'#2#0#0#0#0#7'TButto' + +'n'#7'Button3'#4'Left'#2#20#6'Height'#2#25#3'Top'#3#194#1#5'Width'#2'c'#6'Ac' + +'tion'#7#12'actNewMethod'#25'BorderSpacing.InnerBorder'#2#4#8'TabOrder'#2#2#0 + +#0#7'TButton'#7'Button4'#4'Left'#3#132#0#6'Height'#2#25#3'Top'#3#194#1#5'Wid' + +'th'#2'k'#6'Action'#7#18'actUpdateOperation'#25'BorderSpacing.InnerBorder'#2 + +#4#8'TabOrder'#2#3#0#0#7'TButton'#7'Button5'#4'Left'#3#252#0#6'Height'#2#25#3 + +'Top'#3#194#1#5'Width'#2'h'#6'Action'#7#18'actDeleteOperation'#25'BorderSpac' + +'ing.InnerBorder'#2#4#8'TabOrder'#2#4#0#0#7'TButton'#7'Button6'#4'Left'#3#140 + +#1#6'Height'#2#25#3'Top'#3#194#1#5'Width'#2'k'#6'Action'#7#14'actBindingEdit' + +#7'Anchors'#11#5'akTop'#7'akRight'#0#25'BorderSpacing.InnerBorder'#2#4#8'Tab' + +'Order'#2#5#0#0#0#0#11'TActionList'#2'AL'#4'left'#3#130#0#3'top'#3#200#0#0#7 + +'TAction'#5'actOK'#7'Caption'#6#2'OK'#9'OnExecute'#7#12'actOKExecute'#8'OnUp' + +'date'#7#11'actOKUpdate'#0#0#7'TAction'#12'actNewMethod'#7'Caption'#6#13'New' + +' operation'#9'OnExecute'#7#19'actNewMethodExecute'#0#0#7'TAction'#18'actUpd' + +'ateOperation'#7'Caption'#6#14'Edit Operation'#9'OnExecute'#7#25'actUpdateOp' + +'erationExecute'#8'OnUpdate'#7#24'actUpdateOperationUpdate'#0#0#7'TAction'#18 + +'actDeleteOperation'#7'Caption'#6#16'Delete Operation'#9'OnExecute'#7#25'act' + +'DeleteOperationExecute'#8'OnUpdate'#7#24'actUpdateOperationUpdate'#0#0#7'TA' + +'ction'#14'actBindingEdit'#7'Caption'#6#12'Edit Binding'#9'OnExecute'#7#21'a' + +'ctBindingEditExecute'#8'OnUpdate'#7#20'actBindingEditUpdate'#0#0#0#10'TPopu' + +'pMenu'#10'PopupMenu1'#4'left'#2'T'#3'top'#3#233#0#0#9'TMenuItem'#9'MenuItem' + +'1'#6'Action'#7#12'actNewMethod'#7'OnClick'#7#19'actNewMethodExecute'#0#0#9 + +'TMenuItem'#9'MenuItem2'#6'Action'#7#18'actUpdateOperation'#7'OnClick'#7#25 + +'actUpdateOperationExecute'#0#0#9'TMenuItem'#9'MenuItem3'#6'Action'#7#18'act' + +'DeleteOperation'#7'OnClick'#7#25'actDeleteOperationExecute'#0#0#9'TMenuItem' + +#9'MenuItem4'#7'Caption'#6#1'-'#0#0#9'TMenuItem'#9'MenuItem5'#6'Action'#7#14 + +'actBindingEdit'#7'OnClick'#7#21'actBindingEditExecute'#0#0#0#0 ]); diff --git a/wst/trunk/type_lib_edtr/uinterfaceedit.pas b/wst/trunk/type_lib_edtr/uinterfaceedit.pas index a8e05c18e..e20a33257 100644 --- a/wst/trunk/type_lib_edtr/uinterfaceedit.pas +++ b/wst/trunk/type_lib_edtr/uinterfaceedit.pas @@ -99,7 +99,7 @@ var begin node := trvMethods.Selected; locObj := TPasProcedure(node.Data); - edit_helper.UpdateObject(locObj,FSymbolTable); + edit_helper.UpdateObject(TPasElement(locObj),FSymbolTable); trvMethods.BeginUpdate(); try newNode := FindPainter(locObj).Paint(FSymbolTable,locObj,node.Parent); @@ -171,7 +171,7 @@ var begin node := trvMethods.Selected; locObj := TwstBinding(node.Data); - edit_helper.UpdateObject(locObj,FSymbolTable); + edit_helper.UpdateObject(TPasElement(locObj),FSymbolTable); trvMethods.BeginUpdate(); try newNode := FindPainter(locObj).Paint(FSymbolTable,locObj,node.Parent); diff --git a/wst/trunk/type_lib_edtr/uprocedit.lfm b/wst/trunk/type_lib_edtr/uprocedit.lfm index 2346282a6..e506d4983 100644 --- a/wst/trunk/type_lib_edtr/uprocedit.lfm +++ b/wst/trunk/type_lib_edtr/uprocedit.lfm @@ -9,9 +9,11 @@ object fProcEdit: TfProcEdit ClientHeight = 543 ClientWidth = 522 Position = poMainFormCenter - LCLVersion = '0.9.26.2' + LCLVersion = '0.9.29' object PageControl1: TPageControl + Left = 0 Height = 493 + Top = 0 Width = 522 ActivePage = TabSheet1 Align = alClient @@ -31,7 +33,7 @@ object fProcEdit: TfProcEdit end object edtName: TEdit Left = 112 - Height = 23 + Height = 21 Top = 26 Width = 388 Anchors = [akTop, akLeft, akRight] @@ -49,7 +51,9 @@ object fProcEdit: TfProcEdit ClientWidth = 485 TabOrder = 3 object edtParams: TListView + Left = 0 Height = 286 + Top = 0 Width = 485 Align = alClient Columns = < @@ -76,7 +80,7 @@ object fProcEdit: TfProcEdit Left = 12 Height = 17 Top = 74 - Width = 94 + Width = 97 Caption = 'Function returns' OnClick = edtFunctionClick OnEditingDone = edtFunctionEditingDone @@ -125,6 +129,7 @@ object fProcEdit: TfProcEdit end end object Panel1: TPanel + Left = 0 Height = 50 Top = 493 Width = 522 @@ -161,24 +166,20 @@ object fProcEdit: TfProcEdit top = 241 object actOk: TAction Caption = 'OK' - DisableIfNoHandler = True OnExecute = actOkExecute OnUpdate = actOkUpdate end object actNewArg: TAction Caption = 'New Argument' - DisableIfNoHandler = True OnExecute = actNewArgExecute end object actUpdateArgument: TAction Caption = 'Edit Argument' - DisableIfNoHandler = True OnExecute = actUpdateArgumentExecute OnUpdate = actUpdateArgumentUpdate end object actDeleteArgument: TAction Caption = 'Delete Argument' - DisableIfNoHandler = True OnExecute = actDeleteArgumentExecute OnUpdate = actUpdateArgumentUpdate end diff --git a/wst/trunk/type_lib_edtr/uprocedit.lrs b/wst/trunk/type_lib_edtr/uprocedit.lrs index f3f8abb48..2cc22043d 100644 --- a/wst/trunk/type_lib_edtr/uprocedit.lrs +++ b/wst/trunk/type_lib_edtr/uprocedit.lrs @@ -4,51 +4,50 @@ LazarusResources.Add('TfProcEdit','FORMDATA',[ 'TPF0'#10'TfProcEdit'#9'fProcEdit'#4'Left'#3'"'#1#6'Height'#3#31#2#3'Top'#2'v' +#5'Width'#3#10#2#13'ActiveControl'#7#7'edtName'#11'BorderStyle'#7#13'bsSizeT' +'oolWin'#7'Caption'#6#9'fProcEdit'#12'ClientHeight'#3#31#2#11'ClientWidth'#3 - +#10#2#8'Position'#7#16'poMainFormCenter'#10'LCLVersion'#6#8'0.9.26.2'#0#12'T' - +'PageControl'#12'PageControl1'#6'Height'#3#237#1#5'Width'#3#10#2#10'ActivePa' - +'ge'#7#9'TabSheet1'#5'Align'#7#8'alClient'#8'TabIndex'#2#0#8'TabOrder'#2#0#0 - +#9'TTabSheet'#9'TabSheet1'#7'Caption'#6#10'&Operation'#12'ClientHeight'#3#211 - +#1#11'ClientWidth'#3#2#2#0#6'TLabel'#6'Label1'#4'Left'#2#12#6'Height'#2#14#3 - +'Top'#2#26#5'Width'#2#28#7'Caption'#6#4'Name'#11'ParentColor'#8#0#0#5'TEdit' - +#7'edtName'#4'Left'#2'p'#6'Height'#2#23#3'Top'#2#26#5'Width'#3#132#1#7'Ancho' - +'rs'#11#5'akTop'#6'akLeft'#7'akRight'#0#8'TabOrder'#2#0#4'Text'#6#7'edtName' - +#0#0#9'TGroupBox'#9'GroupBox1'#4'Left'#2#11#6'Height'#3'0'#1#3'Top'#2'r'#5'W' - +'idth'#3#233#1#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#8'akBottom'#0#7'C' - +'aption'#6#15' Parametters '#12'ClientHeight'#3#30#1#11'ClientWidth'#3#229 - +#1#8'TabOrder'#2#3#0#9'TListView'#9'edtParams'#6'Height'#3#30#1#5'Width'#3 - +#229#1#5'Align'#7#8'alClient'#7'Columns'#14#1#7'Caption'#6#4'Name'#5'Width'#3 - +#180#0#0#1#7'Caption'#6#4'Type'#5'Width'#3#190#0#0#1#7'Caption'#6#8'Modifier' - +#5'Width'#2'<'#0#1#0#0#9'RowSelect'#9#8'TabOrder'#2#0#9'ViewStyle'#7#8'vsRep' - +'ort'#0#0#0#9'TCheckBox'#11'edtFunction'#4'Left'#2#12#6'Height'#2#17#3'Top'#2 - +'J'#5'Width'#2'^'#7'Caption'#6#16'Function returns'#7'OnClick'#7#16'edtFunct' - +'ionClick'#13'OnEditingDone'#7#22'edtFunctionEditingDone'#8'TabOrder'#2#1#0#0 - +#9'TComboBox'#13'edtResultType'#4'Left'#2'p'#6'Height'#2#21#3'Top'#2'J'#5'Wi' - +'dth'#3#132#1#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#0#10'ItemHeight'#2 - +#13#5'Style'#7#14'csDropDownList'#8'TabOrder'#2#2#0#0#7'TButton'#7'Button3'#4 - +'Left'#2#12#6'Height'#2#25#3'Top'#3#173#1#5'Width'#2'l'#6'Action'#7#9'actNew' - +'Arg'#7'Anchors'#11#6'akLeft'#8'akBottom'#0#25'BorderSpacing.InnerBorder'#2#4 - +#8'TabOrder'#2#4#0#0#7'TButton'#7'Button4'#4'Left'#3#132#0#6'Height'#2#25#3 - +'Top'#3#173#1#5'Width'#2'l'#6'Action'#7#17'actUpdateArgument'#7'Anchors'#11#6 - +'akLeft'#8'akBottom'#0#25'BorderSpacing.InnerBorder'#2#4#8'TabOrder'#2#5#0#0 - +#7'TButton'#7'Button5'#4'Left'#3#248#0#6'Height'#2#25#3'Top'#3#173#1#5'Width' - +#2'l'#6'Action'#7#17'actDeleteArgument'#7'Anchors'#11#6'akLeft'#8'akBottom'#0 - +#25'BorderSpacing.InnerBorder'#2#4#8'TabOrder'#2#6#0#0#0#0#6'TPanel'#6'Panel' - +'1'#6'Height'#2'2'#3'Top'#3#237#1#5'Width'#3#10#2#5'Align'#7#8'alBottom'#12 - +'ClientHeight'#2'2'#11'ClientWidth'#3#10#2#8'TabOrder'#2#1#0#7'TButton'#7'Bu' - +'tton1'#4'Left'#3'X'#1#6'Height'#2#25#3'Top'#2#11#5'Width'#2'K'#6'Action'#7#5 - +'actOk'#7'Anchors'#11#5'akTop'#7'akRight'#0#25'BorderSpacing.InnerBorder'#2#4 - +#7'Default'#9#8'TabOrder'#2#0#0#0#7'TButton'#7'Button2'#4'Left'#3#176#1#6'He' - +'ight'#2#25#3'Top'#2#11#5'Width'#2'K'#7'Anchors'#11#5'akTop'#7'akRight'#0#25 - +'BorderSpacing.InnerBorder'#2#4#6'Cancel'#9#7'Caption'#6#6'Cancel'#11'ModalR' - +'esult'#2#2#8'TabOrder'#2#1#0#0#0#11'TActionList'#2'AL'#4'left'#3#198#0#3'to' - +'p'#3#241#0#0#7'TAction'#5'actOk'#7'Caption'#6#2'OK'#18'DisableIfNoHandler'#9 - +#9'OnExecute'#7#12'actOkExecute'#8'OnUpdate'#7#11'actOkUpdate'#0#0#7'TAction' - +#9'actNewArg'#7'Caption'#6#12'New Argument'#18'DisableIfNoHandler'#9#9'OnExe' - +'cute'#7#16'actNewArgExecute'#0#0#7'TAction'#17'actUpdateArgument'#7'Caption' - +#6#13'Edit Argument'#18'DisableIfNoHandler'#9#9'OnExecute'#7#24'actUpdateArg' - +'umentExecute'#8'OnUpdate'#7#23'actUpdateArgumentUpdate'#0#0#7'TAction'#17'a' - +'ctDeleteArgument'#7'Caption'#6#15'Delete Argument'#18'DisableIfNoHandler'#9 - +#9'OnExecute'#7#24'actDeleteArgumentExecute'#8'OnUpdate'#7#23'actUpdateArgum' - +'entUpdate'#0#0#0#10'TPopupMenu'#10'PopupMenu1'#4'left'#2'S'#3'top'#3#217#0#0 - +#0#0 + +#10#2#8'Position'#7#16'poMainFormCenter'#10'LCLVersion'#6#6'0.9.29'#0#12'TPa' + +'geControl'#12'PageControl1'#4'Left'#2#0#6'Height'#3#237#1#3'Top'#2#0#5'Widt' + +'h'#3#10#2#10'ActivePage'#7#9'TabSheet1'#5'Align'#7#8'alClient'#8'TabIndex'#2 + +#0#8'TabOrder'#2#0#0#9'TTabSheet'#9'TabSheet1'#7'Caption'#6#10'&Operation'#12 + +'ClientHeight'#3#211#1#11'ClientWidth'#3#2#2#0#6'TLabel'#6'Label1'#4'Left'#2 + +#12#6'Height'#2#14#3'Top'#2#26#5'Width'#2#28#7'Caption'#6#4'Name'#11'ParentC' + +'olor'#8#0#0#5'TEdit'#7'edtName'#4'Left'#2'p'#6'Height'#2#21#3'Top'#2#26#5'W' + +'idth'#3#132#1#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#0#8'TabOrder'#2#0 + +#4'Text'#6#7'edtName'#0#0#9'TGroupBox'#9'GroupBox1'#4'Left'#2#11#6'Height'#3 + +'0'#1#3'Top'#2'r'#5'Width'#3#233#1#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRigh' + +'t'#8'akBottom'#0#7'Caption'#6#15' Parametters '#12'ClientHeight'#3#30#1#11 + +'ClientWidth'#3#229#1#8'TabOrder'#2#3#0#9'TListView'#9'edtParams'#4'Left'#2#0 + +#6'Height'#3#30#1#3'Top'#2#0#5'Width'#3#229#1#5'Align'#7#8'alClient'#7'Colum' + +'ns'#14#1#7'Caption'#6#4'Name'#5'Width'#3#180#0#0#1#7'Caption'#6#4'Type'#5'W' + +'idth'#3#190#0#0#1#7'Caption'#6#8'Modifier'#5'Width'#2'<'#0#1#0#0#9'RowSelec' + +'t'#9#8'TabOrder'#2#0#9'ViewStyle'#7#8'vsReport'#0#0#0#9'TCheckBox'#11'edtFu' + +'nction'#4'Left'#2#12#6'Height'#2#17#3'Top'#2'J'#5'Width'#2'a'#7'Caption'#6 + +#16'Function returns'#7'OnClick'#7#16'edtFunctionClick'#13'OnEditingDone'#7 + +#22'edtFunctionEditingDone'#8'TabOrder'#2#1#0#0#9'TComboBox'#13'edtResultTyp' + +'e'#4'Left'#2'p'#6'Height'#2#21#3'Top'#2'J'#5'Width'#3#132#1#7'Anchors'#11#5 + +'akTop'#6'akLeft'#7'akRight'#0#10'ItemHeight'#2#13#5'Style'#7#14'csDropDownL' + +'ist'#8'TabOrder'#2#2#0#0#7'TButton'#7'Button3'#4'Left'#2#12#6'Height'#2#25#3 + +'Top'#3#173#1#5'Width'#2'l'#6'Action'#7#9'actNewArg'#7'Anchors'#11#6'akLeft' + +#8'akBottom'#0#25'BorderSpacing.InnerBorder'#2#4#8'TabOrder'#2#4#0#0#7'TButt' + +'on'#7'Button4'#4'Left'#3#132#0#6'Height'#2#25#3'Top'#3#173#1#5'Width'#2'l'#6 + +'Action'#7#17'actUpdateArgument'#7'Anchors'#11#6'akLeft'#8'akBottom'#0#25'Bo' + +'rderSpacing.InnerBorder'#2#4#8'TabOrder'#2#5#0#0#7'TButton'#7'Button5'#4'Le' + +'ft'#3#248#0#6'Height'#2#25#3'Top'#3#173#1#5'Width'#2'l'#6'Action'#7#17'actD' + +'eleteArgument'#7'Anchors'#11#6'akLeft'#8'akBottom'#0#25'BorderSpacing.Inner' + +'Border'#2#4#8'TabOrder'#2#6#0#0#0#0#6'TPanel'#6'Panel1'#4'Left'#2#0#6'Heigh' + +'t'#2'2'#3'Top'#3#237#1#5'Width'#3#10#2#5'Align'#7#8'alBottom'#12'ClientHeig' + +'ht'#2'2'#11'ClientWidth'#3#10#2#8'TabOrder'#2#1#0#7'TButton'#7'Button1'#4'L' + +'eft'#3'X'#1#6'Height'#2#25#3'Top'#2#11#5'Width'#2'K'#6'Action'#7#5'actOk'#7 + +'Anchors'#11#5'akTop'#7'akRight'#0#25'BorderSpacing.InnerBorder'#2#4#7'Defau' + +'lt'#9#8'TabOrder'#2#0#0#0#7'TButton'#7'Button2'#4'Left'#3#176#1#6'Height'#2 + +#25#3'Top'#2#11#5'Width'#2'K'#7'Anchors'#11#5'akTop'#7'akRight'#0#25'BorderS' + +'pacing.InnerBorder'#2#4#6'Cancel'#9#7'Caption'#6#6'Cancel'#11'ModalResult'#2 + +#2#8'TabOrder'#2#1#0#0#0#11'TActionList'#2'AL'#4'left'#3#198#0#3'top'#3#241#0 + +#0#7'TAction'#5'actOk'#7'Caption'#6#2'OK'#9'OnExecute'#7#12'actOkExecute'#8 + +'OnUpdate'#7#11'actOkUpdate'#0#0#7'TAction'#9'actNewArg'#7'Caption'#6#12'New' + +' Argument'#9'OnExecute'#7#16'actNewArgExecute'#0#0#7'TAction'#17'actUpdateA' + +'rgument'#7'Caption'#6#13'Edit Argument'#9'OnExecute'#7#24'actUpdateArgument' + +'Execute'#8'OnUpdate'#7#23'actUpdateArgumentUpdate'#0#0#7'TAction'#17'actDel' + +'eteArgument'#7'Caption'#6#15'Delete Argument'#9'OnExecute'#7#24'actDeleteAr' + +'gumentExecute'#8'OnUpdate'#7#23'actUpdateArgumentUpdate'#0#0#0#10'TPopupMen' + +'u'#10'PopupMenu1'#4'left'#2'S'#3'top'#3#217#0#0#0#0 ]); diff --git a/wst/trunk/type_lib_edtr/uprocedit.pas b/wst/trunk/type_lib_edtr/uprocedit.pas index 66e1ca059..b99d568ed 100644 --- a/wst/trunk/type_lib_edtr/uprocedit.pas +++ b/wst/trunk/type_lib_edtr/uprocedit.pas @@ -151,7 +151,7 @@ begin itm := edtParams.ItemFocused; if Assigned(itm) then begin prp := TPasArgument(itm.Data); - if edit_helper.UpdateObject(prp,FSymbolTable) then begin + if edit_helper.UpdateObject(TPasElement(prp),FSymbolTable) then begin itm.Free(); LoadArgument(prp); end;