From 991992fb973f5bf6387de2b331ee894460fd5edd Mon Sep 17 00:00:00 2001
From: brianlagunas_cp <XceedBoucherS@users.noreply.github.com>
Date: Fri, 24 Dec 2010 20:47:16 +0000
Subject: [PATCH] Fixed bug in DateTimeUpDown when not changing the Format,
 null exception would occur when changing values. Added default foreground
 colors to editors to controls like the DataGrid will not change the
 foreground color.

---
 .../Src/WPFToolkit.Extended/DateTimeUpDown/DateTimeUpDown.cs   | 3 ++-
 .../Src/WPFToolkit.Extended/Themes/Generic.xaml                | 3 +++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/DateTimeUpDown/DateTimeUpDown.cs b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/DateTimeUpDown/DateTimeUpDown.cs
index 8cd4daef..e33d8c2a 100644
--- a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/DateTimeUpDown/DateTimeUpDown.cs
+++ b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/DateTimeUpDown/DateTimeUpDown.cs
@@ -22,7 +22,7 @@ namespace Microsoft.Windows.Controls
 
         #region Format
 
-        public static readonly DependencyProperty FormatProperty = DependencyProperty.Register("Format", typeof(DateTimeFormat), typeof(DateTimeUpDown), new UIPropertyMetadata(DateTimeFormat.ShortTime, OnFormatChanged));
+        public static readonly DependencyProperty FormatProperty = DependencyProperty.Register("Format", typeof(DateTimeFormat), typeof(DateTimeUpDown), new UIPropertyMetadata(DateTimeFormat.FullDateTime, OnFormatChanged));
         public DateTimeFormat Format
         {
             get { return (DateTimeFormat)GetValue(FormatProperty); }
@@ -56,6 +56,7 @@ namespace Microsoft.Windows.Controls
         public DateTimeUpDown()
         {
             DateTimeFormatInfo = DateTimeFormatInfo.GetInstance(CultureInfo.CurrentCulture);
+            InitializeDateTimeInfoList();
         }
 
         protected override void OnValueChanged(object oldValue, object newValue)
diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Themes/Generic.xaml b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Themes/Generic.xaml
index 5778cffc..96ac11a8 100644
--- a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Themes/Generic.xaml
+++ b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Themes/Generic.xaml
@@ -961,6 +961,7 @@
     <!-- =============================================================================== -->
 
     <Style TargetType="{x:Type local:NumericUpDown}">
+        <Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.WindowTextBrushKey}}"/>
         <Setter Property="Focusable" Value="False" />
         <Setter Property="Template">
             <Setter.Value>
@@ -988,6 +989,7 @@
     <!-- =============================================================================== -->
     
     <Style TargetType="{x:Type local:DateTimeUpDown}">
+        <Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.WindowTextBrushKey}}"/>
         <Setter Property="Focusable" Value="False" />
         <Setter Property="Template">
             <Setter.Value>
@@ -1015,6 +1017,7 @@
     <!-- =============================================================================== -->
 
     <Style TargetType="{x:Type local:MaskedTextBox}">
+        <Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.WindowTextBrushKey}}"/>
         <Setter Property="Focusable" Value="False" />
         <Setter Property="Template">
             <Setter.Value>