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

apply patch for compile rx with fpc 2.6 - thx Daniel Simões de Almeida - close issue 21598

Browse Source 
git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@2373 8e941d3f-bd1b-0410-a28a-d453659cc2b4
This commit is contained in:
alexs75
2012-03-31 15:49:40 +00:00
parent acfeafbd7d
commit 2ae6517c57
3 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
components/rx/dbutils.pas
View File

@ -433,7 +433,7 @@ begin
if Result then Exit; if Result then Exit;
DataSet.DisableControls; DataSet.DisableControls;
try try
Bookmark := DataSet.Bookmark; Bookmark := DataSet.GetBookmark;
try try
with DataSet do begin with DataSet do begin
First; First;
@ -445,7 +445,7 @@ begin
end; end;
finally finally
if not Result and DataSet.BookmarkValid(PChar(Bookmark)) then if not Result and DataSet.BookmarkValid(PChar(Bookmark)) then
DataSet.Bookmark := Bookmark; DataSet.GotoBookmark(Bookmark);
end; end;
finally finally
DataSet.FreeBookmark(Bookmark); DataSet.FreeBookmark(Bookmark);
@ -921,7 +921,7 @@ var
begin begin
DS:=Field.DataSet; DS:=Field.DataSet;
DS.DisableControls; DS.DisableControls;
P:=DS.Bookmark; P:=DS.GetBookmark;
try try
DS.First; DS.First;
while not DS.EOF do while not DS.EOF do
@ -932,7 +932,7 @@ begin
DS.Next; DS.Next;
end; end;
finally finally
DS.Bookmark:=P; DS.GotoBookmark(P);
DS.FreeBookmark(P); DS.FreeBookmark(P);
DS.EnableControls; DS.EnableControls;
end; end;

8
components/rx/rxmemds.pas
View File

@ -1340,7 +1340,7 @@ begin
if Result then Exit; if Result then Exit;
DataSet.DisableControls; DataSet.DisableControls;
try try
Bookmark := DataSet.Bookmark; Bookmark := DataSet.GetBookmark;
try try
with DataSet do begin with DataSet do begin
First; First;
@ -1352,7 +1352,7 @@ begin
end; end;
finally finally
if not Result and DataSet.BookmarkValid(PChar(Bookmark)) then if not Result and DataSet.BookmarkValid(PChar(Bookmark)) then
DataSet.Bookmark := Bookmark; DataSet.GotoBookmark(Bookmark);
end; end;
finally finally
DataSet.FreeBookmark(Bookmark); DataSet.FreeBookmark(Bookmark);
@ -1581,7 +1581,7 @@ var
begin begin
if Active and (FRecords <> nil) and (FRecords.Count > 0) then if Active and (FRecords <> nil) and (FRecords.Count > 0) then
begin begin
Pos := Bookmark; Pos := GetBookmark;
try try
QuickSort(0, FRecords.Count - 1, @CompareRecords); QuickSort(0, FRecords.Count - 1, @CompareRecords);
SetBufListSize(0); SetBufListSize(0);
@ -1595,7 +1595,7 @@ begin
raise; raise;
end; end;
finally finally
Bookmark := Pos; GotoBookmark(Pos);
FreeBookmark(Pos); FreeBookmark(Pos);
end; end;
Resync([]); Resync([]);

1
components/rx/rxpopupunit.pas
View File

@ -454,6 +454,7 @@ begin
FDataSource:=TDataSource.Create(Self); FDataSource:=TDataSource.Create(Self);
FPopUpFormOptions:=APopUpFormOptions; FPopUpFormOptions:=APopUpFormOptions;
FFieldList:=AFieldList; FFieldList:=AFieldList;
OnClose := @FormClose;
{$IFDEF LINUX} {$IFDEF LINUX}
PopupOrigin:=TCustomControl(AOwner).Parent.ControlToScreen(Point(TCustomControl(AOwner).Left, TCustomControl(AOwner).Height + TCustomControl(AOwner).Top)); PopupOrigin:=TCustomControl(AOwner).Parent.ControlToScreen(Point(TCustomControl(AOwner).Left, TCustomControl(AOwner).Height + TCustomControl(AOwner).Top));