paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-11-05 02:49:47 +01:00
Code Issues Packages Projects Releases Wiki Activity

* reverted parts of r13852 (removed +/- with sets and added include/exclude)

Browse Source 
git-svn-id: trunk@13873 -
This commit is contained in:
ivost 2009-10-16 17:34:50 +00:00
parent 045ba4a1af
commit 3cfcdb2ab9
1 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
rtl/objpas/classes/compon.inc
View File

@ -107,7 +107,7 @@ begin
begin begin
FFreeNotifies.Free; FFreeNotifies.Free;
FFreeNotifies:=nil; FFreeNotifies:=nil;
FComponentState := FComponentState - [csFreeNotification]; Exclude(FComponentState, csFreeNotification);
end; end;
end; end;
end; end;
@ -224,13 +224,13 @@ end;
Procedure TComponent.Loaded; Procedure TComponent.Loaded;
begin begin
FComponentState := FComponentState - [csLoading]; Exclude(FComponentState, csLoading);
end; end;
Procedure TComponent.Loading; Procedure TComponent.Loading;
begin begin
FComponentState := FComponentState + [csLoading]; Include(FComponentState, csLoading);
end; end;
@ -247,7 +247,7 @@ begin
begin begin
FFreeNotifies.Free; FFreeNotifies.Free;
FFreenotifies:=Nil; FFreenotifies:=Nil;
FComponentState := FComponentState - [csFreeNotification]; Exclude(FComponentState, csFreeNotification);
end; end;
end; end;
{ disabled this code: do we really have to notify the child components also? Each observer { disabled this code: do we really have to notify the child components also? Each observer
@ -276,9 +276,9 @@ Var Runner : Longint;
begin begin
If Value then If Value then
FComponentState := FComponentState + [csAncestor] Include(FComponentState, csAncestor)
else else
FComponentState := FComponentState - [csAncestor]; Exclude(FComponentState, csAncestor);
if Assigned(FComponents) then if Assigned(FComponents) then
For Runner:=0 To FComponents.Count-1 do For Runner:=0 To FComponents.Count-1 do
TComponent(FComponents.Items[Runner]).SetAncestor(Value); TComponent(FComponents.Items[Runner]).SetAncestor(Value);
@ -291,9 +291,9 @@ Var Runner : Longint;
begin begin
If Value then If Value then
FComponentState := FComponentState + [csDesigning] Include(FComponentState, csDesigning)
else else
FComponentState := FComponentState - [csDesigning]; Exclude(FComponentState, csDesigning);
if Assigned(FComponents) and SetChildren then if Assigned(FComponents) and SetChildren then
For Runner:=0 To FComponents.Count - 1 do For Runner:=0 To FComponents.Count - 1 do
TComponent(FComponents.items[Runner]).SetDesigning(Value); TComponent(FComponents.items[Runner]).SetDesigning(Value);
@ -303,18 +303,18 @@ Procedure TComponent.SetDesignInstance(Value: Boolean);
begin begin
If Value then If Value then
FComponentState := FComponentState + [csDesignInstance] Exclude(FComponentState, csDesignInstance)
else else
FComponentState := FComponentState - [csDesignInstance]; Include(FComponentState, csDesignInstance);
end; end;
Procedure TComponent.SetInline(Value: Boolean); Procedure TComponent.SetInline(Value: Boolean);
begin begin
If Value then If Value then
FComponentState := FComponentState + [csInline] Exclude(FComponentState, csInline)
else else
FComponentState := FComponentState - [csInline]; Include(FComponentState, csInline);
end; end;
@ -351,14 +351,14 @@ end;
Procedure TComponent.Updating; Procedure TComponent.Updating;
begin begin
FComponentState := FComponentState + [csUpdating]; Include(FComponentState, csUpdating);
end; end;
Procedure TComponent.Updated; Procedure TComponent.Updated;
begin begin
FComponentState := FComponentState - [csUpdating]; Exclude(FComponentState, csUpdating);
end; end;
@ -452,7 +452,7 @@ Var Runner : longint;
begin begin
If csDestroying in FComponentstate Then Exit; If csDestroying in FComponentstate Then Exit;
FComponentState := FComponentState + [csDestroying]; Include(FComponentState, csDestroying);
If Assigned(FComponents) then If Assigned(FComponents) then
for Runner:=0 to FComponents.Count-1 do for Runner:=0 to FComponents.Count-1 do
TComponent(FComponents.Items[Runner]).Destroying; TComponent(FComponents.Items[Runner]).Destroying;
@ -498,7 +498,7 @@ begin
If not Assigned(FFreeNotifies) then If not Assigned(FFreeNotifies) then
begin begin
FFreeNotifies:=TList.Create; FFreeNotifies:=TList.Create;
FComponentState := FComponentState + [csFreeNotification]; Include(FComponentState, csFreeNotification);
end; end;
If FFreeNotifies.IndexOf(AComponent)=-1 then If FFreeNotifies.IndexOf(AComponent)=-1 then
begin begin
@ -571,9 +571,9 @@ end;
procedure TComponent.SetSubComponent(ASubComponent: Boolean); procedure TComponent.SetSubComponent(ASubComponent: Boolean);
begin begin
if ASubComponent then if ASubComponent then
FComponentStyle := FComponentStyle + [csSubComponent] Include(FComponentStyle, csSubComponent)
else else
FComponentStyle := FComponentStyle - [csSubComponent]; Exclude(FComponentStyle, csSubComponent);
end; end;