From e6ebd6d72d8f454293171df814c3527c9072a02f Mon Sep 17 00:00:00 2001 From: brianlagunas_cp Date: Tue, 1 Feb 2011 22:39:09 +0000 Subject: [PATCH] MaskeTextBox and NumericUpDown: implemented support for access keys when used with a Label. --- .../WPFToolkit.Extended/MaskedTextBox/MaskedTextBox.cs | 8 ++++++++ .../WPFToolkit.Extended/NumericUpDown/NumericUpDown.cs | 8 ++++++++ 2 files changed, 16 insertions(+) diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/MaskedTextBox/MaskedTextBox.cs b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/MaskedTextBox/MaskedTextBox.cs index e17629c9..08e1295a 100644 --- a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/MaskedTextBox/MaskedTextBox.cs +++ b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/MaskedTextBox/MaskedTextBox.cs @@ -108,6 +108,14 @@ namespace Microsoft.Windows.Controls TextBox.CommandBindings.Add(new CommandBinding(ApplicationCommands.Cut, null, CanCut)); //surpress cut } + protected override void OnAccessKey(AccessKeyEventArgs e) + { + if (TextBox != null) + TextBox.Focus(); + + base.OnAccessKey(e); + } + protected override object ConvertTextToValue(string text) { object convertedValue = null; diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/NumericUpDown/NumericUpDown.cs b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/NumericUpDown/NumericUpDown.cs index a9e648cd..0b63606e 100644 --- a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/NumericUpDown/NumericUpDown.cs +++ b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/NumericUpDown/NumericUpDown.cs @@ -115,6 +115,14 @@ namespace Microsoft.Windows.Controls } } + protected override void OnAccessKey(AccessKeyEventArgs e) + { + if (TextBox != null) + TextBox.Focus(); + + base.OnAccessKey(e); + } + protected override void OnValueChanged(object oldValue, object newValue) { SetValidSpinDirection();