administrator/pascalabcnet
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Исправление Assign(ErrOutput)

Browse source
This commit is contained in:
Mikhalkovich Stanislav 2021-07-11 18:36:30 +03:00
parent f733799b1f
commit d03b31a2da
8 changed files with 23 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Configuration/GlobalAssemblyInfo.cs
View file

@ -15,7 +15,7 @@ internal static class RevisionClass
public const string Major = "3";
public const string Minor = "8";
public const string Build = "0";
public const string Revision = "2931";
public const string Revision = "2932";
public const string MainVersion = Major + "." + Minor;
public const string FullVersion = Major + "." + Minor + "." + Build + "." + Revision;

4
Configuration/Version.defs
View file

@ -1,4 +1,4 @@
%MINOR%=8
%REVISION%=2931
%COREVERSION%=0
%REVISION%=2932
%MINOR%=8
%MAJOR%=3

2
Release/pabcversion.txt
View file

@ -1 +1 @@
3.8.0.2931
3.8.0.2932

2
ReleaseGenerators/PascalABCNET_version.nsh
View file

@ -1 +1 @@
!define VERSION '3.8.0.2931'
!define VERSION '3.8.0.2932'

6
TestSuite/CompilationSamples/GraphWPF.pas
View file

@ -703,6 +703,7 @@ function TextHeightPFont(text: string; f: FontOptions): real;
/// Размер текста (совместно с FastDraw)
function TextSizePFont(text: string; f: FontOptions): Size;
procedure AddToHost(v: Visual);
{function GetDC: DrawingContext;
procedure ReleaseDC(dc: DrawingContext);
@ -789,6 +790,11 @@ var
GlobalScale := 1.0;
CurrentCoordType: CoordType := StandardCoords;
procedure AddToHost(v: Visual);
begin
Host.children.Add(v);
end;
function GetDC: DrawingContext;
begin
var visual := new DrawingVisual();

4
TestSuite/CompilationSamples/PABCSystem.pas
View file

@ -7062,7 +7062,7 @@ begin
on e: Exception do
raise e;
end;
if f = output then
if (f = output) or (f = ErrOutput) then
f.sw := new StreamWriter(f.fi.FullName);
if f = input then
begin
@ -14018,6 +14018,8 @@ procedure __FinalizeModule__;
begin
if (output.sw <> nil) and (output.sw is StreamWriter) and ((output.sw as StreamWriter).BaseStream <> nil) then
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
input.sr.Close;
end;

6
bin/Lib/GraphWPF.pas
View file

@ -703,6 +703,7 @@ function TextHeightPFont(text: string; f: FontOptions): real;
/// Размер текста (совместно с FastDraw)
function TextSizePFont(text: string; f: FontOptions): Size;
procedure AddToHost(v: Visual);
{function GetDC: DrawingContext;
procedure ReleaseDC(dc: DrawingContext);
@ -789,6 +790,11 @@ var
GlobalScale := 1.0;
CurrentCoordType: CoordType := StandardCoords;
procedure AddToHost(v: Visual);
begin
Host.children.Add(v);
end;
function GetDC: DrawingContext;
begin
var visual := new DrawingVisual();

4
bin/Lib/PABCSystem.pas
View file

@ -7062,7 +7062,7 @@ begin
on e: Exception do
raise e;
end;
if f = output then
if (f = output) or (f = ErrOutput) then
f.sw := new StreamWriter(f.fi.FullName);
if f = input then
begin
@ -14018,6 +14018,8 @@ procedure __FinalizeModule__;
begin
if (output.sw <> nil) and (output.sw is StreamWriter) and ((output.sw as StreamWriter).BaseStream <> nil) then
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
input.sr.Close;
end;