diff --git a/Configuration/GlobalAssemblyInfo.cs b/Configuration/GlobalAssemblyInfo.cs index 59375a812..40f3077e3 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 = "3"; public const string Build = "5"; - public const string Revision = "1640"; + public const string Revision = "1641"; 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 5c2f609fa..ef7326cac 100644 --- a/Configuration/Version.defs +++ b/Configuration/Version.defs @@ -1,4 +1,4 @@ -%MINOR%=3 -%REVISION%=1640 %COREVERSION%=5 +%REVISION%=1641 +%MINOR%=3 %MAJOR%=3 diff --git a/Localization/DefaultLang.resources b/Localization/DefaultLang.resources index 5909fb49d..7ef758283 100644 Binary files a/Localization/DefaultLang.resources and b/Localization/DefaultLang.resources differ diff --git a/ReleaseGenerators/PascalABCNET_version.nsh b/ReleaseGenerators/PascalABCNET_version.nsh index 4e0677a60..1c10beaf7 100644 --- a/ReleaseGenerators/PascalABCNET_version.nsh +++ b/ReleaseGenerators/PascalABCNET_version.nsh @@ -1 +1 @@ -!define VERSION '3.3.5.1640' +!define VERSION '3.3.5.1641' diff --git a/TestSuite/CompilationSamples/graph3d.pas b/TestSuite/CompilationSamples/graph3d.pas index 3eb167df6..28e839880 100644 --- a/TestSuite/CompilationSamples/graph3d.pas +++ b/TestSuite/CompilationSamples/graph3d.pas @@ -40,6 +40,7 @@ type TupleInt3 = (integer, integer, integer); TupleReal3 = (real, real, real); Point3D = Point3D; + Point = System.Windows.Point; {MyWindow = class(GWindow) public diff --git a/bin/Lib/Sounds.pas b/bin/Lib/Sounds.pas index 18e94fb4a..df62c073e 100644 --- a/bin/Lib/Sounds.pas +++ b/bin/Lib/Sounds.pas @@ -5,7 +5,7 @@ procedure PlaySound(fname: string); begin var fsound := new System.Windows.Media.MediaPlayer; - fsound.Open(new System.Uri(fname)); + fsound.Open(new System.Uri(fname,System.UriKind.RelativeOrAbsolute)); fsound.Play; end; @@ -16,7 +16,7 @@ public begin Open(fname); end; - procedure Open(fname: string) := fsound.Open(new System.Uri(fname)); + procedure Open(fname: string) := fsound.Open(new System.Uri(fname,System.UriKind.RelativeOrAbsolute)); procedure Play := fsound.Play; procedure Stop := fsound.Stop; procedure Pause := fsound.Pause;