From 6874b739d8fbcfee311fd7cc698c12d72a4607c0 Mon Sep 17 00:00:00 2001
From: alexs75 <alexs75@8e941d3f-bd1b-0410-a28a-d453659cc2b4>
Date: Wed, 7 Feb 2018 06:02:09 +0000
Subject: [PATCH] RxFPC:enable TRxDBGridExportPDF for FPC 3.0.4

git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@6183 8e941d3f-bd1b-0410-a28a-d453659cc2b4
---
 .../rx/trunk/demos/RxLookup/project1.lpi      | 90 ++++++++++++-------
 components/rx/trunk/registerrxdb.pas          |  6 +-
 .../rx/trunk/rxdb/rxdbgridexportpdf.pas       |  4 +-
 .../trunk/rxdb/rxdbgridexportpdfsetupunit.pas |  4 +-
 4 files changed, 67 insertions(+), 37 deletions(-)

diff --git a/components/rx/trunk/demos/RxLookup/project1.lpi b/components/rx/trunk/demos/RxLookup/project1.lpi
index 06c947d17..d2ff8b3fa 100644
--- a/components/rx/trunk/demos/RxLookup/project1.lpi
+++ b/components/rx/trunk/demos/RxLookup/project1.lpi
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <CONFIG>
   <ProjectOptions>
-    <Version Value="11"/>
+    <Version Value="10"/>
     <General>
       <MainUnit Value="0"/>
       <ResourceType Value="res"/>
@@ -22,14 +22,9 @@
       <ExcludeFileFilter Value="*.(bak|ppu|ppw|o|so);*~;backup"/>
     </PublishOptions>
     <RunParams>
-      <FormatVersion Value="2"/>
-      <Modes Count="1">
-        <Mode0 Name="default">
-          <local>
-            <LaunchingApplication PathPlusParams="/usr/X11R6/bin/xterm -T 'Lazarus Run Output' -e $(LazarusDir)/tools/runwait.sh $(TargetCmdLine)"/>
-          </local>
-        </Mode0>
-      </Modes>
+      <local>
+        <FormatVersion Value="1"/>
+      </local>
     </RunParams>
     <RequiredPackages Count="3">
       <Item1>
@@ -44,7 +39,7 @@
         <PackageName Value="LCL"/>
       </Item3>
     </RequiredPackages>
-    <Units Count="11">
+    <Units Count="15">
       <Unit0>
         <Filename Value="project1.lpr"/>
         <IsPartOfProject Value="True"/>
@@ -59,8 +54,8 @@
         <HasResources Value="True"/>
         <ResourceBaseClass Value="Form"/>
         <UnitName Value="Unit1"/>
-        <TopLine Value="55"/>
-        <CursorPos X="38" Y="51"/>
+        <TopLine Value="57"/>
+        <CursorPos X="11" Y="67"/>
         <UsageCount Value="22"/>
         <Loaded Value="True"/>
         <LoadedDesigner Value="True"/>
@@ -127,15 +122,46 @@
       </Unit9>
       <Unit10>
         <Filename Value="../../rxdb/rxlookup.pas"/>
-        <IsVisibleTab Value="True"/>
-        <EditorIndex Value="1"/>
+        <EditorIndex Value="-1"/>
         <TopLine Value="957"/>
         <CursorPos X="25" Y="978"/>
         <UsageCount Value="10"/>
-        <Loaded Value="True"/>
       </Unit10>
+      <Unit11>
+        <Filename Value="../../registerrx.pas"/>
+        <EditorIndex Value="-1"/>
+        <UsageCount Value="10"/>
+      </Unit11>
+      <Unit12>
+        <Filename Value="../../registerrxdb.pas"/>
+        <UnitName Value="RegisterRxDB"/>
+        <EditorIndex Value="1"/>
+        <TopLine Value="34"/>
+        <CursorPos X="36" Y="155"/>
+        <UsageCount Value="10"/>
+        <Loaded Value="True"/>
+      </Unit12>
+      <Unit13>
+        <Filename Value="../../rxdb/rxdbgridexportpdf.pas"/>
+        <UnitName Value="RxDBGridExportPdf"/>
+        <EditorIndex Value="2"/>
+        <TopLine Value="183"/>
+        <CursorPos X="3" Y="196"/>
+        <UsageCount Value="10"/>
+        <Loaded Value="True"/>
+      </Unit13>
+      <Unit14>
+        <Filename Value="../../rxdb/rxdbgridexportpdfsetupunit.pas"/>
+        <UnitName Value="RxDBGridExportPdfSetupUnit"/>
+        <IsVisibleTab Value="True"/>
+        <EditorIndex Value="3"/>
+        <TopLine Value="83"/>
+        <CursorPos X="31" Y="98"/>
+        <UsageCount Value="10"/>
+        <Loaded Value="True"/>
+      </Unit14>
     </Units>
-    <JumpHistory Count="16" HistoryIndex="15">
+    <JumpHistory Count="17" HistoryIndex="16">
       <Position1>
         <Filename Value="unit1.pas"/>
         <Caret Line="47" TopLine="34"/>
@@ -177,29 +203,33 @@
         <Caret Line="74" Column="29" TopLine="40"/>
       </Position10>
       <Position11>
-        <Filename Value="../../rxdb/rxlookup.pas"/>
-        <Caret Line="362" Column="14" TopLine="345"/>
-      </Position11>
-      <Position12>
-        <Filename Value="../../rxdb/rxlookup.pas"/>
-        <Caret Line="323" Column="33" TopLine="303"/>
-      </Position12>
-      <Position13>
         <Filename Value="unit1.pas"/>
         <Caret Line="51" Column="38" TopLine="40"/>
-      </Position13>
-      <Position14>
+      </Position11>
+      <Position12>
         <Filename Value="unit1.pas"/>
         <Caret Line="52" Column="38" TopLine="41"/>
+      </Position12>
+      <Position13>
+        <Filename Value="../../registerrxdb.pas"/>
+        <Caret Line="142" Column="15" TopLine="130"/>
+      </Position13>
+      <Position14>
+        <Filename Value="../../registerrxdb.pas"/>
+        <Caret Line="154" Column="31" TopLine="146"/>
       </Position14>
       <Position15>
-        <Filename Value="unit1.pas"/>
-        <Caret Line="51" Column="38" TopLine="55"/>
+        <Filename Value="../../registerrxdb.pas"/>
+        <Caret Line="155" Column="36" TopLine="34"/>
       </Position15>
       <Position16>
-        <Filename Value="../../rxdb/rxlookup.pas"/>
-        <Caret Line="238" Column="28" TopLine="227"/>
+        <Filename Value="../../rxdb/rxdbgridexportpdf.pas"/>
+        <Caret Line="194" Column="31" TopLine="186"/>
       </Position16>
+      <Position17>
+        <Filename Value="../../rxdb/rxdbgridexportpdf.pas"/>
+        <Caret Line="846" Column="84" TopLine="833"/>
+      </Position17>
     </JumpHistory>
   </ProjectOptions>
   <CompilerOptions>
diff --git a/components/rx/trunk/registerrxdb.pas b/components/rx/trunk/registerrxdb.pas
index d8da03eb1..531e33a98 100644
--- a/components/rx/trunk/registerrxdb.pas
+++ b/components/rx/trunk/registerrxdb.pas
@@ -43,7 +43,7 @@ implementation
 uses DB, DBPropEdits, rxdbgrid, RxDBSpinEdit, RxDBTimeEdit, RxDBCtrls, rxmemds,
   ComponentEditors, rxseldsfrm, PropEdits, RxDBColorBox, rxdbdateedit, rxdbcomb,
   rxlookup, rxdbcurredit, RxDBGridFooterTools, rxdbverticalgrid
-  {$IF (FPC_FULLVERSION >= 30101)}
+  {$IF (FPC_FULLVERSION >= 30004)}
   , RxDBGridExportPdf
   {$ENDIF}
   ;
@@ -151,7 +151,7 @@ begin
   RegisterComponents('RX DBAware',[TRxDBGridFooterTools]);
 end;
 
-{$IF (FPC_FULLVERSION >= 30101)}
+{$IF (FPC_FULLVERSION >= 30004)}
 procedure RegisterRxDBGridExportPDF;
 begin
   RegisterComponents('RX DBAware',[TRxDBGridExportPDF]);
@@ -205,7 +205,7 @@ begin
   RegisterUnit('RxDBGridFooterTools', @RegisterRxDbGridFooterTools);
   RegisterUnit('rxdbverticalgrid', @RegisterRxDBVerticalGrid);
 
-  {$IF (FPC_FULLVERSION >= 30101)}
+  {$IF (FPC_FULLVERSION >= 30004)}
   RegisterUnit('RxDBGridExportPdf', @RegisterRxDBGridExportPDF);
   {$ENDIF}
 
diff --git a/components/rx/trunk/rxdb/rxdbgridexportpdf.pas b/components/rx/trunk/rxdb/rxdbgridexportpdf.pas
index e16618331..85894deb5 100644
--- a/components/rx/trunk/rxdb/rxdbgridexportpdf.pas
+++ b/components/rx/trunk/rxdb/rxdbgridexportpdf.pas
@@ -35,7 +35,7 @@ unit RxDBGridExportPdf;
 
 interface
 
-{$IF (FPC_FULLVERSION >= 30101)}
+{$IF (FPC_FULLVERSION >= 30004)}
 uses
   Classes, SysUtils, DB, rxdbgrid, rxlclutils, Graphics, fpPDF, contnrs,  fpparsettf,
   fpTTF;
@@ -191,7 +191,7 @@ type
   {$ENDIF}
 implementation
 
-{$IF (FPC_FULLVERSION >= 30101)}
+{$IF (FPC_FULLVERSION >= 30004)}
 uses Grids, rxdconst, FileUtil, Forms, Controls, LCLIntf, LazFileUtils, FPReadBMP,
   RxDBGridExportPdfSetupUnit, LazUTF8;
 
diff --git a/components/rx/trunk/rxdb/rxdbgridexportpdfsetupunit.pas b/components/rx/trunk/rxdb/rxdbgridexportpdfsetupunit.pas
index f8d6c2e4f..e0559093d 100644
--- a/components/rx/trunk/rxdb/rxdbgridexportpdfsetupunit.pas
+++ b/components/rx/trunk/rxdb/rxdbgridexportpdfsetupunit.pas
@@ -35,7 +35,7 @@ unit RxDBGridExportPdfSetupUnit;
 
 interface
 
-{$IF (FPC_FULLVERSION >= 30101)}
+{$IF (FPC_FULLVERSION >= 30004)}
 uses
   Classes, SysUtils, FileUtil, Forms, Controls, Graphics, Dialogs, StdCtrls,
   EditBtn, ButtonPanel, ExtCtrls, ComCtrls, ColorBox, fpPDF;
@@ -95,7 +95,7 @@ const
 
   {$ENDIF}
 implementation
-{$IF (FPC_FULLVERSION >= 30101)}
+{$IF (FPC_FULLVERSION >= 30004)}
 uses rxdconst, LCLIntf;
 
 {$R *.lfm}