pascal/lazarus-ccr
1
0
Fork 0
Code Issues Releases Activity

fpspreadsheet: Check lcl version to activate worksheetgrid multi-selection (Laz r46767) for Laz trunk only

Browse Source 
git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@3706 8e941d3f-bd1b-0410-a28a-d453659cc2b4
This commit is contained in:
wp_xxyyzz
2014-11-07 14:42:09 +00:00
parent ad1bdb294a
commit 26ef279b23
3 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
components/fpspreadsheet/fpspreadsheetctrls.pas
View File

@ -6,7 +6,7 @@ interface
uses uses
Classes, SysUtils, Controls, StdCtrls, ComCtrls, ValEdit, ActnList, Classes, SysUtils, Controls, StdCtrls, ComCtrls, ValEdit, ActnList,
fpspreadsheet, fpsAllFormats; fpspreadsheet, {%H-}fpsAllFormats;
type type
TsWorkbookSourceErrorEvent = procedure (Sender: TObject; TsWorkbookSourceErrorEvent = procedure (Sender: TObject;

14
components/fpspreadsheet/fpspreadsheetgrid.pas
View File

@ -17,12 +17,12 @@ unit fpspreadsheetgrid;
{$mode objfpc}{$H+} {$mode objfpc}{$H+}
{.$DEFINE ENABLE_MULTI_SELECT} // requires Laz trunk younger than r...??? (containing grid multisel patch)
interface interface
uses uses
Classes, SysUtils, LResources, Forms, Controls, Graphics, Dialogs, Grids, Classes, SysUtils, LResources, Forms, Controls, Graphics, Dialogs, Grids,
LCLVersion,
fpspreadsheet, fpspreadsheetctrls; fpspreadsheet, fpspreadsheetctrls;
type type
@ -572,6 +572,12 @@ const
tlBottom, tlTop, tlCenter, tlBottom tlBottom, tlTop, tlCenter, tlBottom
); );
{$IF (lcl_fullversion >= 1030000)}
ENABLE_MULTI_SELECT = 1; // requires Laz trunk after r46767
{$ELSE}
ENABLE_MULTI_SELECT = 0;
{$ENDIF}
var var
{@@ Auxiliary bitmap containing the fill pattern used by biff2 cell backgrounds. } {@@ Auxiliary bitmap containing the fill pattern used by biff2 cell backgrounds. }
FillPattern_BIFF2: TBitmap = nil; FillPattern_BIFF2: TBitmap = nil;
@ -768,7 +774,7 @@ begin
FInitRowCount := 100; FInitRowCount := 100;
FCellFont := TFont.Create; FCellFont := TFont.Create;
FOwnsWorkbook := true; FOwnsWorkbook := true;
{$IFDEF ENABLE_MULTI_SELECT} {$IF (ENABLE_MULTI_SELECT=1)}
RangeSelectMode := rsmMulti; RangeSelectMode := rsmMulti;
{$ENDIF} {$ENDIF}
end; end;
@ -3225,13 +3231,13 @@ end;
procedure TsCustomWorksheetGrid.MoveSelection; procedure TsCustomWorksheetGrid.MoveSelection;
var var
sel: TsCellRangeArray; sel: TsCellRangeArray;
{$IFDEF ENABLE_MULTI_SELECT} {$IF (ENABLE_MULTI_SELECT=1)}
i: Integer; i: Integer;
{$ENDIF} {$ENDIF}
begin begin
if Worksheet <> nil then if Worksheet <> nil then
begin begin
{$IFDEF ENABLE_MULTI_SELECT} {$IF (ENABLE_MULTI_SELECT=1)}
if HasMultiSelection then if HasMultiSelection then
begin begin
SetLength(sel, SelectedRangeCount); SetLength(sel, SelectedRangeCount);