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

rx: fix compilation a after recent changes in LCL. Issue 20214. With agreement of Lagunov Aleksey

Browse Source 
git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@1953 8e941d3f-bd1b-0410-a28a-d453659cc2b4
This commit is contained in:
blikblum
2011-09-15 11:15:58 +00:00
parent 2ca3b8e514
commit b2e30cdc23
4 changed files with 16 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
components/rx/rxdbcolorbox.pas
View File

@ -123,6 +123,8 @@ type
end; end;
implementation implementation
uses
LCLVersion;
type type
TFieldDataLinkHack = class(TFieldDataLink) TFieldDataLinkHack = class(TFieldDataLink)
@ -313,7 +315,9 @@ begin
FDataLink.OnDataChange := @DataChange; FDataLink.OnDataChange := @DataChange;
FDataLink.OnUpdateData := @UpdateData; FDataLink.OnUpdateData := @UpdateData;
FDataLink.OnActiveChange := @ActiveChange; FDataLink.OnActiveChange := @ActiveChange;
{$if (lcl_major = 0) and (lcl_release <= 30)}
FDataLink.OnLayoutChange := @LayoutChange; FDataLink.OnLayoutChange := @LayoutChange;
{$endif}
end; end;
destructor TRxCustomDBColorBox.Destroy; destructor TRxCustomDBColorBox.Destroy;

12
components/rx/rxdbctrls.pas
View File

@ -195,11 +195,7 @@ type
end; end;
implementation implementation
uses dbutils; uses dbutils, LCLVersion;
type
TFieldDataLinkHack = class(TFieldDataLink)
end;
{ TCustomRxDBProgressBar } { TCustomRxDBProgressBar }
@ -264,7 +260,9 @@ begin
FDataLink.Control := Self; FDataLink.Control := Self;
FDataLink.OnDataChange := @DataChange; FDataLink.OnDataChange := @DataChange;
FDataLink.OnActiveChange := @ActiveChange; FDataLink.OnActiveChange := @ActiveChange;
{$if (lcl_major = 0) and (lcl_release <= 30)}
FDataLink.OnLayoutChange := @LayoutChange; FDataLink.OnLayoutChange := @LayoutChange;
{$endif}
end; end;
destructor TCustomRxDBProgressBar.Destroy; destructor TCustomRxDBProgressBar.Destroy;
@ -344,7 +342,7 @@ begin
if not FDatalink.Editing then if not FDatalink.Editing then
FDatalink.Reset FDatalink.Reset
else else
TFieldDataLinkHack(FDatalink).UpdateData; FDatalink.UpdateRecord;
end; end;
function TCustomRxDBTrackBar.GetReadOnly: Boolean; function TCustomRxDBTrackBar.GetReadOnly: Boolean;
@ -416,7 +414,9 @@ begin
FDataLink.OnDataChange := @DataChange; FDataLink.OnDataChange := @DataChange;
FDataLink.OnUpdateData := @UpdateData; FDataLink.OnUpdateData := @UpdateData;
FDataLink.OnActiveChange := @ActiveChange; FDataLink.OnActiveChange := @ActiveChange;
{$if (lcl_major = 0) and (lcl_release <= 30)}
FDataLink.OnLayoutChange := @LayoutChange; FDataLink.OnLayoutChange := @LayoutChange;
{$endif}
end; end;
destructor TCustomRxDBTrackBar.Destroy; destructor TCustomRxDBTrackBar.Destroy;

4
components/rx/rxdbspinedit.pas
View File

@ -37,7 +37,7 @@ interface
uses uses
Classes, SysUtils, LResources, Forms, Controls, Graphics, Dialogs, Spin, Classes, SysUtils, LResources, Forms, Controls, Graphics, Dialogs, Spin,
DbCtrls, DB, LMessages, LCLType; DbCtrls, DB, LMessages, LCLType, LCLVersion;
type type
@ -302,7 +302,9 @@ begin
FDataLink.OnDataChange := @DataChange; FDataLink.OnDataChange := @DataChange;
FDataLink.OnUpdateData := @UpdateData; FDataLink.OnUpdateData := @UpdateData;
FDataLink.OnActiveChange := @ActiveChange; FDataLink.OnActiveChange := @ActiveChange;
{$if (lcl_major = 0) and (lcl_release <= 30)}
FDataLink.OnLayoutChange := @LayoutChange; FDataLink.OnLayoutChange := @LayoutChange;
{$endif}
end; end;
destructor TCustomRxDBSpinEdit.Destroy; destructor TCustomRxDBSpinEdit.Destroy;

4
components/rx/rxdbtimeedit.pas
View File

@ -136,7 +136,7 @@ type
implementation implementation
uses dbutils; uses dbutils, LCLVersion;
type type
TFieldDataLinkHack = class(TFieldDataLink) TFieldDataLinkHack = class(TFieldDataLink)
@ -305,7 +305,9 @@ begin
FDataLink.OnDataChange := @DataChange; FDataLink.OnDataChange := @DataChange;
FDataLink.OnUpdateData := @UpdateData; FDataLink.OnUpdateData := @UpdateData;
FDataLink.OnActiveChange := @ActiveChange; FDataLink.OnActiveChange := @ActiveChange;
{$if (lcl_major = 0) and (lcl_release <= 30)}
FDataLink.OnLayoutChange := @LayoutChange; FDataLink.OnLayoutChange := @LayoutChange;
{$endif}
end; end;
destructor TCustomRxDBTimeEdit.Destroy; destructor TCustomRxDBTimeEdit.Destroy;