diff --git a/lcl/forms.pp b/lcl/forms.pp index 8286fec628..c3bae72db6 100644 --- a/lcl/forms.pp +++ b/lcl/forms.pp @@ -2243,7 +2243,7 @@ function ValidParentForm(Control: TControl; TopForm: Boolean): TCustomForm; begin Result := GetParentForm(Control, TopForm); if Result = nil then - raise EInvalidOperation.CreateFmt(sParentRequired, [Control.Name]); + raise EInvalidOperation.CreateFmt(sParentRequired, [Control.Name+':'+Control.ClassName]); end; diff --git a/lcl/include/control.inc b/lcl/include/control.inc index 7c9dc7c615..1be8a90c9d 100644 --- a/lcl/include/control.inc +++ b/lcl/include/control.inc @@ -1632,7 +1632,7 @@ end; function TControl.GetClientOrigin: TPoint; begin if Parent = nil then - raise EInvalidOperation.CreateFmt(sParentRequired, [Name]); + raise EInvalidOperation.CreateFmt(sParentRequired, [Name+':'+ClassName]); Result := Parent.ClientOrigin; Inc(Result.X, FLeft); Inc(Result.Y, FTop); @@ -5315,7 +5315,7 @@ end; function TControl.GetDeviceContext(var WindowHandle: HWND): HDC; begin if Parent = nil then - raise EInvalidOperation.CreateFmt(sParentRequired, [Name]); + raise EInvalidOperation.CreateFmt(sParentRequired, [Name+':'+ClassName]); Result := Parent.GetDeviceContext(WindowHandle); MoveWindowOrgEx(Result, Left, Top); diff --git a/lcl/include/customform.inc b/lcl/include/customform.inc index c7a28a600e..fae0518adc 100644 --- a/lcl/include/customform.inc +++ b/lcl/include/customform.inc @@ -1875,9 +1875,9 @@ begin AWinControl:=AWinControl.Parent; end; {$IFDEF VerboseFocus} - RaiseGDBException(Format(SCannotFocus,[AWinControl.Name,AWinControl.ClassName])); + RaiseGDBException(Format(SCannotFocus,[AWinControl.Name+':'+AWinControl.ClassName])); {$ELSE} - raise EInvalidOperation.Create(Format(SCannotFocus,[AWinControl.Name,AWinControl.ClassName])); + raise EInvalidOperation.Create(Format(SCannotFocus,[AWinControl.Name+':'+AWinControl.ClassName])); {$ENDIF} end; end; diff --git a/lcl/include/wincontrol.inc b/lcl/include/wincontrol.inc index 7925ca25e5..ed942dc03e 100644 --- a/lcl/include/wincontrol.inc +++ b/lcl/include/wincontrol.inc @@ -7644,7 +7644,7 @@ begin if (WndParent = 0) and (Style and WS_CHILD <> 0) then begin DebugLn(['TWinControl.CreateWnd ',DbgSName(Self),' Parent=',DbgSName(Parent),' ERROR WndParent=0']); - raise EInvalidOperation.CreateFmt(sParentRequired, [Name]); + raise EInvalidOperation.CreateFmt(sParentRequired, [Name+':'+ClassName]); end; end; diff --git a/lcl/lclstrconsts.pas b/lcl/lclstrconsts.pas index 9fc108ab80..e6b7d229d1 100644 --- a/lcl/lclstrconsts.pas +++ b/lcl/lclstrconsts.pas @@ -230,7 +230,7 @@ resourceString sInvalidIndex = 'Invalid ImageList Index'; sInvalidImageSize = 'Invalid image size'; sDuplicateMenus = 'Duplicate menus'; - sCannotFocus = 'Cannot focus a disabled or invisible window "%s":"%s"'; + sCannotFocus = 'Cannot focus a disabled or invisible window "%s"'; sParentRequired = 'Control "%s" has no parent window.'; SMaskEditNoMatch = 'The current text does not match the specified mask.';