From 38c4901787e5962274990e4d21d02a7c47c75ffa Mon Sep 17 00:00:00 2001 From: Mikhalkovich Stanislav Date: Wed, 8 May 2024 23:44:49 +0300 Subject: [PATCH] =?UTF-8?q?DrawMan=20=D0=B8=D1=81=D0=BF=D1=80=D0=B0=D0=B2?= =?UTF-8?q?=D0=BB=D0=B5=D0=BD=D0=B8=D1=8F=20=D0=BF=D0=B0=D0=B4=D0=B5=D0=BD?= =?UTF-8?q?=D0=B8=D1=8F=20=D0=BF=D1=80=D0=B8=20=D0=B7=D0=B0=D0=BF=D1=83?= =?UTF-8?q?=D1=81=D0=BA=D0=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Configuration/GlobalAssemblyInfo.cs | 2 +- Configuration/Version.defs | 4 ++-- Parsers/PascalABCParserNewSaushkin/ABCPascal.cs | 2 +- Parsers/PascalABCParserNewSaushkin/ABCPascalYacc.cs | 2 +- Parsers/PascalABCParserNewSaushkin/PABC.ymc | 1 + Release/pabcversion.txt | 2 +- ReleaseGenerators/PascalABCNET_version.nsh | 2 +- TestSuite/CompilationSamples/DrawManField.pas | 10 ++++++++-- bin/Lib/DrawManField.pas | 10 ++++++++-- 9 files changed, 24 insertions(+), 11 deletions(-) diff --git a/Configuration/GlobalAssemblyInfo.cs b/Configuration/GlobalAssemblyInfo.cs index 4de96d9a5..6bcc3576d 100644 --- a/Configuration/GlobalAssemblyInfo.cs +++ b/Configuration/GlobalAssemblyInfo.cs @@ -15,7 +15,7 @@ internal static class RevisionClass public const string Major = "3"; public const string Minor = "9"; public const string Build = "0"; - public const string Revision = "3478"; + public const string Revision = "3479"; public const string MainVersion = Major + "." + Minor; public const string FullVersion = Major + "." + Minor + "." + Build + "." + Revision; diff --git a/Configuration/Version.defs b/Configuration/Version.defs index ff8f018a9..44722b911 100644 --- a/Configuration/Version.defs +++ b/Configuration/Version.defs @@ -1,4 +1,4 @@ -%COREVERSION%=0 -%REVISION%=3478 %MINOR%=9 +%REVISION%=3479 +%COREVERSION%=0 %MAJOR%=3 diff --git a/Parsers/PascalABCParserNewSaushkin/ABCPascal.cs b/Parsers/PascalABCParserNewSaushkin/ABCPascal.cs index 903d9f72c..ce9abfab3 100644 --- a/Parsers/PascalABCParserNewSaushkin/ABCPascal.cs +++ b/Parsers/PascalABCParserNewSaushkin/ABCPascal.cs @@ -2,7 +2,7 @@ // This CSharp output file generated by Gardens Point LEX // Version: 1.1.3.301 // Machine: DESKTOP-G8V08V4 -// DateTime: 07.05.2024 10:51:36 +// DateTime: 08.05.2024 9:59:53 // UserName: ????????? // GPLEX input file // GPLEX frame file diff --git a/Parsers/PascalABCParserNewSaushkin/ABCPascalYacc.cs b/Parsers/PascalABCParserNewSaushkin/ABCPascalYacc.cs index 75956ef88..39c5bffb6 100644 --- a/Parsers/PascalABCParserNewSaushkin/ABCPascalYacc.cs +++ b/Parsers/PascalABCParserNewSaushkin/ABCPascalYacc.cs @@ -2,7 +2,7 @@ // GPPG version 1.3.6 // Machine: DESKTOP-G8V08V4 -// DateTime: 07.05.2024 10:51:37 +// DateTime: 08.05.2024 9:59:54 // UserName: ????????? // Input file diff --git a/Parsers/PascalABCParserNewSaushkin/PABC.ymc b/Parsers/PascalABCParserNewSaushkin/PABC.ymc index 6a0407ca1..b5d315699 100644 --- a/Parsers/PascalABCParserNewSaushkin/PABC.ymc +++ b/Parsers/PascalABCParserNewSaushkin/PABC.ymc @@ -378,5 +378,6 @@ script= + diff --git a/Release/pabcversion.txt b/Release/pabcversion.txt index a95d34c6d..30d594d03 100644 --- a/Release/pabcversion.txt +++ b/Release/pabcversion.txt @@ -1 +1 @@ -3.9.0.3478 +3.9.0.3479 diff --git a/ReleaseGenerators/PascalABCNET_version.nsh b/ReleaseGenerators/PascalABCNET_version.nsh index 53fb88880..9ca4771ed 100644 --- a/ReleaseGenerators/PascalABCNET_version.nsh +++ b/ReleaseGenerators/PascalABCNET_version.nsh @@ -1 +1 @@ -!define VERSION '3.9.0.3478' +!define VERSION '3.9.0.3479' diff --git a/TestSuite/CompilationSamples/DrawManField.pas b/TestSuite/CompilationSamples/DrawManField.pas index 6c4ca1b43..e79140494 100644 --- a/TestSuite/CompilationSamples/DrawManField.pas +++ b/TestSuite/CompilationSamples/DrawManField.pas @@ -972,9 +972,15 @@ var __initialized := false; procedure __InitModule; begin - MainForm.Invoke(_HideInternal); + MainForm.Shown += (o,e)-> + begin + MainForm.Hide; + BackColor := MainForm.BackColor; + end; + + //MainForm.Invoke(_HideInternal); // было до 08.05.24 //MainForm.Hide; - MainForm.Invoke(_InternalAssignBackColor); + //MainForm.Invoke(_InternalAssignBackColor); //BackColor := MainForm.BackColor; LabelReadyColor := RGB(95,109,154); diff --git a/bin/Lib/DrawManField.pas b/bin/Lib/DrawManField.pas index 6c4ca1b43..e79140494 100644 --- a/bin/Lib/DrawManField.pas +++ b/bin/Lib/DrawManField.pas @@ -972,9 +972,15 @@ var __initialized := false; procedure __InitModule; begin - MainForm.Invoke(_HideInternal); + MainForm.Shown += (o,e)-> + begin + MainForm.Hide; + BackColor := MainForm.BackColor; + end; + + //MainForm.Invoke(_HideInternal); // было до 08.05.24 //MainForm.Hide; - MainForm.Invoke(_InternalAssignBackColor); + //MainForm.Invoke(_InternalAssignBackColor); //BackColor := MainForm.BackColor; LabelReadyColor := RGB(95,109,154);