You've already forked lazarus-ccr
fpspreadsheet: Fix WorksheetGrid.OnValidateEntry not showing OldValue and NewValue parameters (issue #30236)
git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@5214 8e941d3f-bd1b-0410-a28a-d453659cc2b4
This commit is contained in:
File diff suppressed because it is too large
Load Diff
@ -8,7 +8,7 @@ uses
|
|||||||
Classes, SysUtils, FileUtil, Forms, Controls, Graphics, Dialogs, ExtCtrls,
|
Classes, SysUtils, FileUtil, Forms, Controls, Graphics, Dialogs, ExtCtrls,
|
||||||
ComCtrls, ActnList, Menus, StdActns, Buttons,
|
ComCtrls, ActnList, Menus, StdActns, Buttons,
|
||||||
fpstypes, fpspreadsheet, fpspreadsheetctrls, fpspreadsheetgrid, fpsActions,
|
fpstypes, fpspreadsheet, fpspreadsheetctrls, fpspreadsheetgrid, fpsActions,
|
||||||
fpsRegFileFormats, fpsSYLK, xlsxml;
|
fpsRegFileFormats, fpsSYLK, xlsxml, Grids;
|
||||||
|
|
||||||
type
|
type
|
||||||
|
|
||||||
@ -407,7 +407,7 @@ implementation
|
|||||||
{$R *.lfm}
|
{$R *.lfm}
|
||||||
|
|
||||||
uses
|
uses
|
||||||
LCLIntf, inifiles, uriparser, Grids,
|
LCLIntf, inifiles, uriparser,
|
||||||
fpsUtils, fpsCSV,
|
fpsUtils, fpsCSV,
|
||||||
sCSVParamsForm, sCurrencyForm, sFormatSettingsForm, sSortParamsForm,
|
sCSVParamsForm, sCurrencyForm, sFormatSettingsForm, sSortParamsForm,
|
||||||
sHyperlinkForm, sNumFormatForm, sSearchForm;
|
sHyperlinkForm, sNumFormatForm, sSearchForm;
|
||||||
|
@ -3152,8 +3152,20 @@ begin
|
|||||||
end;
|
end;
|
||||||
|
|
||||||
function TsCustomWorksheetGrid.GetCells(ACol, ARow: Integer): String;
|
function TsCustomWorksheetGrid.GetCells(ACol, ARow: Integer): String;
|
||||||
|
var
|
||||||
|
msg: TGridMessage;
|
||||||
begin
|
begin
|
||||||
Result := GetCellText(ACol, ARow);
|
if (Editor <> nil) and Editor.Visible then
|
||||||
|
begin
|
||||||
|
msg.LclMsg.msg := GM_GETVALUE;
|
||||||
|
msg.Grid := Self;
|
||||||
|
msg.Col := ACol;
|
||||||
|
msg.Row := ARow;
|
||||||
|
msg.Value := ''; //GetCells(FCol, FRow);
|
||||||
|
Editor.Dispatch(msg);
|
||||||
|
Result := msg.value;
|
||||||
|
end else
|
||||||
|
Result := GetCellText(ACol, ARow);
|
||||||
end;
|
end;
|
||||||
|
|
||||||
{@@ ----------------------------------------------------------------------------
|
{@@ ----------------------------------------------------------------------------
|
||||||
|
Reference in New Issue
Block a user