checked in initial IntegerUpDown control. Not ready for use, just getting it in the code base.

ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Core/Primitives/UpDownBase.cs

@@ -243,7 +243,7 @@ namespace Microsoft.Windows.Controls.Primitives
 
         #region Value
 
-        public static readonly DependencyProperty ValueProperty = DependencyProperty.Register("Value", typeof(T), typeof(UpDownBase<T>), new UIPropertyMetadata(default(T), OnValueChanged, OnCoerceValue));
+        public static readonly DependencyProperty ValueProperty = DependencyProperty.Register("Value", typeof(T), typeof(UpDownBase<T>), new FrameworkPropertyMetadata(default(T), FrameworkPropertyMetadataOptions.BindsTwoWayByDefault, OnValueChanged, OnCoerceValue));
         public T Value
         {
             get { return (T)GetValue(ValueProperty); }
@@ -301,6 +301,12 @@ namespace Microsoft.Windows.Controls.Primitives
             Spinner.Spin += OnSpinnerSpin;
         }
 
+        protected override void OnGotFocus(RoutedEventArgs e)
+        {
+            if (TextBox != null)
+                TextBox.Focus();
+        }
+
         protected override void OnPreviewKeyDown(KeyEventArgs e)
         {
             switch (e.Key)
@@ -319,12 +325,12 @@ namespace Microsoft.Windows.Controls.Primitives
                         e.Handled = true;
                         break;
                     }
-                //case Key.Enter:
+                case Key.Enter:
-                //    {
+                    {
-                //        if (IsEditable)
+                        if (IsEditable)
-                //            SyncTextAndValueProperties(UpDownBase.TextProperty, TextBox.Text);
+                            SyncTextAndValueProperties(UpDownBase.TextProperty, TextBox.Text);
-                //        break;
+                        break;
-                //    }
+                    }
             }
         }
 
@@ -366,7 +372,7 @@ namespace Microsoft.Windows.Controls.Primitives
 
         #region Events
 
-        public static readonly RoutedEvent ValueChangedEvent = EventManager.RegisterRoutedEvent("ValueChanged", RoutingStrategy.Bubble, typeof(RoutedPropertyChangedEventHandler<T>), typeof(NumericUpDown));
+        public static readonly RoutedEvent ValueChangedEvent = EventManager.RegisterRoutedEvent("ValueChanged", RoutingStrategy.Bubble, typeof(RoutedPropertyChangedEventHandler<T>), typeof(UpDownBase<T>));
         public event RoutedPropertyChangedEventHandler<T> ValueChanged
         {
             add { AddHandler(ValueChangedEvent, value); }

ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/NumericUpDown/Implementation/IntegerUpDown.cs

@@ -0,0 +1,104 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+using System.Windows.Navigation;
+using System.Windows.Shapes;
+using Microsoft.Windows.Controls.Primitives;
+
+namespace Microsoft.Windows.Controls
+{
+    public class IntegerUpDown : UpDownBase<int?>
+    {
+        #region Properties
+
+        #region DefaultValue
+
+        //can possibly be in base class
+        public static readonly DependencyProperty DefaultValueProperty = DependencyProperty.Register("DefaultValue", typeof(int), typeof(IntegerUpDown), new UIPropertyMetadata(default(int)));
+        public int DefaultValue
+        {
+            get { return (int)GetValue(DefaultValueProperty); }
+            set { SetValue(DefaultValueProperty, value); }
+        }
+
+        #endregion //DefaultValue
+
+        #region Increment
+
+        public static readonly DependencyProperty IncrementProperty = DependencyProperty.Register("Increment", typeof(int), typeof(IntegerUpDown), new PropertyMetadata(1));
+        public int Increment
+        {
+            get { return (int)GetValue(IncrementProperty); }
+            set { SetValue(IncrementProperty, value); }
+        }
+
+        #endregion
+
+        #endregion //Properties
+
+        #region Constructors
+
+        static IntegerUpDown()
+        {
+            DefaultStyleKeyProperty.OverrideMetadata(typeof(IntegerUpDown), new FrameworkPropertyMetadata(typeof(IntegerUpDown)));
+        }
+
+        #endregion //Constructors
+
+        #region Base Class Overrides
+
+        protected override void OnIncrement()
+        {
+            if (Value.HasValue)
+                Value += Increment;
+            else
+                Value = DefaultValue;
+        }
+
+        protected override void OnDecrement()
+        {
+            if (Value.HasValue)
+                Value -= Increment;
+            else
+                Value = DefaultValue;
+        }
+
+        protected override int? ConvertTextToValue(string text)
+        {
+            int? result = null;
+
+            if (String.IsNullOrEmpty(text))
+                return result;
+
+            try
+            {
+                result = Int16.Parse(text, System.Globalization.NumberStyles.Any);
+            }
+            catch
+            {
+                Text = ConvertValueToText(Value);
+                return Value;
+            }
+
+            return result;
+        }
+
+        protected override string ConvertValueToText(object value)
+        {
+            if (value == null)
+                return string.Empty;
+
+            return value.ToString();
+        }
+
+        #endregion //Base Class Overrides
+    }
+}

ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/NumericUpDown/Themes/Generic.xaml

@@ -1,7 +1,8 @@
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                     xmlns:local="clr-namespace:Microsoft.Windows.Controls"
-                    xmlns:coreConverters="clr-namespace:Microsoft.Windows.Controls.Core.Converters">
+                    xmlns:coreConverters="clr-namespace:Microsoft.Windows.Controls.Core.Converters"
+                    xmlns:prims="clr-namespace:Microsoft.Windows.Controls.Primitives">
 
     <coreConverters:InverseBoolConverter x:Key="InverseBoolConverter" />
 
@@ -9,6 +10,44 @@
         <ContentControl Content="{Binding}" Foreground="Gray" Focusable="False" />
     </DataTemplate>
 
+    <!-- =============================================================================== -->
+    <!-- IntegerUpDown                                                                   -->
+    <!-- =============================================================================== -->
+    
+    <Style TargetType="{x:Type local:IntegerUpDown}">
+        <Setter Property="Background" Value="{DynamicResource {x:Static SystemColors.WindowBrushKey}}"/>
+        <Setter Property="BorderThickness" Value="1" />
+        <Setter Property="Focusable" Value="False" />
+        <Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.WindowTextBrushKey}}"/>
+        <Setter Property="HorizontalContentAlignment" Value="Right" />
+        <Setter Property="WatermarkTemplate" Value="{StaticResource DefaultWatermarkTemplate}" />
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type local:IntegerUpDown}">
+                    <local:ButtonSpinner x:Name="Spinner" IsTabStop="False" Background="{TemplateBinding Background}" BorderThickness="{TemplateBinding BorderThickness}"
+                                         AllowSpin="{TemplateBinding AllowSpin}" ShowButtonSpinner="{TemplateBinding ShowButtonSpinner}">
+                        <local:WatermarkTextBox x:Name="TextBox" BorderThickness="0" 
+                                                Background="{TemplateBinding Background}"
+                                                FontFamily="{TemplateBinding FontFamily}" 
+                                                FontSize="{TemplateBinding FontSize}" 
+                                                FontStretch="{TemplateBinding FontStretch}"
+                                                FontStyle="{TemplateBinding FontStyle}" 
+                                                FontWeight="{TemplateBinding FontWeight}" 
+                                                Foreground="{TemplateBinding Foreground}" 
+                                                HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                                IsReadOnly="{Binding IsEditable, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource InverseBoolConverter}}"
+                                                MinWidth="20" AcceptsReturn="False" 
+                                                TextWrapping="NoWrap" 
+                                                TabIndex="{TemplateBinding TabIndex}"
+                                                Text="{Binding Text, RelativeSource={RelativeSource TemplatedParent}}"
+                                                Watermark="{TemplateBinding Watermark}"
+                                                WatermarkTemplate="{TemplateBinding WatermarkTemplate}"/>
+                    </local:ButtonSpinner>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
     <!-- =============================================================================== -->
     <!-- NumericUpDown                                                                   -->
     <!-- =============================================================================== -->

ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/PropertyGrid/Implementation/Editors/IntegerUpDownEditor.cs

@@ -0,0 +1,12 @@
+using System;
+
+namespace Microsoft.Windows.Controls.PropertyGrid.Editors
+{
+    public class IntegerUpDownEditor : TypeEditor<IntegerUpDown>
+    {
+        protected override void SetValueDependencyProperty()
+        {
+            ValueProperty = IntegerUpDown.ValueProperty;
+        }
+    }
+}

ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/PropertyGrid/Implementation/PropertyGrid.cs

@@ -322,8 +322,10 @@ namespace Microsoft.Windows.Controls.PropertyGrid
                     editor = new TextBlockEditor();
                 else if (propertyItem.PropertyType == typeof(bool))
                     editor = new CheckBoxEditor();
-                else if (propertyItem.PropertyType == typeof(double) || propertyItem.PropertyType == typeof(int))
+                //else if (propertyItem.PropertyType == typeof(double))
-                    editor = new NumericUpDownEditor();
+                //    editor = new NumericUpDownEditor();
+                else if (propertyItem.PropertyType == typeof(int) || propertyItem.PropertyType == typeof(int?))
+                    editor = new IntegerUpDownEditor();
                 else if (propertyItem.PropertyType == typeof(DateTime))
                     editor = new DateTimeUpDownEditor();
                 else if (propertyItem.PropertyType.IsEnum)

ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/WPFToolkit.Extended.csproj

@@ -177,6 +177,7 @@
     <Compile Include="DateTimeUpDown\Implementation\DateTimePart.cs" />
     <Compile Include="DateTimeUpDown\Implementation\DateTimeUpDown.cs" />
     <Compile Include="DateTimeUpDown\Implementation\DateTimeParser.cs" />
+    <Compile Include="NumericUpDown\Implementation\IntegerUpDown.cs" />
     <Compile Include="Magnifier\Implementation\Converters\BorderThicknessToStrokeThicknessConverter.cs" />
     <Compile Include="Magnifier\Implementation\Converters\RadiusConverter.cs" />
     <Compile Include="Magnifier\Implementation\Magnifier.cs" />
@@ -211,6 +212,7 @@
     <Compile Include="PropertyGrid\Implementation\Editors\EnumComboBoxEditor.cs" />
     <Compile Include="PropertyGrid\Implementation\Editors\FontComboBoxEditor.cs" />
     <Compile Include="PropertyGrid\Implementation\Editors\ICustomTypeEditor.cs" />
+    <Compile Include="PropertyGrid\Implementation\Editors\IntegerUpDownEditor.cs" />
     <Compile Include="PropertyGrid\Implementation\Editors\ITypeEditor.cs" />
     <Compile Include="PropertyGrid\Implementation\Editors\NumericUpDownEditor.cs" />
     <Compile Include="PropertyGrid\Implementation\Editors\TextBlockEditor.cs" />