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

Merged revision(s) 63596 #727eb0ef72, 63627 #4fde982e86 from trunk:

Browse Source 
LCL: Prevent DBGrid raising exception after enabled and hiding inplace editor. Issue #37385, patch from Zdravko Gabrovski.
........
Codetools: Find form's ancestor also when a generic form is specialized. Issue #37396, patch from Imants Gulbis.
........

git-svn-id: branches/fixes_2_0@64608 -
This commit is contained in:
martin 2021-02-18 01:00:29 +00:00
parent ee6fa154ed
commit c00cb12cca
2 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
components/codetools/stdcodetools.pas
View File

@ -3113,6 +3113,8 @@ begin
ReadNextAtom;
if AtomIsChar('(') then begin
ReadNextAtom;
if UpAtomIs('SPECIALIZE') then
ReadNextAtom;
if AtomIsIdentifier then
AncestorClassName:=GetAtom;
end;

1
lcl/grids.pas
View File

@ -7079,6 +7079,7 @@ begin
{$ifdef dbgGrid}DebugLnEnter('grid.DoEditorHide [',Editor.ClassName,'] INIT');{$endif}
if gfEditingDone in FGridFlags then begin
ParentForm := GetParentForm(Self);
if Self.CanFocus then
ParentForm.ActiveControl := self;
end;
Editor.Visible:=False;