paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-12-06 11:47:32 +01:00
Code Issues Packages Projects Releases Wiki Activity

SynEdit: changed type (for 64bit)

Browse Source 
git-svn-id: trunk@27040 -
This commit is contained in:
martin 2010-08-08 18:03:00 +00:00
parent f0fdb13710
commit fa651f6d59
3 changed files with 23 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
components/synedit/synedit.pp
View File

@ -8706,7 +8706,7 @@ end;
procedure TSynStatusChangedHandlerList.Add(AHandler: TStatusChangeEvent; procedure TSynStatusChangedHandlerList.Add(AHandler: TStatusChangeEvent;
Changes: TSynStatusChanges); Changes: TSynStatusChanges);
begin begin
AddBitFilter(TMethod(AHandler), Pointer(PtrUInt(Changes))); AddBitFilter(TMethod(AHandler), LongInt(Changes));
end; end;
procedure TSynStatusChangedHandlerList.Remove(AHandler: TStatusChangeEvent); procedure TSynStatusChangedHandlerList.Remove(AHandler: TStatusChangeEvent);
@ -8720,7 +8720,7 @@ var
i: Integer; i: Integer;
begin begin
i:=Count; i:=Count;
while NextDownIndexBitFilter(i, Pointer(PtrUInt(Changes))) do while NextDownIndexBitFilter(i, LongInt(Changes)) do
TStatusChangeEvent(FItems[i].FHandler)(Sender, Changes); TStatusChangeEvent(FItems[i].FHandler)(Sender, Changes);
end; end;

4
components/synedit/syneditmarks.pp
View File

@ -494,7 +494,7 @@ end;
procedure TSynEditMarkChangedHandlerList.Add(AHandler: TSynEditMarkChangeEvent; procedure TSynEditMarkChangedHandlerList.Add(AHandler: TSynEditMarkChangeEvent;
Changes: TSynEditMarkChangeReasons); Changes: TSynEditMarkChangeReasons);
begin begin
AddBitFilter(TMethod(AHandler), Pointer(PtrUInt(Changes))); AddBitFilter(TMethod(AHandler), LongInt(Changes));
end; end;
procedure TSynEditMarkChangedHandlerList.Remove(AHandler: TSynEditMarkChangeEvent); procedure TSynEditMarkChangedHandlerList.Remove(AHandler: TSynEditMarkChangeEvent);
@ -508,7 +508,7 @@ var
i: Integer; i: Integer;
begin begin
i:=Count; i:=Count;
while NextDownIndexBitFilter(i, Pointer(PtrUInt(Changes))) do while NextDownIndexBitFilter(i, LongInt(Changes)) do
TSynEditMarkChangeEvent(FItems[i].FHandler)(Sender, Changes); TSynEditMarkChangeEvent(FItems[i].FHandler)(Sender, Changes);
end; end;

38
components/synedit/syneditmiscclasses.pp
View File

@ -373,7 +373,7 @@ type
TSynFilteredMethodListEntry = record TSynFilteredMethodListEntry = record
FHandler: TMethod; FHandler: TMethod;
FFilter: Pointer; FFilter: LongInt;
end; end;
{ TSynFilteredMethodList } { TSynFilteredMethodList }
@ -384,19 +384,19 @@ type
protected protected
FItems: Array of TSynFilteredMethodListEntry; FItems: Array of TSynFilteredMethodListEntry;
function IndexOf(AHandler: TMethod): Integer; function IndexOf(AHandler: TMethod): Integer;
function IndexOf(AHandler: TMethod; AFilter: Pointer): Integer; function IndexOf(AHandler: TMethod; AFilter: LongInt): Integer;
function NextDownIndex(var Index: integer): boolean; function NextDownIndex(var Index: integer): boolean;
function NextDownIndexNumFilter(var Index: integer; AFilter: Pointer): boolean; function NextDownIndexNumFilter(var Index: integer; AFilter: LongInt): boolean;
function NextDownIndexBitFilter(var Index: integer; AFilter: Pointer): boolean; function NextDownIndexBitFilter(var Index: integer; AFilter: LongInt): boolean;
procedure Delete(AIndex: Integer); procedure Delete(AIndex: Integer);
public public
constructor Create; constructor Create;
procedure AddNumFilter(AHandler: TMethod; AFilter: Pointer); // Separate entries for same method with diff filter procedure AddNumFilter(AHandler: TMethod; AFilter: LongInt); // Separate entries for same method with diff filter
procedure AddBitFilter(AHandler: TMethod; AFilter: Pointer); // Filter is bitmask procedure AddBitFilter(AHandler: TMethod; AFilter: LongInt); // Filter is bitmask
procedure Remove(AHandler: TMethod); procedure Remove(AHandler: TMethod);
procedure Remove(AHandler: TMethod; AFilter: Pointer); procedure Remove(AHandler: TMethod; AFilter: LongInt);
procedure CallNotifyEventsNumFilter(Sender: TObject; AFilter: Pointer); procedure CallNotifyEventsNumFilter(Sender: TObject; AFilter: LongInt);
procedure CallNotifyEventsBitFilter(Sender: TObject; AFilter: Pointer); // filter is Bitmask procedure CallNotifyEventsBitFilter(Sender: TObject; AFilter: LongInt); // filter is Bitmask
property Count: Integer read FCount; property Count: Integer read FCount;
end; end;
@ -1283,7 +1283,7 @@ begin
dec(Result); dec(Result);
end; end;
function TSynFilteredMethodList.IndexOf(AHandler: TMethod; AFilter: Pointer): Integer; function TSynFilteredMethodList.IndexOf(AHandler: TMethod; AFilter: LongInt): Integer;
begin begin
Result := FCount - 1; Result := FCount - 1;
while (Result >= 0) and while (Result >= 0) and
@ -1306,7 +1306,7 @@ begin
end; end;
function TSynFilteredMethodList.NextDownIndexNumFilter(var Index: integer; function TSynFilteredMethodList.NextDownIndexNumFilter(var Index: integer;
AFilter: Pointer): boolean; AFilter: LongInt): boolean;
begin begin
Repeat Repeat
Result := NextDownIndex(Index); Result := NextDownIndex(Index);
@ -1314,11 +1314,11 @@ begin
end; end;
function TSynFilteredMethodList.NextDownIndexBitFilter(var Index: integer; function TSynFilteredMethodList.NextDownIndexBitFilter(var Index: integer;
AFilter: Pointer): boolean; AFilter: LongInt): boolean;
begin begin
Repeat Repeat
Result := NextDownIndex(Index); Result := NextDownIndex(Index);
until (not Result) or (PtrUInt(FItems[Index].FFilter) and PtrUInt(AFilter) <> 0); until (not Result) or ((FItems[Index].FFilter and AFilter) <> 0);
end; end;
procedure TSynFilteredMethodList.Delete(AIndex: Integer); procedure TSynFilteredMethodList.Delete(AIndex: Integer);
@ -1338,7 +1338,7 @@ begin
FCount := 0; FCount := 0;
end; end;
procedure TSynFilteredMethodList.AddNumFilter(AHandler: TMethod; AFilter: Pointer); procedure TSynFilteredMethodList.AddNumFilter(AHandler: TMethod; AFilter: LongInt);
var var
i: Integer; i: Integer;
begin begin
@ -1353,13 +1353,13 @@ begin
inc(FCount); inc(FCount);
end; end;
procedure TSynFilteredMethodList.AddBitFilter(AHandler: TMethod; AFilter: Pointer); procedure TSynFilteredMethodList.AddBitFilter(AHandler: TMethod; AFilter: LongInt);
var var
i: Integer; i: Integer;
begin begin
i := IndexOf(AHandler); i := IndexOf(AHandler);
if i >= 0 then if i >= 0 then
FItems[i].FFilter := Pointer( PtrUInt(FItems[i].FFilter) or PtrUInt(AFilter) ) FItems[i].FFilter := FItems[i].FFilter or AFilter
else begin else begin
if FCount >= high(FItems) then if FCount >= high(FItems) then
SetLength(FItems, Max(8, FCount * 2)); SetLength(FItems, Max(8, FCount * 2));
@ -1374,12 +1374,12 @@ begin
Delete(IndexOf(AHandler)); Delete(IndexOf(AHandler));
end; end;
procedure TSynFilteredMethodList.Remove(AHandler: TMethod; AFilter: Pointer); procedure TSynFilteredMethodList.Remove(AHandler: TMethod; AFilter: LongInt);
begin begin
Delete(IndexOf(AHandler, AFilter)); Delete(IndexOf(AHandler, AFilter));
end; end;
procedure TSynFilteredMethodList.CallNotifyEventsNumFilter(Sender: TObject; AFilter: Pointer); procedure TSynFilteredMethodList.CallNotifyEventsNumFilter(Sender: TObject; AFilter: LongInt);
var var
i: Integer; i: Integer;
begin begin
@ -1388,7 +1388,7 @@ begin
TNotifyEvent(FItems[i].FHandler)(Sender); TNotifyEvent(FItems[i].FHandler)(Sender);
end; end;
procedure TSynFilteredMethodList.CallNotifyEventsBitFilter(Sender: TObject; AFilter: Pointer); procedure TSynFilteredMethodList.CallNotifyEventsBitFilter(Sender: TObject; AFilter: LongInt);
var var
i: Integer; i: Integer;
begin begin