paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-12-11 12:00:37 +01:00
Code Issues Packages Projects Releases Wiki Activity

LCL: TValueListEditor: don't allow setting ColCount to anything but 2.

Browse Source 
git-svn-id: trunk@62118 -
This commit is contained in:
bart 2019-10-25 17:02:09 +00:00
parent a4df0d88cf
commit 4b43ae528d
2 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lcl/grids.pas
View File

@ -904,7 +904,6 @@ type
function ScrollGrid(Relative:Boolean; DCol,DRow: Integer): TPoint;
procedure SetCol(AValue: Integer);
procedure SetColWidths(Acol: Integer; Avalue: Integer);
procedure SetColCount(AValue: Integer);
procedure SetColRowDragIndicatorColor(const AValue: TColor);
procedure SetDefColWidth(AValue: Integer);
procedure SetDefRowHeight(AValue: Integer);
@ -1151,6 +1150,7 @@ type
procedure SelectEditor; virtual;
function SelectCell(ACol, ARow: Integer): Boolean; virtual;
procedure SetCanvasFont(aFont: TFont);
procedure SetColCount(AValue: Integer); virtual;
procedure SetColor(Value: TColor); override;
procedure SetColRow(const ACol,ARow: Integer; withEvents: boolean = false);
procedure SetCursor(AValue: TCursor); override;

12
lcl/valedit.pas
View File

@ -119,6 +119,7 @@ type
TValueListEditor = class(TCustomStringGrid)
private
FTitleCaptions: TStrings;
FCreating: Boolean;
FStrings: TValueListStrings;
FKeyOptions: TKeyOptions;
FDisplayOptions: TDisplayOptions;
@ -165,6 +166,7 @@ type
procedure ResetDefaultColWidths; override;
procedure SaveContent(cfg: TXMLConfig); override;
procedure SetCells(ACol, ARow: Integer; const AValue: string); override;
procedure SetColCount(AValue: Integer); override;
procedure SetEditText(ACol, ARow: Longint; const Value: string); override;
procedure SetFixedRows(const AValue: Integer); override;
procedure SetRowCount(AValue: Integer);
@ -326,6 +328,7 @@ const
rsVLENoRowCountFound = 'Error reading file "%s":'^m'No value for RowCount found.';
rsVLERowIndexOutOfBounds = 'Error reading file "%s":'^m'Row index out of bounds (%d).';
rsVLEColIndexOutOfBounds = 'Error reading file "%s":'^m'Column index out of bounds (%d).';
rsVLEIllegalColCount = 'ColCount of a TValueListEditor cannot be %d (it can only ever be 2).';
procedure Register;
@ -724,6 +727,7 @@ end;
constructor TValueListEditor.Create(AOwner: TComponent);
begin
//need FStrings before inherited Create, because they are needed in overridden SelectEditor
FCreating := True;
FStrings := TValueListStrings.Create(Self);
FStrings.NameValueSeparator := '=';
FTitleCaptions := TStringList.Create;
@ -757,6 +761,7 @@ begin
FDropDownRows := 8;
ShowColumnTitles;
AutoFillColumns := true;
FCreating := False;
end;
destructor TValueListEditor.Destroy;
@ -1463,6 +1468,13 @@ begin
end;
end;
procedure TValueListEditor.SetColCount(AValue: Integer);
begin
if (not FCreating) and (not (csLoading in ComponentState)) and (AValue <> 2) then
raise EGridException.CreateFmt(rsVLEIllegalColCount,[AValue]);
inherited SetColCount(AValue);
end;
function TValueListEditor.GetEditText(ACol, ARow: Integer): string;
begin
Result:= Cells[ACol, ARow];