From f2182afd6e20373d404545fcdc351fc2cc783583 Mon Sep 17 00:00:00 2001 From: brianlagunas_cp Date: Fri, 3 Sep 2010 00:25:51 +0000 Subject: [PATCH] RichTextBox: fixed bug when using RichTextBox and not data binding to the Text Property --- .../RichTextBox/RichTextBox.cs | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/RichTextBox/RichTextBox.cs b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/RichTextBox/RichTextBox.cs index 6fdbea1a..ed49384b 100644 --- a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/RichTextBox/RichTextBox.cs +++ b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/RichTextBox/RichTextBox.cs @@ -113,13 +113,16 @@ namespace Microsoft.Windows.Controls { Binding binding = BindingOperations.GetBinding(this, TextProperty); - if (binding.UpdateSourceTrigger == UpdateSourceTrigger.Default || binding.UpdateSourceTrigger == UpdateSourceTrigger.LostFocus) + if (binding != null) { - LostFocus += (o, ea) => UpdateText(); //do this synchronously - } - else - { - TextChanged += (o, ea) => InvokeUpdateText(); //do this async + if (binding.UpdateSourceTrigger == UpdateSourceTrigger.Default || binding.UpdateSourceTrigger == UpdateSourceTrigger.LostFocus) + { + LostFocus += (o, ea) => UpdateText(); //do this synchronously + } + else + { + TextChanged += (o, ea) => InvokeUpdateText(); //do this async + } } }