X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/fceac6bbfe23180d460ef62dac83c591d9e0f941..b5ec0c78b521cfa0f276e4d5d830f35b4fa26e91:/src/osx/datetimectrl_osx.cpp

diff --git a/src/osx/datetimectrl_osx.cpp b/src/osx/datetimectrl_osx.cpp
index 45a49659ff..952ac3e05d 100644
--- a/src/osx/datetimectrl_osx.cpp
+++ b/src/osx/datetimectrl_osx.cpp
@@ -3,7 +3,7 @@
 // Purpose:     Implementation of wxDateTimePickerCtrl for OS X.
 // Author:      Vadim Zeitlin
 // Created:     2011-12-18
-// RCS-ID:      $Id: wxhead.cpp,v 1.11 2010-04-22 12:44:51 zeitlin Exp $
+// RCS-ID:      $Id$
 // Copyright:   (c) 2011 Vadim Zeitlin <vadim@wxwidgets.org>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
@@ -28,6 +28,7 @@
 #ifndef WX_PRECOMP
 #endif // WX_PRECOMP
 
+#include "wx/datectrl.h"
 #include "wx/datetimectrl.h"
 
 #include "wx/osx/core/private/datetimectrl.h"
@@ -43,7 +44,19 @@ wxDateTimeWidgetImpl* wxDateTimePickerCtrl::GetDateTimePeer() const
 
 void wxDateTimePickerCtrl::SetValue(const wxDateTime& dt)
 {
-    GetDateTimePeer()->SetDateTime(dt);
+    if ( dt.IsValid() )
+    {
+        GetDateTimePeer()->SetDateTime(dt);
+    }
+    else // invalid date
+    {
+        wxASSERT_MSG( HasFlag(wxDP_ALLOWNONE),
+                     wxT("this control must have a valid date") );
+
+        // TODO setting to an invalid date is not natively supported
+        // so we must implement a UI for that ourselves
+        GetDateTimePeer()->SetDateTime(dt);
+    }
 }
 
 wxDateTime wxDateTimePickerCtrl::GetValue() const