Исправление Assign(ErrOutput)
This commit is contained in:
parent
f733799b1f
commit
d03b31a2da
|
|
@ -15,7 +15,7 @@ internal static class RevisionClass
|
||||||
public const string Major = "3";
|
public const string Major = "3";
|
||||||
public const string Minor = "8";
|
public const string Minor = "8";
|
||||||
public const string Build = "0";
|
public const string Build = "0";
|
||||||
public const string Revision = "2931";
|
public const string Revision = "2932";
|
||||||
|
|
||||||
public const string MainVersion = Major + "." + Minor;
|
public const string MainVersion = Major + "." + Minor;
|
||||||
public const string FullVersion = Major + "." + Minor + "." + Build + "." + Revision;
|
public const string FullVersion = Major + "." + Minor + "." + Build + "." + Revision;
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
%MINOR%=8
|
|
||||||
%REVISION%=2931
|
|
||||||
%COREVERSION%=0
|
%COREVERSION%=0
|
||||||
|
%REVISION%=2932
|
||||||
|
%MINOR%=8
|
||||||
%MAJOR%=3
|
%MAJOR%=3
|
||||||
|
|
|
||||||
|
|
@ -1 +1 @@
|
||||||
3.8.0.2931
|
3.8.0.2932
|
||||||
|
|
|
||||||
|
|
@ -1 +1 @@
|
||||||
!define VERSION '3.8.0.2931'
|
!define VERSION '3.8.0.2932'
|
||||||
|
|
|
||||||
|
|
@ -703,6 +703,7 @@ function TextHeightPFont(text: string; f: FontOptions): real;
|
||||||
/// Размер текста (совместно с FastDraw)
|
/// Размер текста (совместно с FastDraw)
|
||||||
function TextSizePFont(text: string; f: FontOptions): Size;
|
function TextSizePFont(text: string; f: FontOptions): Size;
|
||||||
|
|
||||||
|
procedure AddToHost(v: Visual);
|
||||||
|
|
||||||
{function GetDC: DrawingContext;
|
{function GetDC: DrawingContext;
|
||||||
procedure ReleaseDC(dc: DrawingContext);
|
procedure ReleaseDC(dc: DrawingContext);
|
||||||
|
|
@ -789,6 +790,11 @@ var
|
||||||
GlobalScale := 1.0;
|
GlobalScale := 1.0;
|
||||||
CurrentCoordType: CoordType := StandardCoords;
|
CurrentCoordType: CoordType := StandardCoords;
|
||||||
|
|
||||||
|
procedure AddToHost(v: Visual);
|
||||||
|
begin
|
||||||
|
Host.children.Add(v);
|
||||||
|
end;
|
||||||
|
|
||||||
function GetDC: DrawingContext;
|
function GetDC: DrawingContext;
|
||||||
begin
|
begin
|
||||||
var visual := new DrawingVisual();
|
var visual := new DrawingVisual();
|
||||||
|
|
|
||||||
|
|
@ -7062,7 +7062,7 @@ begin
|
||||||
on e: Exception do
|
on e: Exception do
|
||||||
raise e;
|
raise e;
|
||||||
end;
|
end;
|
||||||
if f = output then
|
if (f = output) or (f = ErrOutput) then
|
||||||
f.sw := new StreamWriter(f.fi.FullName);
|
f.sw := new StreamWriter(f.fi.FullName);
|
||||||
if f = input then
|
if f = input then
|
||||||
begin
|
begin
|
||||||
|
|
@ -14018,6 +14018,8 @@ procedure __FinalizeModule__;
|
||||||
begin
|
begin
|
||||||
if (output.sw <> nil) and (output.sw is StreamWriter) and ((output.sw as StreamWriter).BaseStream <> nil) then
|
if (output.sw <> nil) and (output.sw is StreamWriter) and ((output.sw as StreamWriter).BaseStream <> nil) then
|
||||||
output.sw.Close;
|
output.sw.Close;
|
||||||
|
if (ErrOutput.sw <> nil) and (ErrOutput.sw is StreamWriter) and ((ErrOutput.sw as StreamWriter).BaseStream <> nil) then
|
||||||
|
ErrOutput.sw.Close;
|
||||||
if (input.sr <> nil) and (input.sr.BaseStream <> nil) then
|
if (input.sr <> nil) and (input.sr.BaseStream <> nil) then
|
||||||
input.sr.Close;
|
input.sr.Close;
|
||||||
end;
|
end;
|
||||||
|
|
|
||||||
|
|
@ -703,6 +703,7 @@ function TextHeightPFont(text: string; f: FontOptions): real;
|
||||||
/// Размер текста (совместно с FastDraw)
|
/// Размер текста (совместно с FastDraw)
|
||||||
function TextSizePFont(text: string; f: FontOptions): Size;
|
function TextSizePFont(text: string; f: FontOptions): Size;
|
||||||
|
|
||||||
|
procedure AddToHost(v: Visual);
|
||||||
|
|
||||||
{function GetDC: DrawingContext;
|
{function GetDC: DrawingContext;
|
||||||
procedure ReleaseDC(dc: DrawingContext);
|
procedure ReleaseDC(dc: DrawingContext);
|
||||||
|
|
@ -789,6 +790,11 @@ var
|
||||||
GlobalScale := 1.0;
|
GlobalScale := 1.0;
|
||||||
CurrentCoordType: CoordType := StandardCoords;
|
CurrentCoordType: CoordType := StandardCoords;
|
||||||
|
|
||||||
|
procedure AddToHost(v: Visual);
|
||||||
|
begin
|
||||||
|
Host.children.Add(v);
|
||||||
|
end;
|
||||||
|
|
||||||
function GetDC: DrawingContext;
|
function GetDC: DrawingContext;
|
||||||
begin
|
begin
|
||||||
var visual := new DrawingVisual();
|
var visual := new DrawingVisual();
|
||||||
|
|
|
||||||
|
|
@ -7062,7 +7062,7 @@ begin
|
||||||
on e: Exception do
|
on e: Exception do
|
||||||
raise e;
|
raise e;
|
||||||
end;
|
end;
|
||||||
if f = output then
|
if (f = output) or (f = ErrOutput) then
|
||||||
f.sw := new StreamWriter(f.fi.FullName);
|
f.sw := new StreamWriter(f.fi.FullName);
|
||||||
if f = input then
|
if f = input then
|
||||||
begin
|
begin
|
||||||
|
|
@ -14018,6 +14018,8 @@ procedure __FinalizeModule__;
|
||||||
begin
|
begin
|
||||||
if (output.sw <> nil) and (output.sw is StreamWriter) and ((output.sw as StreamWriter).BaseStream <> nil) then
|
if (output.sw <> nil) and (output.sw is StreamWriter) and ((output.sw as StreamWriter).BaseStream <> nil) then
|
||||||
output.sw.Close;
|
output.sw.Close;
|
||||||
|
if (ErrOutput.sw <> nil) and (ErrOutput.sw is StreamWriter) and ((ErrOutput.sw as StreamWriter).BaseStream <> nil) then
|
||||||
|
ErrOutput.sw.Close;
|
||||||
if (input.sr <> nil) and (input.sr.BaseStream <> nil) then
|
if (input.sr <> nil) and (input.sr.BaseStream <> nil) then
|
||||||
input.sr.Close;
|
input.sr.Close;
|
||||||
end;
|
end;
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue