paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-09-04 18:20:34 +02:00
Code Issues Packages Projects Releases Wiki Activity

fixed typos: childs

Browse Source 
git-svn-id: trunk@29440 -
This commit is contained in:
mattias 2011-02-10 09:37:16 +00:00
parent a8498808d1
commit b3a8dd03b1
51 changed files with 171 additions and 171 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
components/codetools/codetree.pas
View File

@ -104,9 +104,9 @@ const
ctnProperty = 50; // child of visibility section or AllClassInterfaces
ctnMethodMap = 51; // child of visibility section or AllClassInterfaces
ctnProcedure = 60; // childs: ctnProcedureHead, sections, ctnBeginBlock/ctnAsmBlock
ctnProcedureHead = 61; // childs: ctnParameterList, operator: ctnVarDefinition, operator/function: ctnResultType
ctnParameterList = 62; // childs: ctnVarDefinition
ctnProcedure = 60; // children: ctnProcedureHead, sections, ctnBeginBlock/ctnAsmBlock
ctnProcedureHead = 61; // children: ctnParameterList, operator: ctnVarDefinition, operator/function: ctnResultType
ctnParameterList = 62; // children: ctnVarDefinition
ctnIdentifier = 70;
ctnRangedArrayType = 71;

14
components/codetools/definetemplates.pas
View File

@ -3027,7 +3027,7 @@ begin
else
Result:=NewNode;
LastNewNode:=NewNode;
// copy childs
// copy children
if WithChilds and (ANode.FirstChild<>nil) then begin
NewNode:=ANode.FirstChild.CreateCopy(OnlyMarked,true,true);
if NewNode<>nil then
@ -3087,7 +3087,7 @@ begin
end;
IndexedPath:=Path+'Node'+IntToStr(i)+'/';
DefTempl.LoadValuesFromXMLConfig(XMLConfig,IndexedPath,WithMergeInfo);
// load childs
// load children
if XMLConfig.GetValue(IndexedPath+'Count/Value',0)>0 then begin
NewChild:=TDefineTemplate.Create;
DefTempl.AddChild(NewChild);
@ -3178,7 +3178,7 @@ begin
inc(Index);
IndexedPath:=Path+'Node'+IntToStr(Index)+'/';
DefTempl.SaveValuesToXMLConfig(XMLConfig,IndexedPath,WithMergeInfo);
// save childs
// save children
if DefTempl.FFirstChild<>nil then
DefTempl.FirstChild.SaveToXMLConfig(XMLConfig,IndexedPath,
true,OnlyMarked,
@ -3207,7 +3207,7 @@ begin
DefTempl.MergeNameBehind:=DefTempl.Next.Name
else
DefTempl.MergeNameBehind:='';
// update childs
// update children
if DefTempl.FFirstChild<>nil then
DefTempl.FirstChild.CreateMergeInfo(true,OnlyMarked);
end;
@ -3315,7 +3315,7 @@ begin
FirstSibling:=FirstSibling.Prior;
while LastSibling.Next<>nil do
LastSibling:=LastSibling.Next;
// merge childs
// merge children
MergeTemplates(NewNode,NewNode.FFirstChild,NewNode.FLastChild,
SrcNode.FirstChild,true,NewNamePrefix);
if not WithSiblings then break;
@ -4245,7 +4245,7 @@ var
procedure CalculateIfChilds;
begin
// execute childs
// execute children
CalculateTemplate(DefTempl.FirstChild,CurPath);
// jump to end of else templates
while (DefTempl.Next<>nil)
@ -4366,7 +4366,7 @@ var
end;
da_Else:
// execute childs
// execute children
begin
if Assigned(OnCalculate) then
OnCalculate(Self,DefTempl,false,'',false,'',true);

2
components/codetools/directivestree.pas
View File

@ -2541,7 +2541,7 @@ begin
or ((Result.EndPos=p) and (Result.NextBrother<>nil)
and (Result.NextBrother.StartPos>p))
then begin
// p is in range of Result => check childs
// p is in range of Result => check children
if (Result.FirstChild=nil)
or (Result.FirstChild.StartPos>p) then
exit;

4
components/codetools/finddeclarationtool.pas
View File

@ -2990,7 +2990,7 @@ var
ctnClassInheritance:
// these codetreenodes build a parent-child-relationship, but
// for pascal it is only a range, hence after searching in the
// childs of the last node, search must continue in the childs
// children of the last node, search must continue in the children
// of the prior node
;
@ -3111,7 +3111,7 @@ begin
ctnParameterList:
// these nodes build a parent-child relationship. But in pascal
// they just define a range and not a context.
// -> search in all childs
// -> search in all children
MoveContextNodeToChilds;
ctnTypeDefinition, ctnVarDefinition, ctnConstDefinition,

16
components/codetools/h2pastool.pas
View File

@ -1409,7 +1409,7 @@ begin
PascalCode:=ChildNode.PascalName+': record';
W(PascalCode);
IncIndent;
// write childs
// write children
W('case longint of');
IncIndent;
NoNameCount:=0;
@ -1852,7 +1852,7 @@ var
EndIfNode: TH2PDirectiveNode;
begin
if (Node.H2PNode<>nil) and (Node.H2PNode.FirstChild<>nil) then begin
raise Exception.Create('TH2PasTool.DeleteDirectiveNode: inconsistency: a directive can not have H2P childs');
raise Exception.Create('TH2PasTool.DeleteDirectiveNode: inconsistency: a directive can not have H2P children');
end;
DebugLn(['TH2PasTool.DeleteDirectiveNode ',Node.DescAsString(CTool)]);
@ -1891,19 +1891,19 @@ begin
end;
end;
// delete or move childs
// delete or move children
if Node.FirstChild<>nil then begin
if DeleteChilds then begin
// delete directive childs
// delete directive children
while Node.FirstChild<>nil do begin
DeleteDirectiveNode(TH2PDirectiveNode(Node.FirstChild),true,false);
end;
end else begin
// keep childs
// => move directive childs one level up (in front of Node)
// keep children
// => move directive children one level up (in front of Node)
if (Node.Desc<>h2pdnIf) and (Node.Desc<>h2pdnIfDef) and (Node.Desc<>h2pdnIfNDef)
then
raise Exception.Create('TH2PasTool.DeleteDirectiveNode: inconsistency: can not move childs in front');
raise Exception.Create('TH2PasTool.DeleteDirectiveNode: inconsistency: can not move children in front');
DirectivesTree.MoveChildsInFront(Node);
end;
end;
@ -1935,7 +1935,7 @@ begin
FPascalNames.Remove(Node);
if Node.CName<>'' then
FCNames.Remove(Node);
// delete childs
// delete children
while Node.FirstChild<>nil do
DeleteH2PNode(TH2PNode(Node.FirstChild));
// delete directives

6
components/codetools/laz_dom.pas
View File

@ -972,7 +972,7 @@ begin
if (FChildNodeTree=nil) then begin
// there is no childnodetree yet
// Most xml trees contains nodes with only a few child nodes. It would be
// overhead to create a tree for only a few childs.
// overhead to create a tree for only a few children.
ChildCount := 0;
ANode := FirstChild;
while Assigned(ANode) do begin
@ -981,7 +981,7 @@ begin
end;
if ChildCount>5 then begin
FChildNodeTree:=TAVLTree.Create(@CompareDOMNodeWithDOMNode);
// add all existing childs
// add all existing children
ANode := FirstChild;
NewNodeAdded:=false;
while Assigned(ANode) do begin
@ -1407,7 +1407,7 @@ destructor TDOMElement.Destroy;
var
i: Integer;
begin
{As the attributes are _not_ childs of the element node, we have to free
{As the attributes are _not_ children of the element node, we have to free
them manually here:}
if FAttributes<>nil then begin
for i := 0 to FAttributes.Count - 1 do

8
components/codetools/laz_xmlstreaming.pas
View File

@ -14,7 +14,7 @@
**********************************************************************}
{
Extended by Mattias Gaertner:
Reading/Writing childs, all kinds of properties,
Reading/Writing children, all kinds of properties,
custom properties (via DefineProperties).
}
unit Laz_XMLStreaming;
@ -656,7 +656,7 @@ begin
//writeln('TXMLObjectReader.ReadNextValue list: vaList');
Result:=vaList;
if (FElement.FirstChild is TDOMElement) then begin
// the list has childs
// the list has children
if not Stay then begin
FElement:=TDOMElement(FElement.FirstChild);
FElementPosition:=0;
@ -673,11 +673,11 @@ begin
Result:=vaNull;
if not Stay then begin
if (FElement.NextSibling is TDOMElement) then begin
//writeln('TXMLObjectReader.ReadNextValue list: end of childs, next list');
//writeln('TXMLObjectReader.ReadNextValue list: end of children, next list');
FElement:=TDOMElement(FElement.NextSibling);
FElementPosition:=0;
end else begin
//writeln('TXMLObjectReader.ReadNextValue list: end of childs, end of collection');
//writeln('TXMLObjectReader.ReadNextValue list: end of children, end of collection');
FElement:=FElement.ParentNode as TDOMElement;
FElementPosition:=0;
end;

2
components/education/eduoptions.pas
View File

@ -34,7 +34,7 @@ resourcestring
ersShowExtended = 'Show Extended';
ersShowMinimal = 'Show Minimal';
ersVisibleComponents = 'Visible components';
ersShowAllChilds = 'Show all childs';
ersShowAllChilds = 'Show all children';
ersIDEMenuItems = 'IDE menu items';
ersNewSingleFileProgram = 'New single file program';
ersNewSingleFileEducationProgram = 'New single file education program';

2
designer/controlselection.pp
View File

@ -2584,7 +2584,7 @@ var
if not ControlIsInDesignerVisible(AControl) then exit;
// check if control
if (MaxParentComponent is TWinControl) then begin
// select only controls, that are childs of MaxParentComponent
// select only controls, that are children of MaxParentComponent
if (not TWinControl(MaxParentComponent).IsParentOf(AControl)) then exit;
// check if control is a grand child
if (not EnvironmentOptions.RubberbandSelectsGrandChilds)

2
designer/designer.pp
View File

@ -2039,7 +2039,7 @@ var
// update non visual components
MoveNonVisualComponentsIntoForm;
// if user press the Control key, then component candidates are only
// childs of the control, where the mouse started
// children of the control, where the mouse started
if (ssCtrl in shift) then begin
if MouseDownComponent=Form then
MaxParentComponent:=FLookupRoot

2
docs/xml/fcl/fpcolhash.xml
View File

@ -59,7 +59,7 @@
<seealso/>
</element>
<!-- variable Visibility: default -->
<element name="TColHashMainNode.childs">
<element name="TColHashMainNode.children">
<short/>
<descr/>
<seealso/>

4
docs/xml/lcl/controls.xml
View File

@ -8334,7 +8334,7 @@ Reads message from flag area, or stores a message
C.Width=30 (total=60). If the Parent's client area has a ClientWidth of
120, then 60/3=20 is added to each Child.
If B has a maximum constraint width of 30, then first 10 is added to
all childs (A.Width=20, B.Width=30, C.Width=40). Then A and C
all children (A.Width=20, B.Width=30, C.Width=40). Then A and C
(20+40=60 and 30 pixel space left) will get 30/2=15 additional,
resulting in: A.Width=35, B.Width=30, C.Width=55 (35+30+55=120).
@ -10856,7 +10856,7 @@ End;
</element>
<!-- procedure Visibility: protected -->
<element name="TWinControl.ParentFormHandleInitialized">
<short>Called after all childs handles of the ParentForm are created. Tells all wincontrols about the final end of the handle creation phase</short>
<short>Called after all children handles of the ParentForm are created. Tells all wincontrols about the final end of the handle creation phase</short>
<descr/>
<errors/>
<seealso>

2
docs/xml/lcl/ldocktree.xml
View File

@ -924,7 +924,7 @@
3. No TLazDockSplitter. Control is the only child of a TLazDockPage
In this case the page will be deleted.
If the TLazDockPages has no childs left, it is recursively undocked.
If the TLazDockPages has no children left, it is recursively undocked.
4. No TLazDockSplitter, Control is the only child of a TLazDockForm.
The TLazDockForm is deleted and the Control is floated.

2
examples/anchordocking/anchordocking.pas
View File

@ -3485,7 +3485,7 @@ begin
end;
procedure TAnchorDockHostSite.MoveAllControls(dx, dy: integer);
// move all childs, except the sides that are anchored to parent left,top
// move all children, except the sides that are anchored to parent left,top
var
i: Integer;
Child: TControl;

2
examples/anchordocking/anchordockstorage.pas
View File

@ -1343,7 +1343,7 @@ var
i: Integer;
ChildNode: TAnchorDockLayoutTreeNode;
begin
// simplify childs
// simplify children
i:=Count-1;
while i>=0 do begin
ChildNode:=Nodes[i];

2
examples/designnonlcl/mywidgetdesigner.pas
View File

@ -187,7 +187,7 @@ procedure TMyWidgetMediator.Paint;
end;
// caption
TextOut(5,2,AWidget.Caption);
// childs
// children
if AWidget.ChildCount>0 then begin
SaveHandleState;
// clip client area

4
examples/designnonlcl/mywidgetset.pas
View File

@ -120,7 +120,7 @@ type
end;
{ TMyButton
A widget that does not allow childs at design time }
A widget that does not allow children at design time }
TMyButton = class(TMyWidget)
public
@ -128,7 +128,7 @@ type
end;
{ TMyGroupBox
A widget that does allow childs at design time }
A widget that does allow children at design time }
TMyGroupBox = class(TMyWidget)
end;

2
examples/listboxtest.pp
View File

@ -52,7 +52,7 @@ begin
Left := 200;
Top := 200;
// create childs
// create children
Button1 := TButton.Create(Self);
Button1.OnClick := @Button1Click;
Button1.Parent := Self;

2
examples/memotest.pp
View File

@ -55,7 +55,7 @@ begin
Left := 200;
Top := 200;
// create childs
// create children
Button5 := TButton.Create(Self);
Button5.OnClick := @button5click;
Button5.Parent := Self;

4
ide/codebrowser.pas
View File

@ -1169,7 +1169,7 @@ begin
end;
end;
// update ParserRoot item (childs will be updated on next Idle)
// update ParserRoot item (children will be updated on next Idle)
if FParserRoot=nil then begin
FParserRoot:=TCodeBrowserUnitList.Create(FWorkingParserRoot.Owner,nil);
inc(FScannedPackages);
@ -2063,7 +2063,7 @@ var
CTNode:=CTNode.Next;
ctnImplementation, ctnBeginBlock, ctnAsmBlock: break;
else
// skip childs and go to next sibling or parent
// skip children and go to next sibling or parent
CTNode:=CTNode.NextSkipChilds;
end;
end;

2
ide/codehelp.pas
View File

@ -625,7 +625,7 @@ begin
Result:='';
MemStream:=TMemoryStream.Create;
try
// write node with childs
// write node with children
WriteXML(Node,MemStream);
MemStream.Position:=0;
SetLength(Result,MemStream.Size);

2
ide/codetoolsdefines.pas
View File

@ -1345,7 +1345,7 @@ begin
// add in DefineTree
DefineTree.Add(NewTemplate);
end;
// add childs to TreeView
// add children to TreeView
AddChilds(NewTreeNode);
// show and select
SetNodeImages(NewTreeNode,true);

4
ideintf/docs/formeditingintf.xml
View File

@ -18,7 +18,7 @@
No override needed.</descr>
</element>
<element name="TDesignerMediator.CollectChildren">
<short>Used by GetChilds to add collected childs to add to FCollectedChilds.</short>
<short>Used by GetChilds to add collected children to add to FCollectedChilds.</short>
<descr>
<printshort id="TDesignerMediator.CollectChildren"/>
No override needed.</descr>
@ -88,7 +88,7 @@ The default implementation uses GetBounds. No override needed.
<descr>
<printshort id="TDesignerMediator.GetClientArea"/>
The default implementation uses GetBounds and assumes that a child component placed at 0,0 and the Width/Height of the component will completely overlap the component.
Override this if some of your components place childs with an offset like a TGroupBox.
Override this if some of your components place children with an offset like a TGroupBox.
</descr>
</element>
<element name="TDesignerMediator.GetComponentOriginOnForm">

2
ideintf/formeditingintf.pas
View File

@ -460,7 +460,7 @@ begin
Childs:=TFPList.Create;
try
GetChilds(Result,Childs);
//DebugLn(['TDesignerMediator.ComponentAtPos Result=',DbgSName(Result),' ChildCount=',childs.Count,' ClientArea=',dbgs(ClientArea)]);
//DebugLn(['TDesignerMediator.ComponentAtPos Result=',DbgSName(Result),' ChildCount=',children.Count,' ClientArea=',dbgs(ClientArea)]);
Found:=false;
// iterate backwards (z-order)
for i:=Childs.Count-1 downto 0 do begin

14
ideintf/menuintf.pas
View File

@ -120,9 +120,9 @@ type
{ TIDEMenuSection
An TIDEMenuItem with childs, either in a sub menu or separated with
An TIDEMenuItem with children, either in a sub menu or separated with
separators.
If no childs are visible, the section will not be visible.
If no children are visible, the section will not be visible.
}
{ TIDEMenuSection }
@ -216,7 +216,7 @@ type
{ TIDEMenuCommand
A leaf menu item. No childs.
A leaf menu item. No children.
Hint: The shortcut is defined via the Command property.
}
TIDEMenuCommand = class(TIDEMenuItem)
@ -950,7 +950,7 @@ var
// a separator at top is needed, if
// - this section is embedded (not ChildsAsSubMenu)
// - and this section is visible
// - and this section has visible childs
// - and this section has visible children
// - and there is a visible menu item in front
var
i: Integer;
@ -1016,7 +1016,7 @@ var
// a separator at bottom is needed, if
// - this section is imbedded (not ChildsAsSubMenu)
// - and this section is visible
// - and this section has visible childs
// - and this section has visible children
// - and there is a visible menu item behind and it has no top separator
var
ItemBehind: TIDEMenuItem;
@ -1119,7 +1119,7 @@ begin
if FTopSeparator<>nil then
inc(ContainerMenuIndex);
// update childs
// update children
if Visible then
for i:=0 to FInvalidChildStartIndex-1 do
inc(ContainerMenuIndex,Items[i].Size);
@ -1146,7 +1146,7 @@ begin
ContainerMenuItem.Insert(ContainerMenuIndex,Item.MenuItem);
end;
end;
// update grand childs
// update grand children
if CurSection<>nil then begin
CurSection:=TIDEMenuSection(Item);
CurSection.FInvalidChildStartIndex:=0;

8
ideintf/objectinspector.pp
View File

@ -1244,7 +1244,7 @@ begin
while (e<=length(PropPath)) and (PropPath[e]<>'.') do inc(e);
CurName:=uppercase(copy(PropPath,s,e-s));
s:=e+1;
// search name in childs
// search name in children
if CurParentRow=nil then
Result:=Rows[0]
else
@ -1770,7 +1770,7 @@ begin
CurRow := Rows[Index];
if (not CurRow.Expanded) then
Exit;
// calculate all childs (between StartIndex..EndIndex)
// calculate all children (between StartIndex..EndIndex)
StartIndex := CurRow.Index + 1;
EndIndex := FRows.Count - 1;
ARow := CurRow;
@ -3426,7 +3426,7 @@ begin
if IsSorted(Compare) then exit(false);
List:=TFPList.Create;
try
// create a TFPList of the childs
// create a TFPList of the children
List.Capacity:=ChildCount;
Item:=FirstChild;
while Item<>nil do begin
@ -4287,7 +4287,7 @@ begin
if (FPropertyEditorHook=nil) or (FPropertyEditorHook.LookupRoot=nil) then
exit;
if not (FPropertyEditorHook.LookupRoot is TComponent) then begin
// not a TComponent => no childs => select always only the root
// not a TComponent => no children => select always only the root
SetSelectedPersistent(FPropertyEditorHook.LookupRoot);
exit;
end;

2
ideintf/propedits.pp
View File

@ -6307,7 +6307,7 @@ begin
raise Exception.Create('invalid instance for this property editor');
Notebook:=TCustomNotebook(AComponent);
if Notebook.PageList.IndexOf(APersistent)<0 then
raise Exception.Create('only childs are allowed for this property');
raise Exception.Create('only children are allowed for this property');
end;
function TNoteBookActiveControlPropertyEditor.GetAttributes: TPropertyAttributes;

2
lcl/comctrls.pp
View File

@ -2053,7 +2053,7 @@ type
private
FOwner: TTreeNodes; // the object, which contains all nodes of the tree
FCapacity: integer; // size of FItems
FCount: integer; // # of first level childs in FItems
FCount: integer; // # of first level children in FItems
FData: Pointer; // custom data
FHeight: integer; // height in pixels
FImageIndex: TImageIndex;

42
lcl/controls.pp
View File

@ -1443,8 +1443,8 @@ type
{ TControlChildSizing }
{ LeftRightSpacing, TopBottomSpacing: integer;
minimum space between left client border and left most childs.
For example: ClientLeftRight=5 means childs Left position is at least 5.
minimum space between left client border and left most children.
For example: ClientLeftRight=5 means children Left position is at least 5.
HorizontalSpacing, VerticalSpacing: integer;
minimum space between each child horizontally
@ -1472,28 +1472,28 @@ type
Same for alRight, alTop, alBottom. (Always expand 3 sides).
Align=alClient. The control will fill the whole remaining space.
Setting two childs to Align=alClient does only make sense, if you set
Setting two children to Align=alClient does only make sense, if you set
maximum Constraints.
Order: First all alTop childs are resized, then alBottom, then alLeft,
Order: First all alTop children are resized, then alBottom, then alLeft,
then alRight and finally alClient.
cesScaleChilds, cssScaleChilds
Scale childs, keep space between them fixed.
Scale children, keep space between them fixed.
Childs are resized to their normal/adviced size. If there is some space
left in the client area of the parent, then the childs are scaled to
fill the space. You can set maximum Constraints. Then the other childs
left in the client area of the parent, then the children are scaled to
fill the space. You can set maximum Constraints. Then the other children
are scaled more.
For example: 3 child controls A, B, C with A.Width=10, B.Width=20 and
C.Width=30 (total=60). If the Parent's client area has a ClientWidth of
120, then the childs are scaled with Factor 2.
If B has a maximum constraint width of 30, then first the childs will be
120, then the children are scaled with Factor 2.
If B has a maximum constraint width of 30, then first the children will be
scaled with 1.5 (A.Width=15, B.Width=30, C.Width=45). Then A and C
(15+45=60 and 30 pixel space left) will be scaled by 1.5 again, to a
final result of: A.Width=23, B.Width=30, C.Width=67 (23+30+67=120).
cesHomogenousChildGrowth, cssHomogenousChildDecrease
Enlarge childs equally.
Enlarge children equally.
Childs are resized to their normal/adviced size. If there is some space
left in the client area of the parent, then the remaining space is
distributed equally to each child.
@ -1501,14 +1501,14 @@ type
C.Width=30 (total=60). If the Parent's client area has a ClientWidth of
120, then 60/3=20 is added to each Child.
If B has a maximum constraint width of 30, then first 10 is added to
all childs (A.Width=20, B.Width=30, C.Width=40). Then A and C
all children (A.Width=20, B.Width=30, C.Width=40). Then A and C
(20+40=60 and 30 pixel space left) will get 30/2=15 additional,
resulting in: A.Width=35, B.Width=30, C.Width=55 (35+30+55=120).
cesHomogenousSpaceGrowth
Enlarge space between childs equally.
Enlarge space between children equally.
Childs are resized to their normal/adviced size. If there is some space
left in the client area of the parent, then the space between the childs
left in the client area of the parent, then the space between the children
is expanded.
For example: 3 child controls A, B, C with A.Width=10, B.Width=20 and
C.Width=30 (total=60). If the Parent's client area has a ClientWidth of
@ -1518,9 +1518,9 @@ type
TChildControlResizeStyle = (
crsAnchorAligning, // (like Delphi)
crsScaleChilds, // scale childs, keep space between childs fixed
crsHomogenousChildResize, // enlarge childs equally (i.e. by the same amount of pixel)
crsHomogenousSpaceResize // enlarge space between childs equally
crsScaleChilds, // scale children, keep space between children fixed
crsHomogenousChildResize, // enlarge children equally (i.e. by the same amount of pixel)
crsHomogenousSpaceResize // enlarge space between children equally
);
TControlChildrenLayout = (
@ -1602,7 +1602,7 @@ type
wcfEraseBackground,
wcfCreatingHandle, // Set while constructing the handle of this control
wcfInitializing, // Set while initializing during handle creation
wcfCreatingChildHandles, // Set while constructing the handles of the childs
wcfCreatingChildHandles, // Set while constructing the handles of the children
wcfRealizingBounds, // Set inside RealizeBoundsRecursive
wcfBoundsRealized, // bounds were sent to the interface
wcfUpdateShowing,
@ -1850,7 +1850,7 @@ type
procedure FormEndUpdated; override;
procedure MainWndProc(var Msg: TLMessage);
procedure ParentFormHandleInitialized; override;
procedure ChildHandlesCreated; virtual;// called after childs handles are created
procedure ChildHandlesCreated; virtual;// called after children handles are created
procedure RealSetText(const AValue: TCaption); override;
procedure RemoveFocus(Removing: Boolean);
procedure SendMoveSizeMessages(SizeChanged, PosChanged: boolean); override;
@ -1925,7 +1925,7 @@ type
function GetChildsRect(Scrolled: boolean): TRect; override;
procedure DisableAlign;
procedure EnableAlign;
procedure ReAlign; // realign all childs
procedure ReAlign; // realign all children
procedure WriteLayoutDebugReport(const Prefix: string); override;
public
constructor Create(TheOwner: TComponent);override;
@ -2132,7 +2132,7 @@ type
Result: A new docktree will be created. Height of "A" will be resized to
the height of "B".
A splitter will be inserted between "A" and "B".
And all three are childs of the newly created TLazDockForm of the
And all three are children of the newly created TLazDockForm of the
newly created TDockTree.
+------------+
@ -2177,7 +2177,7 @@ type
|+-----+|
+-------+
Every DockZone has siblings and childs. Siblings can either be
Every DockZone has siblings and children. Siblings can either be
- horizontally (left to right, splitter),
- vertically (top to bottom, splitter)
- or upon each other (as pages, left to right).

2
lcl/include/buttons.inc
View File

@ -251,7 +251,7 @@ end;
function TCustomButton.ChildClassAllowed(ChildClass: TClass): boolean;
begin
// no childs
// no children
Result:=false;
end;

2
lcl/include/customedit.inc
View File

@ -413,7 +413,7 @@ end;
------------------------------------------------------------------------------}
function TCustomEdit.ChildClassAllowed(ChildClass: TClass): boolean;
begin
// no childs
// no children
Result := False;
end;

2
lcl/include/customform.inc
View File

@ -2514,7 +2514,7 @@ end;
{------------------------------------------------------------------------------
procedure TCustomForm.BeginFormUpdate;
Called after all childs handles are created.
Called after all children handles are created.
------------------------------------------------------------------------------}
procedure TCustomForm.ChildHandlesCreated;
begin

2
lcl/include/customnotebook.inc
View File

@ -919,7 +919,7 @@ begin
//DebugLn(['TCustomNotebook.ShowCurrentPage ',dbgsName(Self),' ',DbgSName(CurPage),' CurPage.Visible=',CurPage.Visible,' BoundsRect=',dbgs(BoundsRect),' ClientRect=',dbgs(ClientRect),' CurPage.BoundsRect=',dbgs(CurPage.BoundsRect),' CurPage.ClientRect=',dbgs(CurPage.ClientRect)]);
ReAlign;
// TCustomPage.IsControlVisible is overriden
// therefore AutoSizing of childs was skipped => do it now
// therefore AutoSizing of children was skipped => do it now
CurPage.ReAlign;
end;
end else

2
lcl/include/docktree.inc
View File

@ -34,7 +34,7 @@ procedure TDockTree.DeleteZone(Zone: TDockZone);
end;
begin
Traverse(Zone.FirstChild); // destroy all childs
Traverse(Zone.FirstChild); // destroy all children
Zone.Free; // destroy zone itself
end;

4
lcl/include/menuitem.inc
View File

@ -903,7 +903,7 @@ end;
{------------------------------------------------------------------------------
procedure TMenuItem.Clear;
Deletes all childs
Deletes all children
------------------------------------------------------------------------------}
procedure TMenuItem.Clear;
var
@ -1422,7 +1422,7 @@ end;
procedure TMenuItem.SubItemChanged(Sender: TObject; Source: TMenuItem;
Rebuild: Boolean);
Is Called whenever one of the childs has changed.
Is Called whenever one of the children has changed.
------------------------------------------------------------------------------}
procedure TMenuItem.SubItemChanged(Sender: TObject; Source: TMenuItem;
Rebuild: Boolean);

4
lcl/include/toolbar.inc
View File

@ -414,7 +414,7 @@ begin
if FUpdateCount > 0 then Exit;
if [csLoading, csDestroying] * ComponentState <> [] then Exit;
// set all childs to ButtonWidth ButtonHeight
// set all children to ButtonWidth ButtonHeight
BeginUpdate;
try
for i:=ControlCount-1 downto 0 do
@ -459,7 +459,7 @@ end;
procedure TToolBar.DoAutoSize;
begin
// childs are moved in ControlsAligned independent of AutoSize=true
// children are moved in ControlsAligned independent of AutoSize=true
end;
procedure TToolBar.CalculatePreferredSize(var PreferredWidth,

8
lcl/include/treeview.inc
View File

@ -282,7 +282,7 @@ begin
if Assigned(Owner) and Assigned(Owner.Owner) then
Owner.Owner.Delete(Self);
// delete childs
// delete children
HasChildren := false;
// unbind all references
Unbind;
@ -932,7 +932,7 @@ function TTreeNode.GetNext: TTreeNode;
begin
Result:=GetFirstChild;
if Result=nil then begin
// no childs, search next
// no children, search next
Result:=Self;
while (Result<>nil) and (Result.FNextBrother=nil) do
Result:=Result.Parent;
@ -958,7 +958,7 @@ end;
function TTreeNode.GetAbsoluteIndex: Integer;
// - first node has index 0
// - the first child of a node has an index one bigger than its parent
// - a node without childs has an index one bigger than its previous brother
// - a node without children has an index one bigger than its previous brother
var
ANode: TTreeNode;
begin
@ -1779,7 +1779,7 @@ begin
and (not MultiSelected) then
RaiseGDBException('');// selected, but not multiselected
// check childs
// check children
RealSubTreeCount:=1;
for i:=0 to FCount-1 do begin
if (Items[i]=nil) then RaiseGDBException('');

70
lcl/include/wincontrol.inc
View File

@ -131,7 +131,7 @@ type
{ TAutoSizeCtrlData
This class is used by the auto size algorithm, to compute the preferred
size of a control given the preferred sizes of its childs.
size of a control given the preferred sizes of its children.
Hints about the algorithm:
First it builds a graph of dependencies. That means, for every side
(Left,Top,Right,Bottom) of each child control the anchor control and
@ -908,7 +908,7 @@ begin
if not MoveNonAlignedChildrenTop then MoveDiff:=0;
DoMoveNonAlignedChildren(akTop,MoveDiff,false);
end else begin
// there is an automatic layout for non aligned childs
// there is an automatic layout for non aligned children
// use the layout engine, but with static values
ChildSizing:=nil;
Box:=nil;
@ -966,7 +966,7 @@ procedure TAutoSizeCtrlData.ComputePreferredClientArea(
MoveNonAlignedChildrenLeft, MoveNonAlignedChildrenTop: boolean; out
MoveNonAlignedToLeft, MoveNonAlignedToTop, PreferredClientWidth,
PreferredClientHeight: integer);
{ if MoveNonAlignedChilds=true then all non-aligned childs will be moved in
{ if MoveNonAlignedChilds=true then all non-aligned children will be moved in
parallel, so that at least one child is positioned left most and one child
is positioned top most.
@ -1104,7 +1104,7 @@ begin
if ChildCount=0 then exit;
// fix control properties
// check if there are visible childs
// check if there are visible children
VisibleCount:=0;
for i:=0 to ChildCount-1 do begin
Child:=WinControl.Controls[i];
@ -1156,7 +1156,7 @@ begin
WriteDebugReport('Space completed','');
{$ENDIF}
// calculate the needed positions for all childs
// calculate the needed positions for all children
until ComputePositions;
{$IFDEF VerboseAutoSizeCtrlData}
@ -1731,7 +1731,7 @@ var
CurSize: LongInt;
function GetChildTotalSize: integer;
// computes the total preferred size of all childs of this Orientation
// computes the total preferred size of all children of this Orientation
var
i: Integer;
Child: TAutoSizeBox;
@ -1750,8 +1750,8 @@ var
procedure GetChildMaxResize(out Factor: TResizeFactor;
out ResizeableCount: integer);
// returns the number of childs/gaps, that can grow (ResizeableCount)
// and the maximum factor, by which the childs/gaps can grow (TResizeFactor)
// returns the number of children/gaps, that can grow (ResizeableCount)
// and the maximum factor, by which the children/gaps can grow (TResizeFactor)
var
i: Integer;
CurScale: Double;
@ -1881,8 +1881,8 @@ var
procedure GetChildMinResize(out Factor: TResizeFactor;
out ResizeableCount: integer);
// returns the number of childs/gaps, that can shrink (ResizeableCount)
// and the maximum factor, by which the childs/gaps can shrink (TResizeFactor)
// returns the number of children/gaps, that can shrink (ResizeableCount)
// and the maximum factor, by which the children/gaps can shrink (TResizeFactor)
var
i: Integer;
CurScale: Double;
@ -2050,7 +2050,7 @@ begin
else
EnlargeStyle:=ChildSizing.EnlargeVertical;
while TargetSize>CurSize do begin
// shrink childs
// shrink children
GetChildMaxResize(MaxResizeFactorPerItem,ResizeableCount);
if (ResizeableCount=0) or (MaxResizeFactorPerItem.Offset=0) then break;
@ -2110,7 +2110,7 @@ end;
procedure TAutoSizeBox.AlignToRight(TargetWidth: integer);
function GetChildTotalSize(Orientation: TAutoSizeBoxOrientation): integer;
// computes the total preferred size of all childs of this Orientation
// computes the total preferred size of all children of this Orientation
var
i: Integer;
Child: TAutoSizeBox;
@ -2333,11 +2333,11 @@ var
o: TAutoSizeBoxOrientation;
i: Integer;
begin
// free all childs
// free all children
for o:=Low(TAutoSizeBoxOrientation) to high(TAutoSizeBoxOrientation) do
for i:=0 to ChildCount[o]-1 do
Childs[o][i].Free;
// free childs arrays
// free children arrays
for o:=Low(TAutoSizeBoxOrientation) to high(TAutoSizeBoxOrientation) do
ReallocMem(Childs[o],0);
end;
@ -3233,7 +3233,7 @@ end;
{-------------------------------------------------------------------------------
procedure TWinControl.DoAutoSize;
Shrink or enlarge to fit childs.
Shrink or enlarge to fit children.
-------------------------------------------------------------------------------}
procedure TWinControl.DoAutoSize;
var
@ -3241,11 +3241,11 @@ var
procedure GetMoveDiffForNonAlignedChilds(const CurClientRect: TRect;
out dx, dy: integer);
// how much can non-aligned-childs be moved up and left
// non-aligned-childs: no fixed anchoring or autosizing,
// how much can non-aligned-children be moved up and left
// non-aligned-children: no fixed anchoring or autosizing,
// (Align=alNone, visible, AnchorSide[].Control=nil)
// borderspacing is used
// e.g. dx=10 means all non-align-childs should be moved 10 pixels to the left
// e.g. dx=10 means all non-align-children should be moved 10 pixels to the left
var
NewClientWidth, NewClientHeight: integer;
Layout: TAutoSizeCtrlData;
@ -3313,16 +3313,16 @@ begin
WidthIsFixed:=WidthIsAnchored;
HeightIsFixed:=HeightIsAnchored;
// move free childs as much as possible to left and top (all free childs the same)
// move free children as much as possible to left and top (all free children the same)
if HasVisibleChilds then begin
CurClientRect:=GetLogicalClientRect;
AdjustClientRect(CurClientRect);
// get minimum left, top of non aligned childs
// get minimum left, top of non aligned children
GetMoveDiffForNonAlignedChilds(CurClientRect,dx,dy);
//DebugLn(['TWinControl.DoAutoSize ',DbgSName(Self),' CurClientRect=',dbgs(CurClientRect)]);
if (dx<>0) or (dy<>0) then begin
// move all free childs to left and top of client area
// move all free children to left and top of client area
//DebugLn(['TWinControl.DoAutoSize ',DbgSName(Self),' dx=',dbgs(dx),' dy=',dbgs(dy),' CurClientRect=',dbgs(CurClientRect),' CurAnchors=',dbgs(CurAnchors),' IsFixed: w=',WidthIsFixed,' h=',HeightIsFixed]);
for I := 0 to ControlCount - 1 do begin
AControl:=Controls[I];
@ -3432,7 +3432,7 @@ procedure TWinControl.DoAllAutoSize;
var
i: Integer;
begin
// first make the childs visible
// first make the children visible
if AWinControl.FControls<>nil then
for i:=0 to AWinControl.FControls.Count-1 do
if TObject(AWinControl.FControls[i]) is TWinControl then
@ -3720,7 +3720,7 @@ end;
Normally the clientwidth/clientheight is adjusted automatically by the
interface. But it is up to interface when this will be done. The gtk for
example just puts resize requests into a queue. The LCL would resize the
childs just after this procedure due to the clientrect. On complex forms with
children just after this procedure due to the clientrect. On complex forms with
lots of nested controls, this would result in thousands of resizes.
Changing the clientrect in the LCL to the most probable size reduces
unneccessary resizes.
@ -4094,7 +4094,7 @@ begin
begin
if HandleAllocated and TWinControl(AChild).HandleAllocated then
begin
// ignore childs without handle
// ignore children without handle
WinControls:=TFPList.Create;
try
for i:=FControls.Count-1 downto 0 do
@ -4556,13 +4556,13 @@ begin
end
else
begin
// do query wincontrol childs, in case they overlap
// do query wincontrol children, in case they overlap
Control := ControlAtPos(SmallPointToPoint(MouseMessage.Pos),
[capfAllowWinControls]);
if Control is TWinControl then
begin
// there is a TWinControl child at this position
// TWinControl childs get their own messages
// TWinControl children get their own messages
// => ignore here
Control := nil;
end;
@ -5071,7 +5071,7 @@ begin
end;
Result := LControl;
// check recursive sub childs
// check recursive sub children
if (capfRecursive in Flags) and (Result is TWinControl) and
(TWinControl(Result).ControlCount > 0) then
begin
@ -5990,7 +5990,7 @@ end;
{------------------------------------------------------------------------------
TWinControl ReAlign
Realign all childs
Realign all children
------------------------------------------------------------------------------}
procedure TWinControl.ReAlign;
begin
@ -6067,13 +6067,13 @@ end;
function TWinControl.IsClientHeightStored: boolean;
begin
// The ClientHeight is needed to restore childs anchored akBottom
// The ClientHeight is needed to restore children anchored akBottom
Result:=ControlCount>0;
end;
function TWinControl.IsClientWidthStored: boolean;
begin
// The ClientWidth is needed to restore childs anchored akRight
// The ClientWidth is needed to restore children anchored akRight
Result:=ControlCount>0;
end;
@ -7417,7 +7417,7 @@ end;
{------------------------------------------------------------------------------
procedure TWinControl.ParentFormHandleInitialized;
Called after all childs handles of the ParentForm are created.
Called after all children handles of the ParentForm are created.
------------------------------------------------------------------------------}
procedure TWinControl.ParentFormHandleInitialized;
var
@ -7435,7 +7435,7 @@ end;
{------------------------------------------------------------------------------
procedure TWinControl.ChildHandlesCreated;
Called after all childs handles are created.
Called after all children handles are created.
------------------------------------------------------------------------------}
procedure TWinControl.ChildHandlesCreated;
begin
@ -7843,8 +7843,8 @@ end;
are valid. Negative or 0 are treated as undefined and the LCL uses other sizes
instead (exception: csAutoSize0x0).
TWinControl overrides this:
If there are childs, their total preferred size is calculated.
If this value can not be computed (e.g. the childs depend too much on their
If there are children, their total preferred size is calculated.
If this value can not be computed (e.g. the children depend too much on their
parent clientrect), then the interface is asked for the preferred size.
For example the preferred size of a TButton is the size, where the label fits
exactly. This depends heavily on the current theme and widgetset.
@ -7887,7 +7887,7 @@ begin
AdjustedClientRect.Top+CurClientRect.Bottom-AdjustedClientRect.Bottom);
if ControlCount>0 then begin
// Beware: ControlCount>0 does not mean that there are visible childs
// Beware: ControlCount>0 does not mean that there are visible children
// get the size requirements for the child controls
Layout:=nil;

2
lcl/interfaces/gtk/gtkcallback.inc
View File

@ -2001,7 +2001,7 @@ begin
if GTK_WIDGET_REALIZED(Widget) then begin
{ The gtk sends the size messages after the resizing. Therefore the parent
widget is already resized, but the parent resize message will be emitted
after all its childs. So, the gtk resizes in top-bottom order, just like the
after all its children. So, the gtk resizes in top-bottom order, just like the
LCL. But it sends size messages in bottom-top order, which can result in
many resizes in the LCL.
}

4
lcl/interfaces/gtk/gtkproc.inc
View File

@ -5204,7 +5204,7 @@ procedure ConnectInternalWidgetsSignals(AWidget: PGtkWidget;
//if AWinControl is TListView then DebugLn('ConnectChilds A ',DbgS(TheWidget));
if GtkWidgetIsA(TheWidget,GTK_TYPE_CONTAINER) then begin
//if AWinControl is TListView then DebugLn('ConnectChilds B ');
// this is a container widget -> connect all childs
// this is a container widget -> connect all children
{$IFDEF Gtk2}
ChildEntry2:=gtk_container_get_children(PGtkContainer(TheWidget));
while ChildEntry2<>nil do begin
@ -7328,7 +7328,7 @@ end;
Because the gtk puts all size requests into a queue, it will process the
requests not immediately, but _after_ all requests. This results in changing
the widget size four times and everytime the LCL gets a message. If the
control has childs, this will resize the childs four times.
control has children, this will resize the children four times.
Therefore LCL size requests for a widget are cached and only the final one is
sent in: TGtkWidgetSet.SendCachedLCLMessages.
------------------------------------------------------------------------------}

2
lcl/interfaces/gtk/gtkwidgetset.inc
View File

@ -4054,7 +4054,7 @@ begin
{$ifdef Gtk1}
//Gtk2 uses a different combobox widget class
// childs
// children
if GtkWidgetIsA(Widget,GTK_COMBO_GET_TYPE) then begin
g_signal_handlers_destroy(PGtkObject(PGtkCombo(Widget)^.Entry));
g_signal_handlers_destroy(PGtkObject(PGtkCombo(Widget)^.List));

4
lcl/interfaces/gtk/gtkwsforms.pp
View File

@ -177,8 +177,8 @@ begin
if Adjustment <> nil then
gtk_object_set_data(PGTKObject(Adjustment), odnScrollBar, Scrolled^.hscrollbar);
// create a gtk_layout for the client area, so childs can be added at
// free x,y positions and the scrollbars automatically scrolls the childs
// create a gtk_layout for the client area, so children can be added at
// free x,y positions and the scrollbars automatically scrolls the children
Layout := gtk_layout_new(nil, nil);
gtk_container_add(PGTKContainer(Scrolled), Layout);
gtk_widget_show(Layout);

2
lcl/interfaces/gtk/gtkwsprivate.pp
View File

@ -215,7 +215,7 @@ end;
Params: AWindow : PGDkWindow, ACursor: HCursor, ARecursive: Boolean
Returns: Nothing
Sets the cursor for a window (or recursively for window with childs)
Sets the cursor for a window (or recursively for window with children)
------------------------------------------------------------------------------}
procedure SetWindowCursor(AWindow: PGdkWindow; ACursor: HCursor; ARecursive: Boolean);
var

4
lcl/interfaces/gtk2/gtk2proc.inc
View File

@ -4907,7 +4907,7 @@ procedure ConnectInternalWidgetsSignals(AWidget: PGtkWidget;
//if AWinControl is TListView then DebugLn('ConnectChilds A ',DbgS(TheWidget));
if GtkWidgetIsA(TheWidget,GTK_TYPE_CONTAINER) then begin
//if AWinControl is TListView then DebugLn('ConnectChilds B ');
// this is a container widget -> connect all childs
// this is a container widget -> connect all children
ChildEntry2:=gtk_container_get_children(PGtkContainer(TheWidget));
while ChildEntry2<>nil do begin
ChildWidget:=PGtkWidget(ChildEntry2^.Data);
@ -6847,7 +6847,7 @@ end;
Because the gtk puts all size requests into a queue, it will process the
requests not immediately, but _after_ all requests. This results in changing
the widget size four times and everytime the LCL gets a message. If the
control has childs, this will resize the childs four times.
control has children, this will resize the children four times.
Therefore LCL size requests for a widget are cached and only the final one is
sent in: TGtkWidgetSet.SendCachedLCLMessages.
------------------------------------------------------------------------------}

4
lcl/interfaces/gtk2/gtk2wsforms.pp
View File

@ -716,8 +716,8 @@ begin
if Adjustment <> nil then
gtk_object_set_data(PGTKObject(Adjustment), odnScrollBar, Scrolled^.hscrollbar);
// create a gtk_layout for the client area, so childs can be added at
// free x,y positions and the scrollbars automatically scrolls the childs
// create a gtk_layout for the client area, so children can be added at
// free x,y positions and the scrollbars automatically scrolls the children
Layout := gtk_layout_new(nil, nil);
gtk_container_add(PGTKContainer(Scrolled), Layout);

2
lcl/interfaces/gtk2/gtk2wsprivate.pp
View File

@ -374,7 +374,7 @@ end;
Params: AWindow : PGDkWindow, ACursor: HCursor, ARecursive: Boolean
Returns: Nothing
Sets the cursor for a window (or recursively for window with childs)
Sets the cursor for a window (or recursively for window with children)
------------------------------------------------------------------------------}
procedure SetWindowCursor(AWindow: PGdkWindow; ACursor: HCursor; ARecursive: Boolean);
var

2
lcl/interfaces/qt/qtwidgets.pas
View File

@ -3710,7 +3710,7 @@ procedure TQtWidget.releaseMouse;
var
AGrabWidget: QWidgetH;
begin
// capture widget can be one of childs of Widget if Widget is complex control
// capture widget can be one of children of Widget if Widget is complex control
// so better to look for current Capture widget to release it
// instead of pass Widget as argument
AGrabWidget := QWidget_mouseGrabber();

34
lcl/ldockctrl.pas
View File

@ -1855,7 +1855,7 @@ function TCustomLazControlDocker.GetLayoutFromControl: TLazDockConfigNode;
// Childs
if (AControl is TWinControl) then begin
// check if childs need nodes
// check if children need nodes
NeedChildNodes:=(AControl is TLazDockPages)
or (AControl is TLazDockPage);
if not NeedChildNodes then begin
@ -2721,7 +2721,7 @@ var
Child:=PageNode.Childs[i];
// changes parent of child
Child.Parent:=ParentNode;
// move childs to place where PagesNode was
// move children to place where PagesNode was
ChildBounds:=Child.Bounds;
OffsetRect(ChildBounds,OffsetX,OffsetY);
Child.Bounds:=ChildBounds;
@ -2775,7 +2775,7 @@ var
procedure RemoveEmptyNodes(var Node: TLazDockConfigNode);
// remove unneeded child nodes
// if no childs left and Node itself is unneeded, it s freed and set to nil
// if no children left and Node itself is unneeded, it s freed and set to nil
var
i: Integer;
Docker: TCustomLazControlDocker;
@ -2786,7 +2786,7 @@ var
DebugLn(['RemoveEmptyNodes ',Node.Name,' Node.ChildCount=',Node.ChildCount]);
{$ENDIF}
// remove unneeded childs
// remove unneeded children
i:=Node.ChildCount-1;
while i>=0 do begin
Child:=Node.Childs[i];
@ -2815,19 +2815,19 @@ var
end;
end;
ldcntPage:
// these are auto created parent node. If they have no childs: delete
// these are auto created parent node. If they have no children: delete
if Node.ChildCount=0 then begin
{$IFDEF VerboseAnchorDockCreateLayout}
DebugLn(['RemoveEmptyNodes delete node without childs: ',dbgs(Node)]);
DebugLn(['RemoveEmptyNodes delete node without children: ',dbgs(Node)]);
{$ENDIF}
DeleteNode(Node);
end;
ldcntForm:
// these are auto created parent node. If they have no childs: delete
// if they have only one child: delete node and move childs up
// these are auto created parent node. If they have no children: delete
// if they have only one child: delete node and move children up
if Node.ChildCount=0 then begin
{$IFDEF VerboseAnchorDockCreateLayout}
DebugLn(['RemoveEmptyNodes delete node without childs: ',dbgs(Node)]);
DebugLn(['RemoveEmptyNodes delete node without children: ',dbgs(Node)]);
{$ENDIF}
DeleteNode(Node);
end else if Node.ChildCount=1 then begin
@ -2835,11 +2835,11 @@ var
SimplifyOneChildForm(Node);
end;
ldcntPages:
// these are auto created parent node. If they have no childs: delete
// these are auto created parent node. If they have no children: delete
// if they have only one child: delete node and move child up
if Node.ChildCount=0 then begin
{$IFDEF VerboseAnchorDockCreateLayout}
DebugLn(['RemoveEmptyNodes delete node without childs: ',dbgs(Node)]);
DebugLn(['RemoveEmptyNodes delete node without children: ',dbgs(Node)]);
{$ENDIF}
DeleteNode(Node);
end else if Node.ChildCount=1 then begin
@ -2871,7 +2871,7 @@ var
end;
end;
end;
// check childs
// check children
for i:=0 to Node.ChildCount-1 do
if not Check(Node.Childs[i]) then exit(false);
Result:=true;
@ -3213,7 +3213,7 @@ function TCustomLazDockingManager.ConfigIsCompatible(
end;
ldcntPages:
begin
// a pages node has only page nodes as childs
// a pages node has only page nodes as children
if not CheckHasParent then exit;
if not CheckHasChilds then exit;
for i:=0 to Node.ChildCount-1 do
@ -3249,7 +3249,7 @@ function TCustomLazDockingManager.ConfigIsCompatible(
// a horizontal splitter can be moved up/down
// it is anchored left and right, and not top/bottom
// it is not a root node
// it has no childs
// it has no children
if not CheckHasParent then exit;
if not CheckHasNoChilds then exit;
if not CheckSideNotAnchored(akTop) then exit;
@ -3267,7 +3267,7 @@ function TCustomLazDockingManager.ConfigIsCompatible(
if not CheckUniqueCorner(akRight,akTop) then exit;
if not CheckUniqueCorner(akRight,akBottom) then exit;
// check childs
// check children
for i:=0 to Node.ChildCount-1 do
if not CheckNode(Node.Childs[i]) then exit;
@ -3519,7 +3519,7 @@ begin
for a:=Low(TAnchorKind) to High(TAnchorKind) do
Config.SetDeleteValue(Path+'Sides/'+AnchorNames[a]+'/Name',Sides[a],'');
// childs
// children
Config.SetDeleteValue(Path+'Childs/Count',ChildCount,0);
for i:=0 to ChildCount-1 do begin
Child:=Childs[i];
@ -3551,7 +3551,7 @@ begin
for a:=Low(TAnchorKind) to High(TAnchorKind) do
Sides[a]:=Config.GetValue(Path+'Sides/'+AnchorNames[a]+'/Name','');
// childs
// children
NewChildCount:=Config.GetValue(Path+'Childs/Count',0);
for i:=0 to NewChildCount-1 do begin
SubPath:=Path+'Child'+IntToStr(i+1)+'/';

14
lcl/ldocktree.pas
View File

@ -965,7 +965,7 @@ begin
begin
// a zone of pages -> needs a TLazDockPages
if Zone.FirstChild = nil then
RaiseGDBException('TLazDockTree.CreateDockLayoutHelperControls Inconsistency: doPages without childs');
RaiseGDBException('TLazDockTree.CreateDockLayoutHelperControls Inconsistency: doPages without children');
if (Zone.Pages = nil) then
Zone.Pages:=TLazDockPages.Create(nil);
end
@ -998,7 +998,7 @@ begin
Zone.Page := nil;
end;
// create controls for childs and siblings
// create controls for children and siblings
CreateDockLayoutHelperControls(Zone.FirstChild as TLazDockZone);
CreateDockLayoutHelperControls(Zone.NextSibling as TLazDockZone);
end;
@ -1142,7 +1142,7 @@ begin
end;
end;
// anchor controls for childs and siblings
// anchor controls for children and siblings
AnchorDockLayout(Zone.FirstChild as TLazDockZone);
AnchorDockLayout(Zone.NextSibling as TLazDockZone);
end;
@ -1279,7 +1279,7 @@ begin
DockSite.Visible := True;
end else
begin
// there are already other childs
// there are already other children
// optimize DropZone
if (DropZone.ChildCount>0) and
@ -2415,7 +2415,7 @@ procedure TCustomAnchoredDockManager.UndockControl(Control: TControl; Float: boo
3. No TLazDockSplitter. Control is the only child of a TLazDockPage
In this case the page will be deleted.
If the TLazDockPages has no childs left, it is recursively undocked.
If the TLazDockPages has no children left, it is recursively undocked.
4. No TLazDockSplitter, Control is the only child of a TLazDockForm.
The TLazDockForm is deleted and the Control is floated.
@ -3076,12 +3076,12 @@ function TLazDockForm.CloseQuery: boolean;
AControl:=ParentControl.Controls[i];
if (AControl is TWinControl) then begin
if (AControl is TCustomForm) then begin
// a top level form: query and do not ask childs
// a top level form: query and do not ask children
if (not TCustomForm(AControl).CloseQuery) then
exit(false);
end
else if not QueryForms(TWinControl(AControl)) then
// search childs for forms
// search children for forms
exit(false);
end;
end;

4
lcl/pairsplitter.pas
View File

@ -24,8 +24,8 @@
Author: Mattias Gaertner
Abstract:
TPairSplitter component. A component with two TPairSplitterSide childs.
Both child components can contain other components and the childs are
TPairSplitter component. A component with two TPairSplitterSide children.
Both child components can contain other components and the children are
divided by a splitter which can be dragged by the user.
}
unit PairSplitter;

2
packager/packagesystem.pas
View File

@ -5010,7 +5010,7 @@ procedure TLazPackageGraph.GetConnectionsTree(FirstDependency: TPkgDependency;
procedure AddConnections(StartDependency: TPkgDependency);
// add every connection between owner and required package
// and between two childs
// and between two children
var
OwnerPackage: TLazPackage;
Dependency1: TPkgDependency;