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

RxFPC - fix compile with FPC fixes branch - tnx. thierrybo

Browse Source 
git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@8161 8e941d3f-bd1b-0410-a28a-d453659cc2b4
This commit is contained in:
alexs75
2021-11-30 07:16:08 +00:00
parent f929e95d11
commit 7710f5aa20
6 changed files with 21 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
components/rx/trunk/registerrxdb.pas
View File

@ -43,7 +43,7 @@ implementation
uses DB, DBPropEdits, rxdbgrid, RxDBSpinEdit, RxDBTimeEdit, RxDBCtrls, rxmemds, uses DB, DBPropEdits, rxdbgrid, RxDBSpinEdit, RxDBTimeEdit, RxDBCtrls, rxmemds,
ComponentEditors, rxseldsfrm, PropEdits, RxDBColorBox, rxdbdateedit, rxdbcomb, ComponentEditors, rxseldsfrm, PropEdits, RxDBColorBox, rxdbdateedit, rxdbcomb,
rxlookup, rxdbcurredit, RxDBGridFooterTools, rxdbverticalgrid rxlookup, rxdbcurredit, RxDBGridFooterTools, rxdbverticalgrid
{$IF (FPC_FULLVERSION >= 30004)} {$IFDEF RX_USE_FCL_PDF}
, RxDBGridExportPdf , RxDBGridExportPdf
{$ENDIF} {$ENDIF}
; ;
@ -170,7 +170,7 @@ begin
RegisterComponents('RX DBAware',[TRxDBGridFooterTools]); RegisterComponents('RX DBAware',[TRxDBGridFooterTools]);
end; end;
{$IF (FPC_FULLVERSION >= 30004)} {$IFDEF RX_USE_FCL_PDF}
procedure RegisterRxDBGridExportPDF; procedure RegisterRxDBGridExportPDF;
begin begin
RegisterComponents('RX DBAware',[TRxDBGridExportPDF]); RegisterComponents('RX DBAware',[TRxDBGridExportPDF]);
@ -224,7 +224,7 @@ begin
RegisterUnit('RxDBGridFooterTools', @RegisterRxDbGridFooterTools); RegisterUnit('RxDBGridFooterTools', @RegisterRxDbGridFooterTools);
RegisterUnit('rxdbverticalgrid', @RegisterRxDBVerticalGrid); RegisterUnit('rxdbverticalgrid', @RegisterRxDBVerticalGrid);
{$IF (FPC_FULLVERSION >= 30004)} {$IFDEF RX_USE_FCL_PDF}
RegisterUnit('RxDBGridExportPdf', @RegisterRxDBGridExportPDF); RegisterUnit('RxDBGridExportPdf', @RegisterRxDBGridExportPDF);
{$ENDIF} {$ENDIF}

9
components/rx/trunk/rx.inc
View File

@ -61,3 +61,12 @@
{.$DEFINE DEVELOPER_RX} {.$DEFINE DEVELOPER_RX}
{.$DEFINE FIX_WIDTH_WIDE_STRING96} {.$DEFINE FIX_WIDTH_WIDE_STRING96}
{$IF (FPC_FULLVERSION >= 30004)}
{$DEFINE RX_USE_FCL_PDF}
{$ENDIF}
{$IF FPC_FULLVERSION > 30299}
{$DEFINE RX_USE_DELPHI_EXT_FIELD_TYPES}
{$ENDIF}

2
components/rx/trunk/rxdb/ex_rx_xml_datapacket.pas
View File

@ -134,7 +134,7 @@ const
'', '',
'', '',
'' ''
{$IFDEF FPC_FULLVERSION > 30200} {$IFDEF RX_USE_DELPHI_EXT_FIELD_TYPES}
, '' , ''
, '' , ''
, '' , ''

6
components/rx/trunk/rxdb/rxdbgridexportpdf.pas
View File

@ -35,7 +35,7 @@ unit RxDBGridExportPdf;
interface interface
{$IF (FPC_FULLVERSION >= 30004)} {$IFDEF RX_USE_FCL_PDF}
uses uses
Classes, SysUtils, DB, rxdbgrid, rxlclutils, Graphics, fpPDF, contnrs, fpparsettf, Classes, SysUtils, DB, rxdbgrid, rxlclutils, Graphics, fpPDF, contnrs, fpparsettf,
fpTTF; fpTTF;
@ -188,10 +188,10 @@ type
property TitleColor:TColor read FTitleColor write FTitleColor default clSilver; property TitleColor:TColor read FTitleColor write FTitleColor default clSilver;
end; end;
{$ENDIF} {$ENDIF}
implementation implementation
{$IF (FPC_FULLVERSION >= 30004)} {$IFDEF RX_USE_FCL_PDF}
uses Grids, rxdconst, FileUtil, Forms, Controls, LCLIntf, LazFileUtils, FPReadBMP, uses Grids, rxdconst, FileUtil, Forms, Controls, LCLIntf, LazFileUtils, FPReadBMP,
RxDBGridExportPdfSetupUnit, LazUTF8; RxDBGridExportPdfSetupUnit, LazUTF8;

6
components/rx/trunk/rxdb/rxdbgridexportpdfsetupunit.pas
View File

@ -35,7 +35,7 @@ unit RxDBGridExportPdfSetupUnit;
interface interface
{$IF (FPC_FULLVERSION >= 30004)} {$IFDEF RX_USE_FCL_PDF}
uses uses
Classes, SysUtils, FileUtil, Forms, Controls, Graphics, Dialogs, StdCtrls, Classes, SysUtils, FileUtil, Forms, Controls, Graphics, Dialogs, StdCtrls,
EditBtn, ButtonPanel, ExtCtrls, ComCtrls, ColorBox, fpPDF; EditBtn, ButtonPanel, ExtCtrls, ComCtrls, ColorBox, fpPDF;
@ -93,9 +93,9 @@ const
'B5' // ptB5 'B5' // ptB5
); );
{$ENDIF} {$ENDIF}
implementation implementation
{$IF (FPC_FULLVERSION >= 30004)} {$IFDEF RX_USE_FCL_PDF}
uses rxdconst, LCLIntf; uses rxdconst, LCLIntf;
{$R *.lfm} {$R *.lfm}

4
components/rx/trunk/rxnew.lpk
View File

@ -23,9 +23,9 @@
</CompilerOptions> </CompilerOptions>
<Description Value="Delphi VCL Extensions (RX) <Description Value="Delphi VCL Extensions (RX)
Copyright (c) 1998 Master-Bank Copyright (c) 1998 Master-Bank
translate to Lazarus by alexs in 2005 - 2020"/> translate to Lazarus by alexs in 2005 - 2021"/>
<License Value="LGPL"/> <License Value="LGPL"/>
<Version Major="3" Minor="3" Release="6" Build="232"/> <Version Major="3" Minor="4" Release="1" Build="234"/>
<Files Count="70"> <Files Count="70">
<Item1> <Item1>
<Filename Value="registerrx.pas"/> <Filename Value="registerrx.pas"/>