* Merging revisions r45805 from trunk:

------------------------------------------------------------------------
    r45805 | michael | 2020-07-19 00:35:36 +0200 (Sun, 19 Jul 2020) | 1 line
    
    * Add TerminatedSet (delphi compatibility, bug ID #37388)
    ------------------------------------------------------------------------

git-svn-id: branches/fixes_3_2@46598 -
This commit is contained in:
michael 2020-08-23 09:24:13 +00:00
parent 9f24c73119
commit a14117e0bb
20 changed files with 32 additions and 5 deletions

View File

@ -116,6 +116,7 @@ end;
procedure TThread.Terminate;
begin
FTerminated := True;
TerminatedSet;
end;
function TThread.WaitFor: Integer;

View File

@ -74,6 +74,7 @@ end;
procedure TThread.Terminate;
begin
TerminatedSet;
end;

View File

@ -274,6 +274,7 @@ end;
procedure TThread.Terminate;
begin
FTerminated := True;
TerminatedSet;
end;
function TThread.WaitFor: Integer;
@ -560,6 +561,7 @@ end;
procedure TThread.Terminate;
begin
FTerminated := True;
TerminatedSet;
end;
function TThread.WaitFor: Integer;

View File

@ -100,6 +100,7 @@ end;
procedure TThread.Terminate;
begin
FTerminated := true;
TerminatedSet;
end;

View File

@ -99,7 +99,8 @@ end;
procedure TThread.Terminate;
begin
FTerminated := true;
FTerminated := true;
TerminatedSet;
end;

View File

@ -74,6 +74,7 @@ end;
procedure TThread.Terminate;
begin
TerminatedSet;
end;

View File

@ -74,6 +74,7 @@ end;
procedure TThread.Terminate;
begin
TerminatedSet;
end;

View File

@ -74,6 +74,7 @@ end;
procedure TThread.Terminate;
begin
TerminatedSet;
end;

View File

@ -48,6 +48,7 @@ end;
procedure TThread.Terminate;
begin
FTerminated := True;
TerminatedSet;
end;
function TThread.WaitFor: Integer;

View File

@ -99,7 +99,8 @@ end;
procedure TThread.Terminate;
begin
FTerminated := true;
FTerminated := true;
TerminatedSet;
end;

View File

@ -219,6 +219,7 @@ end;
procedure TThread.Terminate;
begin
FTerminated := True;
TerminatedSet;
ThreadSwitch;
end;

View File

@ -364,6 +364,7 @@ end;
procedure TThread.Terminate;
begin
FTerminated := True;
TerminatedSet;
end;
function TThread.WaitFor: Integer;

View File

@ -274,6 +274,13 @@ begin
GetSuspended:=FSuspended;
end;
Procedure TThread.TerminatedSet;
begin
// Empty, must be overridden.
end;
procedure TThread.AfterConstruction;
begin

View File

@ -1752,6 +1752,7 @@ type
protected
FThreadID: TThreadID; // someone might need it for pthread_* calls
procedure DoTerminate; virtual;
procedure TerminatedSet; virtual;
procedure Execute; virtual; abstract;
procedure Synchronize(AMethod: TThreadMethod);
procedure Queue(aMethod: TThreadMethod);
@ -1840,7 +1841,7 @@ type
property ThreadID: TThreadID read FThreadID;
property OnTerminate: TNotifyEvent read FOnTerminate write FOnTerminate;
property FatalException: TObject read FFatalException;
end;
end;
{ TComponent class }

View File

@ -212,7 +212,8 @@ end;
procedure TThread.Terminate;
begin
FTerminated := true;
FTerminated := true;
TerminatedSet;
end;

View File

@ -99,7 +99,8 @@ end;
procedure TThread.Terminate;
begin
FTerminated := true;
FTerminated := true;
TerminatedSet;
end;

View File

@ -253,6 +253,7 @@ end;
procedure TThread.Terminate;
begin
FTerminated := True;
TerminatedSet;
end;
function TThread.WaitFor: Integer;

View File

@ -100,6 +100,7 @@ end;
procedure TThread.Terminate;
begin
FTerminated := true;
TerminatedSet;
end;

View File

@ -95,6 +95,7 @@ end;
procedure TThread.Terminate;
begin
FTerminated := True;
TerminatedSet;
end;
function TThread.WaitFor: Integer;

View File

@ -74,6 +74,7 @@ end;
procedure TThread.Terminate;
begin
TerminatedSet;
end;