diff --git a/wst/trunk/type_lib_edtr/typ_lib_edtr.lpi b/wst/trunk/type_lib_edtr/typ_lib_edtr.lpi
index bd66143e9..9fc2aa506 100644
--- a/wst/trunk/type_lib_edtr/typ_lib_edtr.lpi
+++ b/wst/trunk/type_lib_edtr/typ_lib_edtr.lpi
@@ -95,6 +95,7 @@
+
@@ -130,6 +131,7 @@
+
diff --git a/wst/trunk/type_lib_edtr/uargedit.lfm b/wst/trunk/type_lib_edtr/uargedit.lfm
index 2eef1f607..d563354ec 100644
--- a/wst/trunk/type_lib_edtr/uargedit.lfm
+++ b/wst/trunk/type_lib_edtr/uargedit.lfm
@@ -3,14 +3,13 @@ object fArgEdit: TfArgEdit
Height = 393
Top = 180
Width = 400
- HorzScrollBar.Page = 399
- VertScrollBar.Page = 392
ActiveControl = Button1
BorderStyle = bsSizeToolWin
Caption = 'fArgEdit'
ClientHeight = 393
ClientWidth = 400
Position = poMainFormCenter
+ LCLVersion = '0.9.26.2'
object Panel1: TPanel
Height = 50
Top = 343
@@ -85,9 +84,7 @@ object fArgEdit: TfArgEdit
Top = 114
Width = 352
Anchors = [akTop, akLeft, akRight]
- AutoCompleteText = [cbactEndOfLineComplete, cbactSearchAscending]
ItemHeight = 13
- MaxLength = 0
Style = csDropDownList
TabOrder = 1
end
diff --git a/wst/trunk/type_lib_edtr/uargedit.lrs b/wst/trunk/type_lib_edtr/uargedit.lrs
index 75a7b9c8f..51c079fab 100644
--- a/wst/trunk/type_lib_edtr/uargedit.lrs
+++ b/wst/trunk/type_lib_edtr/uargedit.lrs
@@ -1,39 +1,40 @@
+{ Ceci est un fichier ressource généré automatiquement par Lazarus }
+
LazarusResources.Add('TfArgEdit','FORMDATA',[
'TPF0'#9'TfArgEdit'#8'fArgEdit'#4'Left'#3#243#2#6'Height'#3#137#1#3'Top'#3#180
- +#0#5'Width'#3#144#1#18'HorzScrollBar.Page'#3#143#1#18'VertScrollBar.Page'#3
- +#136#1#13'ActiveControl'#7#7'Button1'#11'BorderStyle'#7#13'bsSizeToolWin'#7
- +'Caption'#6#8'fArgEdit'#12'ClientHeight'#3#137#1#11'ClientWidth'#3#144#1#8'P'
- +'osition'#7#16'poMainFormCenter'#0#6'TPanel'#6'Panel1'#6'Height'#2'2'#3'Top'
- +#3'W'#1#5'Width'#3#144#1#5'Align'#7#8'alBottom'#12'ClientHeight'#2'2'#11'Cli'
- +'entWidth'#3#144#1#8'TabOrder'#2#0#0#7'TButton'#7'Button1'#4'Left'#3#224#0#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'TabOrd'
- +'er'#2#0#0#0#7'TButton'#7'Button2'#4'Left'#3'8'#1#6'Height'#2#25#3'Top'#2#10
- +#5'Width'#2'K'#7'Anchors'#11#5'akTop'#7'akRight'#0#25'BorderSpacing.InnerBor'
- +'der'#2#4#6'Cancel'#9#7'Caption'#6#6'Cancel'#11'ModalResult'#2#2#8'TabOrder'
- +#2#1#0#0#0#12'TPageControl'#12'PageControl1'#6'Height'#3'W'#1#5'Width'#3#144
- +#1#10'ActivePage'#7#9'TabSheet1'#5'Align'#7#8'alClient'#8'TabIndex'#2#0#8'Ta'
- +'bOrder'#2#1#0#9'TTabSheet'#9'TabSheet1'#7'Caption'#6#8'Argument'#12'ClientH'
- +'eight'#3'='#1#11'ClientWidth'#3#136#1#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#6'TLabel'#6'Label2'#4'Left'#2#20#6'Height'#2#14#3'Top'#2'_'#5'Width'#2
- +#25#7'Caption'#6#4'Type'#11'ParentColor'#8#0#0#5'TEdit'#7'edtName'#4'Left'#2
- +#20#6'Height'#2#23#3'Top'#2'/'#5'Width'#3'`'#1#7'Anchors'#11#5'akTop'#6'akLe'
- +'ft'#7'akRight'#0#8'TabOrder'#2#0#4'Text'#6#7'edtName'#0#0#9'TComboBox'#7'ed'
- +'tType'#4'Left'#2#20#6'Height'#2#21#3'Top'#2'r'#5'Width'#3'`'#1#7'Anchors'#11
- +#5'akTop'#6'akLeft'#7'akRight'#0#16'AutoCompleteText'#11#22'cbactEndOfLineCo'
- +'mplete'#20'cbactSearchAscending'#0#10'ItemHeight'#2#13#9'MaxLength'#2#0#5'S'
- +'tyle'#7#14'csDropDownList'#8'TabOrder'#2#1#0#0#11'TRadioGroup'#11'edtModifi'
- +'er'#4'Left'#2#20#6'Height'#3#133#0#3'Top'#3#157#0#5'Width'#3'`'#1#7'Anchors'
- +#11#5'akTop'#6'akLeft'#7'akRight'#8'akBottom'#0#8'AutoFill'#9#7'Caption'#6#12
- +' Modifier '#28'ChildSizing.LeftRightSpacing'#2#6#28'ChildSizing.TopBottom'
- +'Spacing'#2#6#29'ChildSizing.EnlargeHorizontal'#7#24'crsHomogenousChildResiz'
- +'e'#27'ChildSizing.EnlargeVertical'#7#24'crsHomogenousChildResize'#28'ChildS'
- +'izing.ShrinkHorizontal'#7#14'crsScaleChilds'#26'ChildSizing.ShrinkVertical'
- +#7#14'crsScaleChilds'#18'ChildSizing.Layout'#7#29'cclLeftToRightThenTopToBot'
- +'tom'#27'ChildSizing.ControlsPerLine'#2#2#12'ClientHeight'#2's'#11'ClientWid'
- +'th'#3'\'#1#7'Columns'#2#2#13'Items.Strings'#1#6#7'Default'#6#5'Const'#6#3'V'
- +'ar'#6#3'Out'#0#8'TabOrder'#2#2#0#0#0#0#11'TActionList'#2'AL'#4'left'#3#152#0
- +#3'top'#3#213#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#0#0
+ +#0#5'Width'#3#144#1#13'ActiveControl'#7#7'Button1'#11'BorderStyle'#7#13'bsSi'
+ +'zeToolWin'#7'Caption'#6#8'fArgEdit'#12'ClientHeight'#3#137#1#11'ClientWidth'
+ +#3#144#1#8'Position'#7#16'poMainFormCenter'#10'LCLVersion'#6#8'0.9.26.2'#0#6
+ +'TPanel'#6'Panel1'#6'Height'#2'2'#3'Top'#3'W'#1#5'Width'#3#144#1#5'Align'#7#8
+ +'alBottom'#12'ClientHeight'#2'2'#11'ClientWidth'#3#144#1#8'TabOrder'#2#0#0#7
+ +'TButton'#7'Button1'#4'Left'#3#224#0#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.I'
+ +'nnerBorder'#2#4#7'Default'#9#8'TabOrder'#2#0#0#0#7'TButton'#7'Button2'#4'Le'
+ +'ft'#3'8'#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'Can'
+ +'cel'#11'ModalResult'#2#2#8'TabOrder'#2#1#0#0#0#12'TPageControl'#12'PageCont'
+ +'rol1'#6'Height'#3'W'#1#5'Width'#3#144#1#10'ActivePage'#7#9'TabSheet1'#5'Ali'
+ +'gn'#7#8'alClient'#8'TabIndex'#2#0#8'TabOrder'#2#1#0#9'TTabSheet'#9'TabSheet'
+ +'1'#7'Caption'#6#8'Argument'#12'ClientHeight'#3'='#1#11'ClientWidth'#3#136#1
+ +#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#6'TLabel'#6'Label2'#4'Left'#2#20
+ +#6'Height'#2#14#3'Top'#2'_'#5'Width'#2#25#7'Caption'#6#4'Type'#11'ParentColo'
+ +'r'#8#0#0#5'TEdit'#7'edtName'#4'Left'#2#20#6'Height'#2#23#3'Top'#2'/'#5'Widt'
+ +'h'#3'`'#1#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#0#8'TabOrder'#2#0#4'T'
+ +'ext'#6#7'edtName'#0#0#9'TComboBox'#7'edtType'#4'Left'#2#20#6'Height'#2#21#3
+ +'Top'#2'r'#5'Width'#3'`'#1#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#0#10
+ +'ItemHeight'#2#13#5'Style'#7#14'csDropDownList'#8'TabOrder'#2#1#0#0#11'TRadi'
+ +'oGroup'#11'edtModifier'#4'Left'#2#20#6'Height'#3#133#0#3'Top'#3#157#0#5'Wid'
+ +'th'#3'`'#1#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#8'akBottom'#0#8'Auto'
+ +'Fill'#9#7'Caption'#6#12' Modifier '#28'ChildSizing.LeftRightSpacing'#2#6
+ +#28'ChildSizing.TopBottomSpacing'#2#6#29'ChildSizing.EnlargeHorizontal'#7#24
+ +'crsHomogenousChildResize'#27'ChildSizing.EnlargeVertical'#7#24'crsHomogenou'
+ +'sChildResize'#28'ChildSizing.ShrinkHorizontal'#7#14'crsScaleChilds'#26'Chil'
+ +'dSizing.ShrinkVertical'#7#14'crsScaleChilds'#18'ChildSizing.Layout'#7#29'cc'
+ +'lLeftToRightThenTopToBottom'#27'ChildSizing.ControlsPerLine'#2#2#12'ClientH'
+ +'eight'#2's'#11'ClientWidth'#3'\'#1#7'Columns'#2#2#13'Items.Strings'#1#6#7'D'
+ +'efault'#6#5'Const'#6#3'Var'#6#3'Out'#0#8'TabOrder'#2#2#0#0#0#0#11'TActionLi'
+ +'st'#2'AL'#4'left'#3#152#0#3'top'#3#213#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#0#0
]);
diff --git a/wst/trunk/type_lib_edtr/uargedit.pas b/wst/trunk/type_lib_edtr/uargedit.pas
index 01c9c05ae..da3a00ce7 100644
--- a/wst/trunk/type_lib_edtr/uargedit.pas
+++ b/wst/trunk/type_lib_edtr/uargedit.pas
@@ -71,16 +71,18 @@ var
i : Integer;
locArg : TPasArgument;
argList : TList;
+ locName : string;
begin
- b := ( not IsStrEmpty(edtName.Text) ) and
+ locName := edtName.Text;
+ b := ( not IsStrEmpty(locName) ) and
( edtType.ItemIndex > -1 );
if b then begin
argList := TPasProcedureType(FObject.Parent).Args;
for i := 0 to Pred(argList.Count) do begin
locArg := TPasArgument(argList[i]);
if ( locArg <> FObject ) and
- ( AnsiSameText(locArg.Name,FObject.Name) or
- AnsiSameText(FSymbolTable.GetExternalName(locArg),FSymbolTable.GetExternalName(FObject))
+ ( AnsiSameText(locArg.Name,locName) or
+ AnsiSameText(FSymbolTable.GetExternalName(locArg),locName)
)
then begin
b := False;
diff --git a/wst/trunk/type_lib_edtr/uprocedit.lrs b/wst/trunk/type_lib_edtr/uprocedit.lrs
index 488eda67f..b5f96392a 100644
--- a/wst/trunk/type_lib_edtr/uprocedit.lrs
+++ b/wst/trunk/type_lib_edtr/uprocedit.lrs
@@ -1,5 +1,3 @@
-{ Ceci est un fichier ressource généré automatiquement par Lazarus }
-
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'
diff --git a/wst/trunk/type_lib_edtr/uprocedit.pas b/wst/trunk/type_lib_edtr/uprocedit.pas
index 9c77681d0..7e52d81a0 100644
--- a/wst/trunk/type_lib_edtr/uprocedit.pas
+++ b/wst/trunk/type_lib_edtr/uprocedit.pas
@@ -130,7 +130,7 @@ begin
if ( locProc <> FObject ) and
( AnsiSameText(locProc.Name,locName) or
( ( Self.UpdateType = etUpdate ) and
- AnsiSameText(FSymbolTable.GetExternalName(locProc),FSymbolTable.GetExternalName(FObject))
+ AnsiSameText(FSymbolTable.GetExternalName(locProc),locName)
)
)
then begin
diff --git a/wst/trunk/type_lib_edtr/view_helper.pas b/wst/trunk/type_lib_edtr/view_helper.pas
index 13ac96ff6..228fdf091 100644
--- a/wst/trunk/type_lib_edtr/view_helper.pas
+++ b/wst/trunk/type_lib_edtr/view_helper.pas
@@ -772,9 +772,9 @@ begin
for j := 0 to Pred(memberList.Count) do begin
pmr := TPasArgument(memberList[j]);
ss := AccessNames[pmr.Access];
- if ( Length(ss) > 0 ) then begin
- ss := ss + ' ' + AContainer.GetExternalName(pmr);
- end;
+ if ( Length(ss) > 0 ) then
+ ss := ss + ' ';
+ ss := ss + AContainer.GetExternalName(pmr);
AddChildNode(Result,ss);
end;
if locMthd.InheritsFrom(TPasFunction) then begin