From b3a8dd03b14ffa4ca4f6e7bf91fcdc2262595709 Mon Sep 17 00:00:00 2001 From: mattias Date: Thu, 10 Feb 2011 09:37:16 +0000 Subject: [PATCH] fixed typos: childs git-svn-id: trunk@29440 - --- components/codetools/codetree.pas | 6 +- components/codetools/definetemplates.pas | 14 ++-- components/codetools/directivestree.pas | 2 +- components/codetools/finddeclarationtool.pas | 4 +- components/codetools/h2pastool.pas | 16 ++--- components/codetools/laz_dom.pas | 6 +- components/codetools/laz_xmlstreaming.pas | 8 +-- components/education/eduoptions.pas | 2 +- designer/controlselection.pp | 2 +- designer/designer.pp | 2 +- docs/xml/fcl/fpcolhash.xml | 2 +- docs/xml/lcl/controls.xml | 4 +- docs/xml/lcl/ldocktree.xml | 2 +- examples/anchordocking/anchordocking.pas | 2 +- examples/anchordocking/anchordockstorage.pas | 2 +- examples/designnonlcl/mywidgetdesigner.pas | 2 +- examples/designnonlcl/mywidgetset.pas | 4 +- examples/listboxtest.pp | 2 +- examples/memotest.pp | 2 +- ide/codebrowser.pas | 4 +- ide/codehelp.pas | 2 +- ide/codetoolsdefines.pas | 2 +- ideintf/docs/formeditingintf.xml | 4 +- ideintf/formeditingintf.pas | 2 +- ideintf/menuintf.pas | 14 ++-- ideintf/objectinspector.pp | 8 +-- ideintf/propedits.pp | 2 +- lcl/comctrls.pp | 2 +- lcl/controls.pp | 42 ++++++------ lcl/include/buttons.inc | 2 +- lcl/include/customedit.inc | 2 +- lcl/include/customform.inc | 2 +- lcl/include/customnotebook.inc | 2 +- lcl/include/docktree.inc | 2 +- lcl/include/menuitem.inc | 4 +- lcl/include/toolbar.inc | 4 +- lcl/include/treeview.inc | 8 +-- lcl/include/wincontrol.inc | 70 ++++++++++---------- lcl/interfaces/gtk/gtkcallback.inc | 2 +- lcl/interfaces/gtk/gtkproc.inc | 4 +- lcl/interfaces/gtk/gtkwidgetset.inc | 2 +- lcl/interfaces/gtk/gtkwsforms.pp | 4 +- lcl/interfaces/gtk/gtkwsprivate.pp | 2 +- lcl/interfaces/gtk2/gtk2proc.inc | 4 +- lcl/interfaces/gtk2/gtk2wsforms.pp | 4 +- lcl/interfaces/gtk2/gtk2wsprivate.pp | 2 +- lcl/interfaces/qt/qtwidgets.pas | 2 +- lcl/ldockctrl.pas | 34 +++++----- lcl/ldocktree.pas | 14 ++-- lcl/pairsplitter.pas | 4 +- packager/packagesystem.pas | 2 +- 51 files changed, 171 insertions(+), 171 deletions(-) diff --git a/components/codetools/codetree.pas b/components/codetools/codetree.pas index 5bdd5406be..27d29c608c 100644 --- a/components/codetools/codetree.pas +++ b/components/codetools/codetree.pas @@ -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; diff --git a/components/codetools/definetemplates.pas b/components/codetools/definetemplates.pas index e71ae3691b..3cfee7fe9f 100644 --- a/components/codetools/definetemplates.pas +++ b/components/codetools/definetemplates.pas @@ -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); diff --git a/components/codetools/directivestree.pas b/components/codetools/directivestree.pas index 1c6f16252b..670fbd62e2 100644 --- a/components/codetools/directivestree.pas +++ b/components/codetools/directivestree.pas @@ -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; diff --git a/components/codetools/finddeclarationtool.pas b/components/codetools/finddeclarationtool.pas index 49b811739e..a37eb52939 100644 --- a/components/codetools/finddeclarationtool.pas +++ b/components/codetools/finddeclarationtool.pas @@ -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, diff --git a/components/codetools/h2pastool.pas b/components/codetools/h2pastool.pas index 08efd1e555..cb226d74a8 100644 --- a/components/codetools/h2pastool.pas +++ b/components/codetools/h2pastool.pas @@ -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 diff --git a/components/codetools/laz_dom.pas b/components/codetools/laz_dom.pas index ad90b1df8b..1693477d97 100644 --- a/components/codetools/laz_dom.pas +++ b/components/codetools/laz_dom.pas @@ -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 diff --git a/components/codetools/laz_xmlstreaming.pas b/components/codetools/laz_xmlstreaming.pas index f9a1c84611..8847503d86 100644 --- a/components/codetools/laz_xmlstreaming.pas +++ b/components/codetools/laz_xmlstreaming.pas @@ -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; diff --git a/components/education/eduoptions.pas b/components/education/eduoptions.pas index fead0cb8f0..42df81013a 100644 --- a/components/education/eduoptions.pas +++ b/components/education/eduoptions.pas @@ -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'; diff --git a/designer/controlselection.pp b/designer/controlselection.pp index aeec018496..9f8ea4c30b 100644 --- a/designer/controlselection.pp +++ b/designer/controlselection.pp @@ -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) diff --git a/designer/designer.pp b/designer/designer.pp index 006d80c7af..c6dfcd4c39 100644 --- a/designer/designer.pp +++ b/designer/designer.pp @@ -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 diff --git a/docs/xml/fcl/fpcolhash.xml b/docs/xml/fcl/fpcolhash.xml index 74a2cce289..a269268e27 100644 --- a/docs/xml/fcl/fpcolhash.xml +++ b/docs/xml/fcl/fpcolhash.xml @@ -59,7 +59,7 @@ - + diff --git a/docs/xml/lcl/controls.xml b/docs/xml/lcl/controls.xml index c07c04226a..9fdb8b1dae 100644 --- a/docs/xml/lcl/controls.xml +++ b/docs/xml/lcl/controls.xml @@ -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; - Called after all childs handles of the ParentForm are created. Tells all wincontrols about the final end of the handle creation phase + Called after all children handles of the ParentForm are created. Tells all wincontrols about the final end of the handle creation phase diff --git a/docs/xml/lcl/ldocktree.xml b/docs/xml/lcl/ldocktree.xml index 1a60539a54..b144691aac 100644 --- a/docs/xml/lcl/ldocktree.xml +++ b/docs/xml/lcl/ldocktree.xml @@ -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. diff --git a/examples/anchordocking/anchordocking.pas b/examples/anchordocking/anchordocking.pas index 43d98bd6a0..2e00fe503a 100644 --- a/examples/anchordocking/anchordocking.pas +++ b/examples/anchordocking/anchordocking.pas @@ -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; diff --git a/examples/anchordocking/anchordockstorage.pas b/examples/anchordocking/anchordockstorage.pas index a299815d00..b2fccdcc88 100644 --- a/examples/anchordocking/anchordockstorage.pas +++ b/examples/anchordocking/anchordockstorage.pas @@ -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]; diff --git a/examples/designnonlcl/mywidgetdesigner.pas b/examples/designnonlcl/mywidgetdesigner.pas index f1ae675c6b..14d7f9690d 100644 --- a/examples/designnonlcl/mywidgetdesigner.pas +++ b/examples/designnonlcl/mywidgetdesigner.pas @@ -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 diff --git a/examples/designnonlcl/mywidgetset.pas b/examples/designnonlcl/mywidgetset.pas index 6130606209..e881ed9a90 100644 --- a/examples/designnonlcl/mywidgetset.pas +++ b/examples/designnonlcl/mywidgetset.pas @@ -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; diff --git a/examples/listboxtest.pp b/examples/listboxtest.pp index 53dce9893b..969bb18710 100644 --- a/examples/listboxtest.pp +++ b/examples/listboxtest.pp @@ -52,7 +52,7 @@ begin Left := 200; Top := 200; - // create childs + // create children Button1 := TButton.Create(Self); Button1.OnClick := @Button1Click; Button1.Parent := Self; diff --git a/examples/memotest.pp b/examples/memotest.pp index adfb1c2ac7..8deeb3efeb 100644 --- a/examples/memotest.pp +++ b/examples/memotest.pp @@ -55,7 +55,7 @@ begin Left := 200; Top := 200; - // create childs + // create children Button5 := TButton.Create(Self); Button5.OnClick := @button5click; Button5.Parent := Self; diff --git a/ide/codebrowser.pas b/ide/codebrowser.pas index 7b5cb7c2ba..e4cf7c810e 100644 --- a/ide/codebrowser.pas +++ b/ide/codebrowser.pas @@ -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; diff --git a/ide/codehelp.pas b/ide/codehelp.pas index b2f44c64d3..818f8fc591 100644 --- a/ide/codehelp.pas +++ b/ide/codehelp.pas @@ -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); diff --git a/ide/codetoolsdefines.pas b/ide/codetoolsdefines.pas index 038bc66a75..b174c9bfe8 100644 --- a/ide/codetoolsdefines.pas +++ b/ide/codetoolsdefines.pas @@ -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); diff --git a/ideintf/docs/formeditingintf.xml b/ideintf/docs/formeditingintf.xml index b0c00cb5df..37f5d66b1b 100644 --- a/ideintf/docs/formeditingintf.xml +++ b/ideintf/docs/formeditingintf.xml @@ -18,7 +18,7 @@ No override needed. - Used by GetChilds to add collected childs to add to FCollectedChilds. + Used by GetChilds to add collected children to add to FCollectedChilds. No override needed. @@ -88,7 +88,7 @@ The default implementation uses GetBounds. No override needed. 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. diff --git a/ideintf/formeditingintf.pas b/ideintf/formeditingintf.pas index b10670cd36..deace788a8 100644 --- a/ideintf/formeditingintf.pas +++ b/ideintf/formeditingintf.pas @@ -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 diff --git a/ideintf/menuintf.pas b/ideintf/menuintf.pas index d2a5860f71..c619f6c381 100644 --- a/ideintf/menuintf.pas +++ b/ideintf/menuintf.pas @@ -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; diff --git a/ideintf/objectinspector.pp b/ideintf/objectinspector.pp index 379b9cc79e..c4af6c772d 100644 --- a/ideintf/objectinspector.pp +++ b/ideintf/objectinspector.pp @@ -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; diff --git a/ideintf/propedits.pp b/ideintf/propedits.pp index 7aeebdbd09..501921f6fe 100644 --- a/ideintf/propedits.pp +++ b/ideintf/propedits.pp @@ -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; diff --git a/lcl/comctrls.pp b/lcl/comctrls.pp index c664cfea28..eca6e93d28 100644 --- a/lcl/comctrls.pp +++ b/lcl/comctrls.pp @@ -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; diff --git a/lcl/controls.pp b/lcl/controls.pp index 4175669412..f5a49542e7 100644 --- a/lcl/controls.pp +++ b/lcl/controls.pp @@ -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). diff --git a/lcl/include/buttons.inc b/lcl/include/buttons.inc index 894b68b849..615d6ba279 100644 --- a/lcl/include/buttons.inc +++ b/lcl/include/buttons.inc @@ -251,7 +251,7 @@ end; function TCustomButton.ChildClassAllowed(ChildClass: TClass): boolean; begin - // no childs + // no children Result:=false; end; diff --git a/lcl/include/customedit.inc b/lcl/include/customedit.inc index 4775342a6d..3db66aa7f8 100644 --- a/lcl/include/customedit.inc +++ b/lcl/include/customedit.inc @@ -413,7 +413,7 @@ end; ------------------------------------------------------------------------------} function TCustomEdit.ChildClassAllowed(ChildClass: TClass): boolean; begin - // no childs + // no children Result := False; end; diff --git a/lcl/include/customform.inc b/lcl/include/customform.inc index a4c8e996bd..56fcc354c8 100644 --- a/lcl/include/customform.inc +++ b/lcl/include/customform.inc @@ -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 diff --git a/lcl/include/customnotebook.inc b/lcl/include/customnotebook.inc index 9f4290b969..da8f42ef99 100644 --- a/lcl/include/customnotebook.inc +++ b/lcl/include/customnotebook.inc @@ -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 diff --git a/lcl/include/docktree.inc b/lcl/include/docktree.inc index 62fa8d7154..197ab9a59d 100644 --- a/lcl/include/docktree.inc +++ b/lcl/include/docktree.inc @@ -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; diff --git a/lcl/include/menuitem.inc b/lcl/include/menuitem.inc index 00fc0f4f5a..669e385fb6 100644 --- a/lcl/include/menuitem.inc +++ b/lcl/include/menuitem.inc @@ -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); diff --git a/lcl/include/toolbar.inc b/lcl/include/toolbar.inc index 313e18f948..26788af144 100644 --- a/lcl/include/toolbar.inc +++ b/lcl/include/toolbar.inc @@ -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, diff --git a/lcl/include/treeview.inc b/lcl/include/treeview.inc index 78736a70a3..99f6155c3c 100644 --- a/lcl/include/treeview.inc +++ b/lcl/include/treeview.inc @@ -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(''); diff --git a/lcl/include/wincontrol.inc b/lcl/include/wincontrol.inc index 7b949eff38..a7cb30a3e6 100644 --- a/lcl/include/wincontrol.inc +++ b/lcl/include/wincontrol.inc @@ -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; diff --git a/lcl/interfaces/gtk/gtkcallback.inc b/lcl/interfaces/gtk/gtkcallback.inc index b59d9703a7..0cf149b4ee 100644 --- a/lcl/interfaces/gtk/gtkcallback.inc +++ b/lcl/interfaces/gtk/gtkcallback.inc @@ -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. } diff --git a/lcl/interfaces/gtk/gtkproc.inc b/lcl/interfaces/gtk/gtkproc.inc index 2f69149ac6..fd7f2d9d5d 100644 --- a/lcl/interfaces/gtk/gtkproc.inc +++ b/lcl/interfaces/gtk/gtkproc.inc @@ -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. ------------------------------------------------------------------------------} diff --git a/lcl/interfaces/gtk/gtkwidgetset.inc b/lcl/interfaces/gtk/gtkwidgetset.inc index f19fc0f710..2550896da2 100644 --- a/lcl/interfaces/gtk/gtkwidgetset.inc +++ b/lcl/interfaces/gtk/gtkwidgetset.inc @@ -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)); diff --git a/lcl/interfaces/gtk/gtkwsforms.pp b/lcl/interfaces/gtk/gtkwsforms.pp index 947d9a8b19..03549d837e 100644 --- a/lcl/interfaces/gtk/gtkwsforms.pp +++ b/lcl/interfaces/gtk/gtkwsforms.pp @@ -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); diff --git a/lcl/interfaces/gtk/gtkwsprivate.pp b/lcl/interfaces/gtk/gtkwsprivate.pp index 2e7a9b339f..ef4df60de9 100644 --- a/lcl/interfaces/gtk/gtkwsprivate.pp +++ b/lcl/interfaces/gtk/gtkwsprivate.pp @@ -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 diff --git a/lcl/interfaces/gtk2/gtk2proc.inc b/lcl/interfaces/gtk2/gtk2proc.inc index f55dba39a7..dc1d8c9aeb 100644 --- a/lcl/interfaces/gtk2/gtk2proc.inc +++ b/lcl/interfaces/gtk2/gtk2proc.inc @@ -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. ------------------------------------------------------------------------------} diff --git a/lcl/interfaces/gtk2/gtk2wsforms.pp b/lcl/interfaces/gtk2/gtk2wsforms.pp index 2b5b561b09..cf47942e3c 100644 --- a/lcl/interfaces/gtk2/gtk2wsforms.pp +++ b/lcl/interfaces/gtk2/gtk2wsforms.pp @@ -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); diff --git a/lcl/interfaces/gtk2/gtk2wsprivate.pp b/lcl/interfaces/gtk2/gtk2wsprivate.pp index b8c67a4ee8..503cf1718a 100644 --- a/lcl/interfaces/gtk2/gtk2wsprivate.pp +++ b/lcl/interfaces/gtk2/gtk2wsprivate.pp @@ -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 diff --git a/lcl/interfaces/qt/qtwidgets.pas b/lcl/interfaces/qt/qtwidgets.pas index dc43817be2..0316e8347f 100644 --- a/lcl/interfaces/qt/qtwidgets.pas +++ b/lcl/interfaces/qt/qtwidgets.pas @@ -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(); diff --git a/lcl/ldockctrl.pas b/lcl/ldockctrl.pas index 9144789db6..a6cedbe735 100644 --- a/lcl/ldockctrl.pas +++ b/lcl/ldockctrl.pas @@ -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)+'/'; diff --git a/lcl/ldocktree.pas b/lcl/ldocktree.pas index df57f43cfd..30d55627f2 100644 --- a/lcl/ldocktree.pas +++ b/lcl/ldocktree.pas @@ -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; diff --git a/lcl/pairsplitter.pas b/lcl/pairsplitter.pas index ec7d98e763..addbd4b6b3 100644 --- a/lcl/pairsplitter.pas +++ b/lcl/pairsplitter.pas @@ -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; diff --git a/packager/packagesystem.pas b/packager/packagesystem.pas index 7b202bfa85..3e501ce269 100644 --- a/packager/packagesystem.pas +++ b/packager/packagesystem.pas @@ -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;