From 1cbdf43fc3ca08849c1793eb09a31f9d802b8997 Mon Sep 17 00:00:00 2001 From: Mikhalkovich Stanislav Date: Sun, 23 Aug 2020 14:45:31 +0300 Subject: [PATCH] =?UTF-8?q?internal=20=D0=B2=20=D1=80=D0=B5=D0=B4=D0=B0?= =?UTF-8?q?=D0=BA=D1=82=D0=BE=D1=80=D0=B5=20=D1=84=D0=BE=D1=80=D0=BC=20?= =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=BB=D0=B5=D0=BD=D0=B8?= =?UTF-8?q?=D0=B5=20=D0=BE=D1=88=D0=B8=D0=B1=D0=BA=D0=B8=20=D0=B2=20CodeTe?= =?UTF-8?q?mplatesForm.cs=20=D0=B2=20WinXP?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Configuration/GlobalAssemblyInfo.cs | 2 +- Configuration/Version.defs | 4 ++-- Release/pabcversion.txt | 2 +- ReleaseGenerators/PascalABCNET_version.nsh | 2 +- VisualPascalABCNET/DockContent/CodeFileDocument.cs | 2 +- .../FormsDesigner/Src/DesignerGenerator/PABCCodeProvider.cs | 2 +- VisualPlugins/CodeTemplatesPlugin/CodeTemplatesForm.cs | 2 ++ 7 files changed, 9 insertions(+), 7 deletions(-) diff --git a/Configuration/GlobalAssemblyInfo.cs b/Configuration/GlobalAssemblyInfo.cs index 9f2dee911..db05e3346 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 = "6"; public const string Build = "3"; - public const string Revision = "2659"; + public const string Revision = "2660"; 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 013b51499..6e0f81b41 100644 --- a/Configuration/Version.defs +++ b/Configuration/Version.defs @@ -1,4 +1,4 @@ -%MINOR%=6 -%REVISION%=2659 %COREVERSION%=3 +%REVISION%=2660 +%MINOR%=6 %MAJOR%=3 diff --git a/Release/pabcversion.txt b/Release/pabcversion.txt index d58c4dd16..77d573b65 100644 --- a/Release/pabcversion.txt +++ b/Release/pabcversion.txt @@ -1 +1 @@ -3.6.3.2659 +3.6.3.2660 diff --git a/ReleaseGenerators/PascalABCNET_version.nsh b/ReleaseGenerators/PascalABCNET_version.nsh index 51d9153fc..39d1eb777 100644 --- a/ReleaseGenerators/PascalABCNET_version.nsh +++ b/ReleaseGenerators/PascalABCNET_version.nsh @@ -1 +1 @@ -!define VERSION '3.6.3.2659' +!define VERSION '3.6.3.2660' diff --git a/VisualPascalABCNET/DockContent/CodeFileDocument.cs b/VisualPascalABCNET/DockContent/CodeFileDocument.cs index b45e1f07c..6cd480e9b 100644 --- a/VisualPascalABCNET/DockContent/CodeFileDocument.cs +++ b/VisualPascalABCNET/DockContent/CodeFileDocument.cs @@ -704,7 +704,7 @@ namespace VisualPascalABC string s1 = string.Join(string_consts.nr, lines, 0, s_num + 1); string s2 = string.Join(string_consts.nr, lines, e_num, lines.Length - e_num); return s1 + string_consts.nr + string_consts.tab + - "private" + string_consts.nr + + "internal" + string_consts.nr + string_consts.tab2 + generated_text + s2; } diff --git a/VisualPascalABCNET/FormsDesignerBinding/FormsDesigner/Src/DesignerGenerator/PABCCodeProvider.cs b/VisualPascalABCNET/FormsDesignerBinding/FormsDesigner/Src/DesignerGenerator/PABCCodeProvider.cs index 8d3d948cd..8082bbe7d 100644 --- a/VisualPascalABCNET/FormsDesignerBinding/FormsDesigner/Src/DesignerGenerator/PABCCodeProvider.cs +++ b/VisualPascalABCNET/FormsDesignerBinding/FormsDesigner/Src/DesignerGenerator/PABCCodeProvider.cs @@ -29,7 +29,7 @@ namespace ICSharpCode.FormsDesigner "type" + nr + tab + "{1} = class(Form)" + nr + tab + '{' + begin_designer_region + '}' + nr + - tab + "private" + nr + tab2; + tab + "internal" + nr + tab2; public static readonly string end_unit = tab + end_designer_region + nr + diff --git a/VisualPlugins/CodeTemplatesPlugin/CodeTemplatesForm.cs b/VisualPlugins/CodeTemplatesPlugin/CodeTemplatesForm.cs index 5b9e4ad2b..15c95d1eb 100644 --- a/VisualPlugins/CodeTemplatesPlugin/CodeTemplatesForm.cs +++ b/VisualPlugins/CodeTemplatesPlugin/CodeTemplatesForm.cs @@ -116,6 +116,8 @@ namespace CodeTemplatesPlugin private void listBox1_MouseDoubleClick_1(object sender, MouseEventArgs e) { + if (listBox1.SelectedItems == null) + return; var s = listBox1.SelectedItems[0].Text; ICSharpCode.TextEditor.TextArea ta = MainForm.CurrentCodeFileDocument.TextEditor.ActiveTextAreaControl.TextArea; ta.Focus();