paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-08-27 15:25:07 +02:00
Code Issues Packages Projects Releases Wiki Activity

designer rename component: ifdefed workaround, added rtl include path rtl/srcos2/targetcpu

Browse Source 
git-svn-id: trunk@9286 -
This commit is contained in:
mattias 2006-05-16 13:08:41 +00:00
parent fd6b25b4f0
commit 8ec5b0aee6
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
components/codetools/definetemplates.pas
View File

@ -3384,8 +3384,10 @@ begin
+';'+Dir+'rtl'+DS+SrcOS+DS;
if (TargetOS<>SrcOS) then
s:=s+';'+Dir+'rtl'+DS+TargetOS+DS;
if (SrcOS2<>'') and (SrcOS2<>SrcOS) then
s:=s+';'+Dir+'rtl'+DS+SrcOS2+DS;
if (SrcOS2<>'') and (SrcOS2<>SrcOS) then begin
s:=s+';'+Dir+'rtl'+DS+SrcOS2+DS
+';'+Dir+'rtl'+DS+SrcOS2+DS+TargetProcessor;
end;
s:=s
+';'+Dir+'rtl'+DS+TargetProcessor+DS
+';'+Dir+'rtl'+DS+TargetOS+DS+TargetProcessor+DS;

4
designer/designer.pp
View File

@ -1996,12 +1996,14 @@ end;
procedure TDesigner.ValidateRename(AComponent: TComponent;
const CurName, NewName: string);
{$IFDEF VER2_0_2}
procedure RaiseInvalidName(ConflictComponent: TComponent);
begin
raise EComponentError.Create(Format(
lisDesThereIsAlreadyAnotherComponentWithTheName, ['"',
ConflictComponent.Name, '"']));
end;
{$ENDIF}
var
i: Integer;
@ -2012,6 +2014,7 @@ begin
or ((AComponent<>nil) and (csDestroying in AComponent.ComponentState)) then
exit;
{$IFDEF VER2_0_2}
// check, if there is already such a component
for i:=0 to FLookupRoot.ComponentCount-1 do begin
CurComponent:=FLookupRoot.Components[i];
@ -2021,6 +2024,7 @@ begin
RaiseInvalidName(CurComponent);
end;
end;
{$ENDIF}
// check if component is the LookupRoot
if AComponent=nil then AComponent:=FLookupRoot;