From e147f58a0e3bbecc57071069ea9f420c429d2475 Mon Sep 17 00:00:00 2001
From: Nebuleux_cp <SND\Nebuleux_cp>
Date: Tue, 6 Mar 2012 17:07:21 +0000
Subject: [PATCH] TimePicker: Fix an issue with the Background property (patch
 #11288).

---
 .../WPFToolkit.Extended/DateTimePicker/Themes/Generic.xaml   | 4 +++-
 .../Src/WPFToolkit.Extended/TimePicker/Themes/Generic.xaml   | 5 ++++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/Main/Source/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/DateTimePicker/Themes/Generic.xaml b/Main/Source/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/DateTimePicker/Themes/Generic.xaml
index b3e0a6ee..9f22cdab 100644
--- a/Main/Source/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/DateTimePicker/Themes/Generic.xaml
+++ b/Main/Source/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/DateTimePicker/Themes/Generic.xaml
@@ -111,7 +111,9 @@
                                 <Border BorderThickness="1" Background="{StaticResource PopupBackgroundBrush}" BorderBrush="{StaticResource PopupDarkBorderBrush}" Padding="3">
                                     <StackPanel>
                                         <Calendar x:Name="Part_Calendar" BorderThickness="0" />
-                                        <local:TimePicker x:Name="Part_TimeUpDown" 
+                                        <local:TimePicker x:Name="Part_TimeUpDown"
+                                                          Background="{DynamicResource {x:Static SystemColors.WindowBrushKey}}"
+                                                          Foreground="{DynamicResource {x:Static SystemColors.WindowTextBrushKey}}" 
                                                           Format="{TemplateBinding TimeFormat}"
                                                           FormatString="{TemplateBinding TimeFormatString}"
                                                           Value="{Binding Value, RelativeSource={RelativeSource TemplatedParent}}"
diff --git a/Main/Source/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/TimePicker/Themes/Generic.xaml b/Main/Source/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/TimePicker/Themes/Generic.xaml
index 9b846e23..dde6c1da 100644
--- a/Main/Source/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/TimePicker/Themes/Generic.xaml
+++ b/Main/Source/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/TimePicker/Themes/Generic.xaml
@@ -101,7 +101,10 @@
                                     <ColumnDefinition Width="*" />
                                     <ColumnDefinition Width="Auto" />
                                 </Grid.ColumnDefinitions>
-                                <local:DateTimeUpDown x:Name="PART_TimeUpDown" BorderThickness="1,1,0,1"  
+                                <local:DateTimeUpDown x:Name="PART_TimeUpDown" 
+                                                      BorderThickness="1,1,0,1"  
+                                                      Background="{TemplateBinding Background}"
+                                                      Foreground="{TemplateBinding Foreground}"
                                                       ContextMenu="{TemplateBinding ContextMenu}"
                                                       AllowSpin="{TemplateBinding AllowSpin}"
                                                       Format="{TemplateBinding Format, Converter={StaticResource TimeFormatToDateTimeFormatConverter}}"