From 7441433bf68a4fc7dae7b44af6ad7eb61cf58af7 Mon Sep 17 00:00:00 2001 From: brianlagunas_cp Date: Mon, 27 Dec 2010 18:04:42 +0000 Subject: [PATCH] MaskedTextBox: fixed bug where setting IncludeLiterals or IncludePrompt properties inside DataTemplate would throw exception. --- .../WPFToolkit.Extended/MaskedTextBox/MaskedTextBox.cs | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/MaskedTextBox/MaskedTextBox.cs b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/MaskedTextBox/MaskedTextBox.cs index 8ee1623e..6d5610b1 100644 --- a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/MaskedTextBox/MaskedTextBox.cs +++ b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/MaskedTextBox/MaskedTextBox.cs @@ -240,6 +240,9 @@ namespace Microsoft.Windows.Controls private void UpdateText(MaskedTextProvider provider, int position) { + if (provider == null) + throw new ArgumentNullException("MaskedTextProvider", "Mask cannot be null."); + Text = provider.ToDisplayString(); if (TextBox != null) @@ -254,6 +257,11 @@ namespace Microsoft.Windows.Controls private void ResolveMaskProvider(string mask) { + //do not create a mask provider if the Mask is empty, which can occur if the IncludePrompt and IncludeLiterals properties + //are set prior to the Mask. + if (String.IsNullOrWhiteSpace(mask)) + return; + MaskProvider = new MaskedTextProvider(mask) { IncludePrompt = this.IncludePrompt,