paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-08-30 10:50:53 +02:00
Code Issues Packages Projects Releases Wiki Activity

LCL: Remove FUseCompareBookmarks hack from TBookmarkList.CheckActive. Issue #34834.

Browse Source 
git-svn-id: trunk@64768 -
This commit is contained in:
juha 2021-03-08 08:15:52 +00:00
parent e28c9c1e26
commit bddeba7ebf
1 changed files with 2 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
lcl/dbgrids.pas
View File

@ -166,7 +166,6 @@ type
FList: TFPList; // list of TBookmark
FGrid: TCustomDbGrid;
FDataset: TDataset;
FUseCompareBookmarks: boolean;
FCanDoBinarySearch: boolean;
function GetCount: integer;
function GetCurrentRowSelected: boolean;
@ -4628,13 +4627,6 @@ begin
exit;
FDataset := FGrid.DataSource.DataSet;
// Note.
//
// Some dataset descendants do not implement CompareBookmarks, for these we
// use MyCompareBookmarks in the hope the allocated bookmark memory is used
// to hold some kind of record index.
FUseCompareBookmarks := TMethod(@FDataset.CompareBookmarks).Code<>pointer(@TDataset.CompareBookmarks);
// Note.
//
// fpc help say CompareBookmarks should return -1, 0 or 1 ... which imply that
@ -4731,22 +4723,6 @@ type
TDs=class(TDataset)
end;
function MyCompareBookmarks(ds:Tdataset; b1,b2:pointer): Integer;
begin
if b1=b2 then
result := 0
else
if b1=nil then
result := 1
else
if b2=nil then
result := -1
else begin
// Note: Tds(ds).bookmarksize is set at creation of TDataSet and does not change
result := CompareMemRange(b1,b2,Tds(ds).bookmarksize);
end;
end;
function TBookmarkList.Find(const Item: TBookmark; var AIndex: Integer): boolean;
var
L, R, I: Integer;
@ -4759,10 +4735,7 @@ var
while (L <= R) do
begin
I := L + (R - L) div 2;
if FUseCompareBookmarks then
CompareRes := FDataset.CompareBookmarks(Item, TBookmark(FList[I]))
else
CompareRes := MyCompareBookmarks(FDataset, pointer(Item), FList[I]);
CompareRes := FDataset.CompareBookmarks(Item, TBookmark(FList[I]));
if (CompareRes > 0) then
L := I + 1
else
@ -4783,10 +4756,7 @@ var
AIndex := 0;
i := 0;
while i<FList.Count do begin
if FUseCompareBookmarks then
CompareRes := FDataset.CompareBookmarks(Item, TBookmark(FList[I]))
else
CompareRes := MyCompareBookmarks(FDataset, pointer(Item), FList[I]);
CompareRes := FDataset.CompareBookmarks(Item, TBookmark(FList[I]));
if CompareRes=0 then begin
result := true;
AIndex := i;