fpspreadsheet: Fix compilation back to Laz v2.0.12

git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@9076 8e941d3f-bd1b-0410-a28a-d453659cc2b4

components/fpspreadsheet/examples/visual/fpschart/fpschartlink/chart_demo.lpi

@@ -4,6 +4,9 @@
     <Version Value="12"/>
     <PathDelim Value="\"/>
     <General>
+      <Flags>
+        <CompatibilityMode Value="True"/>
+      </Flags>
       <SessionStorage Value="InProjectDir"/>
       <Title Value="chart_demo"/>
       <Scaled Value="True"/>
@@ -14,8 +17,8 @@
       </XPManifest>
       <Icon Value="0"/>
     </General>
-    <BuildModes>
+    <BuildModes Count="1">
-      <Item Name="Default" Default="True"/>
+      <Item1 Name="Default" Default="True"/>
     </BuildModes>
     <PublishOptions>
       <Version Value="2"/>
@@ -24,32 +27,32 @@
     <RunParams>
       <FormatVersion Value="2"/>
     </RunParams>
-    <RequiredPackages>
+    <RequiredPackages Count="4">
-      <Item>
+      <Item1>
         <PackageName Value="TAChartLazarusPkg"/>
-      </Item>
+      </Item1>
-      <Item>
+      <Item2>
         <PackageName Value="laz_fpspreadsheet_visual_dsgn"/>
-      </Item>
+      </Item2>
-      <Item>
+      <Item3>
         <PackageName Value="laz_fpspreadsheet_visual"/>
-      </Item>
+      </Item3>
-      <Item>
+      <Item4>
         <PackageName Value="LCL"/>
-      </Item>
+      </Item4>
     </RequiredPackages>
-    <Units>
+    <Units Count="2">
-      <Unit>
+      <Unit0>
         <Filename Value="chart_demo.lpr"/>
         <IsPartOfProject Value="True"/>
-      </Unit>
+      </Unit0>
-      <Unit>
+      <Unit1>
         <Filename Value="main.pas"/>
         <IsPartOfProject Value="True"/>
         <ComponentName Value="Form1"/>
         <HasResources Value="True"/>
         <ResourceBaseClass Value="Form"/>
-      </Unit>
+      </Unit1>
     </Units>
   </ProjectOptions>
   <CompilerOptions>
@@ -72,23 +75,18 @@
         </Win32>
       </Options>
     </Linking>
-    <Other>
-      <ConfigFile>
-        <WriteConfigFilePath Value=""/>
-      </ConfigFile>
-    </Other>
   </CompilerOptions>
   <Debugging>
-    <Exceptions>
+    <Exceptions Count="3">
-      <Item>
+      <Item1>
         <Name Value="EAbort"/>
-      </Item>
+      </Item1>
-      <Item>
+      <Item2>
         <Name Value="ECodetoolError"/>
-      </Item>
+      </Item2>
-      <Item>
+      <Item3>
         <Name Value="EFOpenError"/>
-      </Item>
+      </Item3>
     </Exceptions>
   </Debugging>
 </CONFIG>

components/fpspreadsheet/examples/visual/fpschart/fpschartlink/main.lfm

@@ -105,7 +105,6 @@ object Form1: TForm1
         '../../../other/chart/scatter_loglog.ods'
       )
       TabOrder = 0
-      TextHint = 'Enter or select file name'
       OnCloseUp = ComboBox1CloseUp
     end
     object Button1: TButton

components/fpspreadsheet/examples/visual/fpschart/fpschartlink/main.pas

@@ -5,7 +5,8 @@ unit main;
 interface
 
 uses
-  Classes, SysUtils, Forms, Controls, Graphics, Dialogs, ExtCtrls, StdCtrls,
+  Classes, SysUtils,
+  LCLVersion, Forms, Controls, Graphics, Dialogs, ExtCtrls, StdCtrls,
   TAGraph,
   fpSpreadsheet, fpsTypes, fpsOpenDocument,
   fpSpreadsheetCtrls, fpSpreadsheetGrid,  fpSpreadsheetChart;
@@ -73,6 +74,9 @@ end;
 
 procedure TForm1.FormCreate(Sender: TObject);
 begin
+  {$IF LCL_FullVersion >= 2020000}
+  ComboBox1.TextHint := 'Enter or select file name';
+  {$IFEND}
   if ParamCount > 0 then
   begin
     Combobox1.Text := ParamStr(1);

components/fpspreadsheet/source/visual/fpspreadsheetchart.pas

@@ -18,7 +18,7 @@ interface
 
 uses
   // RTL/FCL
-  Classes, Contnrs, SysUtils, Types,
+  Classes, Contnrs, SysUtils, Types, FPCanvas,
   // LCL
   LCLVersion, Forms, Controls, Graphics, GraphUtil, Dialogs,
   // TAChart
@@ -1799,7 +1799,9 @@ begin
   axis.TickLength := IfThen(catOutside in AWorkbookAxis.MajorTicks, 4, 0);
   axis.TickInnerLength := IfThen(catInside in AWorkbookAxis.MajorTicks, 4, 0);
   axis.TickColor := axis.AxisPen.Color;
+  {$IF LCL_FullVersion >= 3000000}
   axis.TickWidth := axis.AxisPen.Width;
+  {$IFEND}
 
   // Minor axis grid
   if AWorkbookAxis.MinorGridLines.Style <> clsNoLine then
@@ -1814,7 +1816,9 @@ begin
     minorAxis.TickLength := IfThen(catOutside in AWorkbookAxis.MinorTicks, 2, 0);
     minorAxis.TickInnerLength := IfThen(catInside in AWorkbookAxis.MinorTicks, 2, 0);
     minorAxis.TickColor := axis.AxisPen.Color;
+    {$IF LCL_FullVersion >= 3000000}
     minorAxis.TickWidth := minorAxis.Grid.Width;
+    {$IFEND}
   end;
 
   // Inverted?
@@ -1921,7 +1925,9 @@ begin
             h := mmToPx(img.Height, ppi);
             png := TPortableNetworkGraphic.Create;
             png.Assign(img.Image);
+            {$IF LCL_FullVersion >= 2020000}
             ScaleImg(png, w, h);
+            {$IFEND}
             FBrushBitmaps.Add(png);
             ABrush.Bitmap := png;
           end else
@@ -2023,8 +2029,10 @@ begin
     case AWorkbookSeries.LabelPosition of
       lpInside:
         TPieSeries(AChartSeries).MarkPositions := pmpInside;
+      {$IF LCL_FullVersion >= 2020000}
       lpCenter:
         TPieSeries(AChartSeries).MarkPositionCentered := true;
+      {$IFEND}
       else
         TPieSeries(AChartSeries).MarkPositions := pmpAround;
     end
@@ -2068,7 +2076,9 @@ begin
     AChartTitle.Text.Clear;
     AChartTitle.Text.Add(AWorkbookTitle.Caption);
     AChartTitle.Visible := AWorkbookTitle.Visible;
+    {$IF LCL_FullVersion >= 2020000}
     AChartTitle.WordWrap := true;
+    {$IFEND}
     Convert_sFont_to_Font(AWorkbookTitle.Font, AChartTitle.Font);
     UpdateChartPen(AWorkbookTitle.Chart, AWorkbookTitle.Border, AChartTitle.Frame);
     UpdateChartBrush(AWorkbookTitle.Chart, AWorkbookTitle.Background, AChartTitle.Brush);
@@ -2119,11 +2129,13 @@ procedure TsWorkbookChartLink.UpdatePieSeries(AWorkbookSeries: TsPieSeries;
   AChartSeries: TPieSeries);
 begin
   UpdateChartPen(AWorkbookSeries.Chart, AWorkbookSeries.Line, AChartSeries.EdgePen);
-  AChartSeries.StartAngle := AWorkbookSeries.StartAngle;
   AChartSeries.Legend.Multiplicity := lmPoint;
   AChartSeries.Legend.Format := '%2:s';
+  {$IF LCL_FullVersion >= 2020000}
+  AChartSeries.StartAngle := AWorkbookSeries.StartAngle;
   if AWorkbookSeries is TsRingSeries then
     AChartSeries.InnerRadiusPercent := TsRingSeries(AWorkbookSeries).InnerRadiusPercent;
+  {$IFEND}
 
   FChart.BottomAxis.Visible := false;
   FChart.LeftAxis.Visible := false;

components/fpspreadsheet/source/visual/fpsstockseries.pas

@@ -73,12 +73,14 @@ type
     function CalcTickWidth(AX: Double; AIndex: Integer): Double;
     procedure GetLegendItems(AItems: TChartLegendItems); override;
     function GetSeriesColor: TColor; override;
+    {$IF LCL_FullVersion >= 2020000}
     class procedure GetXYCountNeeded(out AXCount, AYCount: Cardinal); override;
-    function SkipMissingValues(AIndex: Integer): Boolean; override;
-    function ToolTargetDistance(const AParams: TNearestPointParams;
-      AGraphPt: TDoublePoint; APointIdx, AXIdx, AYIdx: Integer): Integer; override;
     procedure UpdateLabelDirectionReferenceLevel(AIndex, AYIndex: Integer;
       var ALevel: Double); override;
+    function SkipMissingValues(AIndex: Integer): Boolean; override;
+    {$IFEND}
+    function ToolTargetDistance(const AParams: TNearestPointParams;
+      AGraphPt: TDoublePoint; APointIdx, AXIdx, AYIdx: Integer): Integer; override;
   public
     procedure Assign(ASource: TPersistent); override;
     constructor Create(AOwner: TComponent); override;
@@ -436,7 +438,7 @@ begin
     end;
     if Source[i]^.Color <> clTAColor then
     begin
-      ADrawer.SetPenParams(FPen[TOHLCPenKind(idx)].Style, Source[i]^.Color, FPen[TOHLCPenKind(idx)].Width);
+      ADrawer.SetPenParams(FPen[TOHLCPenKind(idx)].Style, Source[i]^.Color {$IF LCL_FUllVersion >= 2020000}, FPen[TOHLCPenKind(idx)].Width{$IFEND});
       ADrawer.SetBrushParams(FBrush[TOHLCBrushKind(idx)].Style, Source[i]^.Color);
     end;
 
@@ -448,10 +450,12 @@ begin
     prevclose := yclose;
   end;
 
+  {$IF LCL_FullVersion >= 2020000}
   GetXYCountNeeded(nx, ny);
   if Source.YCount > ny then
     for i := 0 to ny-1 do DrawLabels(ADrawer, i)
   else
+  {$ENDIF}
     DrawLabels(ADrawer);
 end;
 
@@ -580,11 +584,13 @@ begin
   Result := LinePen.Color;
 end;
 
+{$IF LCL_FullVersion >= 2020000}
 class procedure TStockSeries.GetXYCountNeeded(out AXCount, AYCount: Cardinal);
 begin
   AXCount := 0;
   AYCount := 4;
 end;
+{$IFEND}
 
 procedure TStockSeries.SetBrush(AIndex: TOHLCBrushKind; AValue: TOHLCBrush);
 begin
@@ -649,12 +655,14 @@ begin
   UpdateParentChart;
 end;
 
+{$IF LCL_FullVersion >= 2020000}
 function TStockSeries.SkipMissingValues(AIndex: Integer): Boolean;
 begin
   Result := IsNaN(Source[AIndex]^.Point);
   if not Result then
     Result := HasMissingYValue(AIndex, 4);
 end;
+{$IFEND}
 
 function TStockSeries.ToolTargetDistance(
   const AParams: TNearestPointParams; AGraphPt: TDoublePoint;
@@ -716,6 +724,7 @@ begin
   end;
 end;
 
+{$IF LCL_FullVersion >= 2020000}
 procedure TStockSeries.UpdateLabelDirectionReferenceLevel(
   AIndex, AYIndex: Integer; var ALevel: Double);
 var
@@ -732,5 +741,7 @@ begin
 end;
 {$ENDIF}
 
+{$ENDIF}
+
 end.