From 5eb9c8e3bb1deb5bdd933a9cfbbe1a43183a556c Mon Sep 17 00:00:00 2001
From: brianlagunas_cp <XceedBoucherS@users.noreply.github.com>
Date: Wed, 21 Sep 2011 22:02:01 +0000
Subject: [PATCH] DateTimePicker: added TimeFormat and TimeFormatString
 properties to control the formatting of rthe timeUpDown control.

---
 .../Implementation/DateTimePicker.cs          | 22 +++++++++++++++++++
 .../DateTimePicker/Themes/Generic.xaml        |  3 ++-
 2 files changed, 24 insertions(+), 1 deletion(-)

diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/DateTimePicker/Implementation/DateTimePicker.cs b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/DateTimePicker/Implementation/DateTimePicker.cs
index 45ad950a..c45bb938 100644
--- a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/DateTimePicker/Implementation/DateTimePicker.cs
+++ b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/DateTimePicker/Implementation/DateTimePicker.cs
@@ -31,6 +31,28 @@ namespace Microsoft.Windows.Controls
 
         #endregion //IsOpen
 
+        #region TimeFormat
+
+        public static readonly DependencyProperty TimeFormatProperty = DependencyProperty.Register("TimeFormat", typeof(TimeFormat), typeof(DateTimePicker), new UIPropertyMetadata(TimeFormat.ShortTime));
+        public TimeFormat TimeFormat
+        {
+            get { return (TimeFormat)GetValue(TimeFormatProperty); }
+            set { SetValue(TimeFormatProperty, value); }
+        }        
+
+        #endregion //TimeFormat
+
+        #region TimeFormatString
+
+        public static readonly DependencyProperty TimeFormatStringProperty = DependencyProperty.Register("TimeFormatString", typeof(string), typeof(DateTimePicker), new UIPropertyMetadata(default(String)));
+        public string TimeFormatString
+        {
+            get { return (string)GetValue(TimeFormatStringProperty); }
+            set { SetValue(TimeFormatStringProperty, value); }
+        }
+
+        #endregion //TimeFormatString
+
         #region TimeWatermark
 
         public static readonly DependencyProperty TimeWatermarkProperty = DependencyProperty.Register("TimeWatermark", typeof(object), typeof(DateTimePicker), new UIPropertyMetadata(null));
diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/DateTimePicker/Themes/Generic.xaml b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/DateTimePicker/Themes/Generic.xaml
index 0c73fecf..d5d394a6 100644
--- a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/DateTimePicker/Themes/Generic.xaml
+++ b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/DateTimePicker/Themes/Generic.xaml
@@ -110,7 +110,8 @@
                                     <StackPanel>
                                         <Calendar x:Name="Part_Calendar" BorderThickness="0" />
                                         <local:TimePicker x:Name="Part_TimeUpDown" 
-                                                          Format="ShortTime" 
+                                                          Format="{TemplateBinding TimeFormat}"
+                                                          FormatString="{TemplateBinding TimeFormatString}"
                                                           Value="{Binding Value, RelativeSource={RelativeSource TemplatedParent}}"
                                                           Watermark="{TemplateBinding TimeWatermark}"
                                                           WatermarkTemplate="{TemplateBinding TimeWatermarkTemplate}"/>