several changes to merge later

2 files changed, 10 insertions, 14 deletions

diff --git a/src/GraphicObjects/Label.cs b/src/GraphicObjects/Label.cs
index ebc18f76..64c37ff8 100644
--- a/src/GraphicObjects/Label.cs
+++ b/src/GraphicObjects/Label.cs
@@ -119,7 +119,7 @@ namespace Crow
 			}
             set
             {
-                if (_text == value)
+				if (string.Equals (value, _text, StringComparison.Ordinal))
                     return;
 					                                
                 _text = value;
diff --git a/src/GraphicObjects/Window.cs b/src/GraphicObjects/Window.cs
index 429d4269..94fe40d3 100644
--- a/src/GraphicObjects/Window.cs
+++ b/src/GraphicObjects/Window.cs
@@ -28,21 +28,14 @@ namespace Crow
 		Container _contentContainer;
 		Direction currentDirection = Direction.None;
 
+		public event EventHandler Closing;
+
 		#region CTOR
 		public Window () : base() {
 			
 		}
 		#endregion
 
-		#region GraphicObject overrides
-		[XmlAttributeAttribute()][DefaultValue(true)]//overiden to get default to true
-		public override bool Focusable
-		{
-			get { return base.Focusable; }
-			set { base.Focusable = value; }
-		}
-		#endregion
-
 		public override GraphicObject Content {
 			get {
 				return _contentContainer == null ? null : _contentContainer.Child;
@@ -221,10 +214,13 @@ namespace Crow
 
 		protected void butQuitPress (object sender, MouseButtonEventArgs e)
 		{
-			ILayoutable parent = (sender as GraphicObject).Parent;
-			while(!(parent is Window))
-				parent = parent.Parent;
-			Interface.CurrentInterface.DeleteWidget (parent as GraphicObject);
+			close ();
+		}
+
+		void close(){
+			Closing.Raise (this, null);
+
+			Interface.CurrentInterface.DeleteWidget (this);
 		}
 
 		public override void ResolveBindings ()