diff --git a/lcl/controls.pp b/lcl/controls.pp index d6e86a48f5..50af54f628 100644 --- a/lcl/controls.pp +++ b/lcl/controls.pp @@ -1532,7 +1532,7 @@ type function ControlToScreen(const APoint: TPoint): TPoint; function ClientToParent(const Point: TPoint; AParent: TWinControl = nil): TPoint; function ParentToClient(const Point: TPoint; AParent: TWinControl = nil): TPoint; - function GetChildsRect(Scrolled: boolean): TRect; virtual; + function GetChildrenRect(Scrolled: boolean): TRect; virtual; procedure Show; procedure Update; virtual; function HandleObjectShouldBeVisible: boolean; virtual; @@ -2141,7 +2141,7 @@ type procedure InvalidateClientRectCache(WithChildControls: boolean); function ClientRectNeedsInterfaceUpdate: boolean; procedure SetBounds(ALeft, ATop, AWidth, AHeight: integer); override; - function GetChildsRect(Scrolled: boolean): TRect; override; + function GetChildrenRect(Scrolled: boolean): TRect; override; procedure DisableAlign; procedure EnableAlign; procedure ReAlign; // realign all children diff --git a/lcl/include/control.inc b/lcl/include/control.inc index 285193377f..371643c3d9 100644 --- a/lcl/include/control.inc +++ b/lcl/include/control.inc @@ -1949,13 +1949,13 @@ begin end; {------------------------------------------------------------------------------ - function TControl.GetChildsRect(Scrolled: boolean): TRect; + function TControl.GetChildrenRect(Scrolled: boolean): TRect; Returns the Client rectangle relative to the controls left, top. If Scrolled is true, the rectangle is moved by the current scrolling values (for an example see TScrollingWincontrol). ------------------------------------------------------------------------------} -function TControl.GetChildsRect(Scrolled: boolean): TRect; +function TControl.GetChildrenRect(Scrolled: boolean): TRect; var ScrolledOffset: TPoint; begin diff --git a/lcl/include/statusbar.inc b/lcl/include/statusbar.inc index e61320c57b..3d19b98296 100644 --- a/lcl/include/statusbar.inc +++ b/lcl/include/statusbar.inc @@ -260,7 +260,7 @@ begin Result := -1; if Panels.Count = 0 then Exit; - R := GetChildsRect(False); + R := GetChildrenRect(False); P := Point(X, Y); if not PtInRect(R, P) then Exit; diff --git a/lcl/include/wincontrol.inc b/lcl/include/wincontrol.inc index 49e0871651..2ffd2599eb 100644 --- a/lcl/include/wincontrol.inc +++ b/lcl/include/wincontrol.inc @@ -4060,13 +4060,13 @@ begin end; {------------------------------------------------------------------------------ - function TWinControl.GetChildsRect(Scrolled: boolean): TRect; + function TWinControl.GetChildrenRect(Scrolled: boolean): TRect; Returns the Client rectangle relative to the controls left, top. If Scrolled is true, the rectangle is moved by the current scrolling values (for an example see TScrollingWincontrol). ------------------------------------------------------------------------------} -function TWinControl.GetChildsRect(Scrolled: boolean): TRect; +function TWinControl.GetChildrenRect(Scrolled: boolean): TRect; var ScrolledOffset: TPoint; begin @@ -4080,7 +4080,7 @@ begin inc(Result.Bottom,ScrolledOffset.Y); end; end else - Result:=inherited GetChildsRect(Scrolled); + Result:=inherited GetChildrenRect(Scrolled); end; {------------------------------------------------------------------------------ @@ -5056,7 +5056,7 @@ var (ControlPos.X < Width) and (ControlPos.Y < Height); if Result and (capfOnlyClientAreas in Flags) then begin - ControlClientBounds := GetChildsRect(false); + ControlClientBounds := GetChildrenRect(false); Result:=PtInRect(ControlClientBounds, ControlPos); end;