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

ValEdit: fix infinite recursion introduced in r52157 #e6905bdc44. Issue #0029993.

Browse Source 
git-svn-id: trunk@52164 -
This commit is contained in:
bart 2016-04-11 09:15:49 +00:00
parent 446f6a0930
commit b45268e494
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lcl/valedit.pas
View File

@ -130,7 +130,6 @@ type
FLastEditedRow: Integer;
FUpdatingKeyOptions: Boolean;
function GetItemProp(const AKeyOrIndex: Variant): TItemProp;
procedure SetFixedRows(const AValue: Integer); override;
procedure SetItemProp(const AKeyOrIndex: Variant; AValue: TItemProp);
procedure StringsChange(Sender: TObject);
procedure StringsChanging(Sender: TObject);
@ -161,6 +160,7 @@ type
procedure ResetDefaultColWidths; override;
procedure SetCells(ACol, ARow: Integer; const AValue: string); override;
procedure SetEditText(ACol, ARow: Longint; const Value: string); override;
procedure SetFixedRows(const AValue: Integer); override;
procedure SetRowCount(AValue: Integer);
procedure TitlesChanged(Sender: TObject);
function ValidateEntry(const ACol,ARow:Integer; const OldValue:string; var NewValue:string): boolean; override;
@ -966,9 +966,9 @@ begin
if doColumnTitles in AValue then begin
if RowCount < 2 then
{inherited} RowCount := 2;
inherited FixedRows := 1;
inherited SetFixedRows(1);// don't do FixedRows := 1 here, it wil cause infinite recursion (Issue 0029993)
end else
inherited FixedRows := 0;
inherited SetFixedRows(0);
if (doAutoColResize in DisplayOptions) <> (doAutoColResize in AValue) then
AutoFillColumns := (doAutoColResize in AValue);