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

IDE: Remove unused and duplicate resource strings. Fix exception messages.

Browse Source
This commit is contained in:
Juha 2021-09-28 14:22:48 +03:00
parent 8a971e273f
commit 865013eeb9
5 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
designer/jitforms.pp
View File

@ -967,7 +967,7 @@ begin
end;
except
on E: Exception do begin
HandleException(E,'[TJITComponentList.AddJITChildComponentFromStream] ERROR reading form stream'
HandleException(E,'[TJITComponentList.AddJITComponentFromStream] ERROR reading form stream'
+' of Class "'+NewClassName+'"',Action);
if Result>=0 then begin
// try freeing the unfinished thing
@ -1383,7 +1383,8 @@ begin
end;
except
on E: Exception do begin
HandleException(E,'[TJITComponentList.AddJITChildComponentFromStream] ERROR reading form stream of Class "'+ComponentClass.ClassName+'"',Action);
HandleException(E,'[TJITComponentList.AddJITChildComponentFromStream] ERROR reading form stream'
+' of Class "'+ComponentClass.ClassName+'"',Action);
end;
end;
FCurReadStreamClass:=nil;

1
ide/lazarusidestrconsts.pas
View File

@ -6006,7 +6006,6 @@ resourcestring
lisFindMissingUnit = 'Find missing unit';
lisSearchUnit = 'Search Unit "%s"';
lisEmpty = 'Empty';
lisNotAValidPascalIdentifier = 'Not a valid Pascal identifier';
lisThereIsAlreadyAComponentWithThisName = 'There is already a component '
+'with this name';
lisTheOwnerHasThisName = 'The owner has this name';

4
lcl/include/control.inc
View File

@ -1624,7 +1624,7 @@ end;
function TControl.GetClientOrigin: TPoint;
begin
if Parent = nil then
raise EInvalidOperation.CreateFmt(rsControlHasNoParentWindow, [Name]);
raise EInvalidOperation.CreateFmt(sParentRequired, [Name]);
Result := Parent.ClientOrigin;
Inc(Result.X, FLeft);
Inc(Result.Y, FTop);
@ -5281,7 +5281,7 @@ end;
function TControl.GetDeviceContext(var WindowHandle: HWND): HDC;
begin
if Parent = nil then
raise EInvalidOperation.CreateFmt(rsControlHasNoParentWindow, [Name]);
raise EInvalidOperation.CreateFmt(sParentRequired, [Name]);
Result := Parent.GetDeviceContext(WindowHandle);
MoveWindowOrgEx(Result, Left, Top);

2
lcl/include/wincontrol.inc
View File

@ -7535,7 +7535,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(rsControlHasNoParentWindow, [Name]);
raise EInvalidOperation.CreateFmt(sParentRequired, [Name]);
end;
end;

1
lcl/lclstrconsts.pas
View File

@ -251,7 +251,6 @@ resourceString
rsGridHasNoRows = 'Cannot insert columns into a grid when it has no rows';
rsGridHasNoCols = 'Cannot insert rows into a grid when it has no columns';
rsAControlCanNotHaveItselfAsParent = 'A control can''t have itself as a parent';
rsControlHasNoParentWindow = 'Control ''%s'' has no parent window';
rsControlHasNoParentFormOrFrame = 'Control ''%s'' has no parent form or frame';
rsControlIsNotAParent = '''%s'' is not a parent of ''%s''';
rsControlClassCantContainChildClass = 'Control of class ''%s'' can''t have control of class ''%s'' as a child';