From 26ef279b23e35c8c5ef28c17b84d5a037c34c6e9 Mon Sep 17 00:00:00 2001
From: wp_xxyyzz <wp_xxyyzz@8e941d3f-bd1b-0410-a28a-d453659cc2b4>
Date: Fri, 7 Nov 2014 14:42:09 +0000
Subject: [PATCH] fpspreadsheet: Check lcl version to activate worksheetgrid
 multi-selection (Laz r46767) for Laz trunk only

git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@3706 8e941d3f-bd1b-0410-a28a-d453659cc2b4
---
 .../fpspreadsheet/examples/fpsctrls/demo_ctrls.lpr |  2 +-
 components/fpspreadsheet/fpspreadsheetctrls.pas    |  2 +-
 components/fpspreadsheet/fpspreadsheetgrid.pas     | 14 ++++++++++----
 3 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/components/fpspreadsheet/examples/fpsctrls/demo_ctrls.lpr b/components/fpspreadsheet/examples/fpsctrls/demo_ctrls.lpr
index 45406a135..cdf79767d 100644
--- a/components/fpspreadsheet/examples/fpsctrls/demo_ctrls.lpr
+++ b/components/fpspreadsheet/examples/fpsctrls/demo_ctrls.lpr
@@ -6,7 +6,7 @@ uses
   {$IFDEF UNIX}{$IFDEF UseCThreads}
   cthreads,
   {$ENDIF}{$ENDIF}
-  Interfaces, // this includes the LCL widgetset
+  Interfaces,  // this includes the LCL widgetset
   Forms, main
   { you can add units after this };
 
diff --git a/components/fpspreadsheet/fpspreadsheetctrls.pas b/components/fpspreadsheet/fpspreadsheetctrls.pas
index 9b391b185..9afdab891 100644
--- a/components/fpspreadsheet/fpspreadsheetctrls.pas
+++ b/components/fpspreadsheet/fpspreadsheetctrls.pas
@@ -6,7 +6,7 @@ interface
 
 uses
   Classes, SysUtils, Controls, StdCtrls, ComCtrls, ValEdit, ActnList,
-  fpspreadsheet, fpsAllFormats;
+  fpspreadsheet, {%H-}fpsAllFormats;
 
 type
   TsWorkbookSourceErrorEvent = procedure (Sender: TObject;
diff --git a/components/fpspreadsheet/fpspreadsheetgrid.pas b/components/fpspreadsheet/fpspreadsheetgrid.pas
index 9c81cf387..a2fd0bf1d 100644
--- a/components/fpspreadsheet/fpspreadsheetgrid.pas
+++ b/components/fpspreadsheet/fpspreadsheetgrid.pas
@@ -17,12 +17,12 @@ unit fpspreadsheetgrid;
 
 {$mode objfpc}{$H+}
 
-{.$DEFINE ENABLE_MULTI_SELECT}  // requires Laz trunk younger than r...??? (containing grid multisel patch)
 
 interface
 
 uses
   Classes, SysUtils, LResources, Forms, Controls, Graphics, Dialogs, Grids,
+  LCLVersion,
   fpspreadsheet, fpspreadsheetctrls;
 
 type
@@ -572,6 +572,12 @@ const
     tlBottom, tlTop, tlCenter, tlBottom
   );
 
+ {$IF (lcl_fullversion >= 1030000)}
+  ENABLE_MULTI_SELECT = 1;  // requires Laz trunk after r46767
+ {$ELSE}
+  ENABLE_MULTI_SELECT = 0;
+ {$ENDIF}
+
 var
   {@@ Auxiliary bitmap containing the fill pattern used by biff2 cell backgrounds. }
   FillPattern_BIFF2: TBitmap = nil;
@@ -768,7 +774,7 @@ begin
   FInitRowCount := 100;
   FCellFont := TFont.Create;
   FOwnsWorkbook := true;
- {$IFDEF ENABLE_MULTI_SELECT}
+ {$IF (ENABLE_MULTI_SELECT=1)}
   RangeSelectMode := rsmMulti;
  {$ENDIF}
 end;
@@ -3225,13 +3231,13 @@ end;
 procedure TsCustomWorksheetGrid.MoveSelection;
 var
   sel: TsCellRangeArray;
-  {$IFDEF ENABLE_MULTI_SELECT}
+  {$IF (ENABLE_MULTI_SELECT=1)}
   i: Integer;
   {$ENDIF}
 begin
   if Worksheet <> nil then
   begin
-    {$IFDEF ENABLE_MULTI_SELECT}
+    {$IF (ENABLE_MULTI_SELECT=1)}
     if HasMultiSelection then
     begin
       SetLength(sel, SelectedRangeCount);