From 5dc86e504cd04a1a3764561219c2a128da922484 Mon Sep 17 00:00:00 2001 From: jpbruyere Date: Tue, 21 Jun 2016 01:59:26 +0200 Subject: [PATCH] divers --- .gitignore | 1 + src/GraphicObjects/GraphicObject.cs | 4 ++-- src/Interface.cs | 16 +++++++--------- 3 files changed, 10 insertions(+), 11 deletions(-) diff --git a/.gitignore b/.gitignore index ce290fc4..0bc65047 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ +build Win_x86 .nuget Crow.userprefs diff --git a/src/GraphicObjects/GraphicObject.cs b/src/GraphicObjects/GraphicObject.cs index 75fe4b63..16371e51 100644 --- a/src/GraphicObjects/GraphicObject.cs +++ b/src/GraphicObjects/GraphicObject.cs @@ -1212,9 +1212,9 @@ namespace Crow if (!string.IsNullOrEmpty (xaa.AttributeName)) name = xaa.AttributeName; } - if (value.StartsWith("{")) { + if (value.StartsWith("{",StringComparison.Ordinal)) { //binding - if (!value.EndsWith("}")) + if (!value.EndsWith("}", StringComparison.Ordinal)) throw new Exception (string.Format("GOML:Malformed binding: {0}", value)); this.Bindings.Add (new Binding (new MemberReference(this, pi), value.Substring (1, value.Length - 2))); diff --git a/src/Interface.cs b/src/Interface.cs index 2e145bff..8e00a284 100644 --- a/src/Interface.cs +++ b/src/Interface.cs @@ -19,18 +19,13 @@ // You should have received a copy of the GNU General Public License // along with this program. If not, see . using System; -using System.Xml.Serialization; +using System.Collections.Generic; +using System.Diagnostics; using System.IO; using System.Reflection; -using System.Diagnostics; -using System.Collections.Generic; -using System.Xml; -using System.Linq; -using System.Reflection.Emit; -using System.CodeDom; -using Microsoft.CSharp; -using System.CodeDom.Compiler; using System.Threading; +using System.Xml; +using System.Xml.Serialization; using Cairo; namespace Crow @@ -52,6 +47,7 @@ namespace Crow internal static bool XmlSerializerInit = false; /// keep ressource path for debug msg internal static string CurrentGOMLPath = ""; + //used in templatedControl internal static int XmlLoaderCount = 0; public static int TabSize = 4; @@ -325,6 +321,8 @@ namespace Crow public void Update(){ + CurrentInterface = this; + if (mouseRepeatCount > 0) { int mc = mouseRepeatCount; mouseRepeatCount -= mc; -- 2.47.3