AvalonEdit: fixed cyclic reference in type initializers

git-svn-id: svn://svn.sharpdevelop.net/sharpdevelop/trunk@3915 1ccf3a8d-04fe-1044-b7c0-cef0b8235c61

src/AddIns/DisplayBindings/AvalonEdit.AddIn/Src/CodeEditor.cs

@@ -56,6 +56,7 @@ namespace ICSharpCode.AvalonEdit.AddIn
 				}
 				toolTip.Content = args.ContentToShow;
 				toolTip.IsOpen = true;
+				e.Handled = true;
 			}
 		}
 		
@@ -63,6 +64,7 @@ namespace ICSharpCode.AvalonEdit.AddIn
 		{
 			if (toolTip != null) {
 				toolTip.IsOpen = false;
+				e.Handled = true;
 			}
 		}
 

src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Gui/TextArea.cs

@@ -125,7 +125,7 @@ namespace ICSharpCode.AvalonEdit
 		/// Document property.
 		/// </summary>
 		public static readonly DependencyProperty DocumentProperty
-			= TextEditor.DocumentProperty.AddOwner(typeof(TextArea), new FrameworkPropertyMetadata(OnDocumentChanged));
+			= TextView.DocumentProperty.AddOwner(typeof(TextArea), new FrameworkPropertyMetadata(OnDocumentChanged));
 		
 		/// <summary>
 		/// Gets/Sets the document displayed by the text editor.
@@ -166,7 +166,7 @@ namespace ICSharpCode.AvalonEdit
 		/// Options property.
 		/// </summary>
 		public static readonly DependencyProperty OptionsProperty
-			= TextEditor.OptionsProperty.AddOwner(typeof(TextArea), new FrameworkPropertyMetadata(OnOptionsChanged));
+			= TextView.OptionsProperty.AddOwner(typeof(TextArea), new FrameworkPropertyMetadata(OnOptionsChanged));
 		
 		/// <summary>
 		/// Gets/Sets the document displayed by the text editor.

src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Gui/TextEditor.cs

@@ -62,9 +62,9 @@ namespace ICSharpCode.AvalonEdit
 		/// <summary>
 		/// Document property.
 		/// </summary>
-		public static readonly DependencyProperty DocumentProperty =
+		public static readonly DependencyProperty DocumentProperty
-			DependencyProperty.Register("Document", typeof(TextDocument), typeof(TextEditor),
+			= TextView.DocumentProperty.AddOwner(
-			                            new FrameworkPropertyMetadata(OnDocumentChanged));
+				typeof(TextEditor), new FrameworkPropertyMetadata(OnDocumentChanged));
 		
 		/// <summary>
 		/// Gets/Sets the document displayed by the text editor.
@@ -102,9 +102,8 @@ namespace ICSharpCode.AvalonEdit
 		/// <summary>
 		/// Options property.
 		/// </summary>
-		public static readonly DependencyProperty OptionsProperty =
+		public static readonly DependencyProperty OptionsProperty
-			DependencyProperty.Register("Options", typeof(TextEditorOptions), typeof(TextEditor),
+			= TextEditor.OptionsProperty.AddOwner(typeof(TextEditor), new FrameworkPropertyMetadata(OnOptionsChanged));
-			                            new FrameworkPropertyMetadata(OnOptionsChanged));
 		
 		/// <summary>
 		/// Gets/Sets the options currently used by the text editor.

src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Gui/TextView.cs

@@ -68,9 +68,9 @@ namespace ICSharpCode.AvalonEdit.Gui
 		/// <summary>
 		/// Document property.
 		/// </summary>
-		public static readonly DependencyProperty DocumentProperty
+		public static readonly DependencyProperty DocumentProperty =
-			= TextEditor.DocumentProperty.AddOwner(
+			DependencyProperty.Register("Document", typeof(TextDocument), typeof(TextView),
-				typeof(TextView), new FrameworkPropertyMetadata(OnDocumentChanged));
+			                            new FrameworkPropertyMetadata(OnDocumentChanged));
 		
 		TextDocument document;
 		HeightTree heightTree;
@@ -146,8 +146,9 @@ namespace ICSharpCode.AvalonEdit.Gui
 		/// <summary>
 		/// Options property.
 		/// </summary>
-		public static readonly DependencyProperty OptionsProperty
+		public static readonly DependencyProperty OptionsProperty =
-			= TextEditor.OptionsProperty.AddOwner(typeof(TextView), new FrameworkPropertyMetadata(OnOptionsChanged));
+			DependencyProperty.Register("Options", typeof(TextEditorOptions), typeof(TextView),
+			                            new FrameworkPropertyMetadata(OnOptionsChanged));
 		
 		/// <summary>
 		/// Gets/Sets the document displayed by the text editor.