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

fix compile with FPC 2.6 - Lazarus 1.0

Browse Source 
git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@2540 8e941d3f-bd1b-0410-a28a-d453659cc2b4
This commit is contained in:
alexs75
2012-09-25 18:03:19 +00:00
parent 5fa7b35965
commit 7c25da7b8a
2 changed files with 31 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
components/rx/rx.inc
View File

@ -54,3 +54,7 @@
{$DEFINE NoAutomatedBookmark} {$DEFINE NoAutomatedBookmark}
{$endif} {$endif}
{$IFDEF NoAutomatedBookmark}
{$ELSE}
{$ENDIF}

27
components/rx/rxdbgrid.pas
View File

@ -3859,7 +3859,11 @@ begin
if DatalinkActive then if DatalinkActive then
begin begin
DataSource.DataSet.DisableControls; DataSource.DataSet.DisableControls;
{$IFDEF NoAutomatedBookmark}
P:=DataSource.DataSet.GetBookmark;
{$ELSE}
P:=DataSource.DataSet.Bookmark; P:=DataSource.DataSet.Bookmark;
{$ENDIF}
try try
DataSource.DataSet.First; DataSource.DataSet.First;
while not DataSource.DataSet.EOF do while not DataSource.DataSet.EOF do
@ -3868,7 +3872,12 @@ begin
DataSource.DataSet.Next; DataSource.DataSet.Next;
end; end;
finally finally
{$IFDEF NoAutomatedBookmark}
DataSource.DataSet.GotoBookmark(P);
DataSource.DataSet.FreeBookmark(P);
{$ELSE}
DataSource.DataSet.Bookmark:=P; DataSource.DataSet.Bookmark:=P;
{$ENDIF}
DataSource.DataSet.EnableControls; DataSource.DataSet.EnableControls;
end; end;
Invalidate; Invalidate;
@ -3882,7 +3891,11 @@ begin
if DatalinkActive then if DatalinkActive then
begin begin
DataSource.DataSet.DisableControls; DataSource.DataSet.DisableControls;
{$IFDEF NoAutomatedBookmark}
P:=DataSource.DataSet.GetBookmark;
{$ELSE}
P:=DataSource.DataSet.Bookmark; P:=DataSource.DataSet.Bookmark;
{$ENDIF}
try try
DataSource.DataSet.First; DataSource.DataSet.First;
while not DataSource.DataSet.EOF do while not DataSource.DataSet.EOF do
@ -3891,7 +3904,12 @@ begin
DataSource.DataSet.Next; DataSource.DataSet.Next;
end; end;
finally finally
{$IFDEF NoAutomatedBookmark}
DataSource.DataSet.GotoBookmark(P);
DataSource.DataSet.FreeBookmark(P);
{$ELSE}
DataSource.DataSet.Bookmark:=P; DataSource.DataSet.Bookmark:=P;
{$ENDIF}
DataSource.DataSet.EnableControls; DataSource.DataSet.EnableControls;
end; end;
Invalidate; Invalidate;
@ -3905,7 +3923,11 @@ begin
if DatalinkActive then if DatalinkActive then
begin begin
DataSource.DataSet.DisableControls; DataSource.DataSet.DisableControls;
{$IFDEF NoAutomatedBookmark}
P:=DataSource.DataSet.GetBookmark;
{$ELSE}
P:=DataSource.DataSet.Bookmark; P:=DataSource.DataSet.Bookmark;
{$ENDIF}
try try
DataSource.DataSet.First; DataSource.DataSet.First;
while not DataSource.DataSet.EOF do while not DataSource.DataSet.EOF do
@ -3914,7 +3936,12 @@ begin
DataSource.DataSet.Next; DataSource.DataSet.Next;
end; end;
finally finally
{$IFDEF NoAutomatedBookmark}
DataSource.DataSet.GotoBookmark(P);
DataSource.DataSet.FreeBookmark(P);
{$ELSE}
DataSource.DataSet.Bookmark:=P; DataSource.DataSet.Bookmark:=P;
{$ENDIF}
DataSource.DataSet.EnableControls; DataSource.DataSet.EnableControls;
end; end;
Invalidate; Invalidate;