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

RxDBGrid - fix compile with fpc 2.6.2

Browse Source 
git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@2926 8e941d3f-bd1b-0410-a28a-d453659cc2b4
This commit is contained in:
alexs75
2014-03-31 11:08:07 +00:00
parent cebbb30307
commit fff0dd470f
1 changed files with 15 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
components/rx/trunk/rxdbgrid.pas
View File

@@ -4131,7 +4131,11 @@ begin
DHL:=THackDataLink(Datalink); DHL:=THackDataLink(Datalink);
DHS:=THackDataSet(DataSource.DataSet); DHS:=THackDataSet(DataSource.DataSet);
P := DHS.GetBookMark; {$IFDEF NoAutomatedBookmark}
P:=DataSource.DataSet.GetBookmark;
{$ELSE}
P := DHS.Bookmark;
{$ENDIF}
SaveState:=DHS.SetTempState(dsBrowse); SaveState:=DHS.SetTempState(dsBrowse);
@@ -4181,7 +4185,17 @@ begin
DHS.BeforeScroll := SaveBeforeScroll; DHS.BeforeScroll := SaveBeforeScroll;
if DHS.CompareBookmarks(DHS.Bookmark, P)<>0 then if DHS.CompareBookmarks(DHS.Bookmark, P)<>0 then
begin
{$IFDEF NoAutomatedBookmark}
DHS.GotoBookmark(P); //workaround for fix navigation problem
{$ELSE}
DHS.Bookmark:=P; //workaround for fix navigation problem DHS.Bookmark:=P; //workaround for fix navigation problem
{$ENDIF}
end;
{$IFDEF NoAutomatedBookmark}
DHS.FreeBookmark(P);
{$ENDIF}
Dec(FInProcessCalc); Dec(FInProcessCalc);
if FInProcessCalc < 0 then if FInProcessCalc < 0 then