X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f31a409829d5d410f38e64896470afcaff12635b..894d74dcc233b7f9a936767558f3e061593dd062:/src/msw/datectrl.cpp?ds=sidebyside

diff --git a/src/msw/datectrl.cpp b/src/msw/datectrl.cpp
index a25d94071a..2928307558 100644
--- a/src/msw/datectrl.cpp
+++ b/src/msw/datectrl.cpp
@@ -40,15 +40,17 @@
 #include "wx/msw/wrapcctl.h"
 #include "wx/msw/private.h"
 
-#if defined(__GNUWIN32__) && ! wxCHECK_W32API_VERSION( 2, 4 )
-typedef struct tagNMDATETIMECHANGE
-{
-    NMHDR       nmhdr;
-    DWORD       dwFlags;
-    SYSTEMTIME  st;
-} NMDATETIMECHANGE, FAR * LPNMDATETIMECHANGE;
+// apparently some versions of mingw define these macros erroneously
+#ifndef DateTime_GetSystemtime
+    #define DateTime_GetSystemtime DateTime_GetSystemTime
 #endif
 
+#ifndef DateTime_SetSystemtime
+    #define DateTime_SetSystemtime DateTime_SetSystemTime
+#endif
+
+IMPLEMENT_DYNAMIC_CLASS(wxDatePickerCtrl, wxControl)
+
 // ============================================================================
 // implementation
 // ============================================================================
@@ -162,6 +164,9 @@ WXDWORD wxDatePickerCtrl::MSWGetStyle(long style, WXDWORD *exstyle) const
 #endif // DTS_SHORTDATECENTURYFORMAT
         styleMSW |= DTS_SHORTDATEFORMAT;
 
+    if ( style & wxDP_ALLOWNONE )
+        styleMSW |= DTS_SHOWNONE;
+
     return styleMSW;
 }
 
@@ -182,24 +187,17 @@ wxSize wxDatePickerCtrl::DoGetBestSize() const
 // wxDatePickerCtrl operations
 // ----------------------------------------------------------------------------
 
-#ifndef DateTime_GetSystemtime
-    #define DateTime_GetSystemtime DateTime_GetSystemTime
-#endif
-
-#ifndef DateTime_SetSystemtime
-    #define DateTime_SetSystemtime DateTime_SetSystemTime
-#endif
-
 void wxDatePickerCtrl::SetValue(const wxDateTime& dt)
 {
-    // as we don't support DTS_SHOWNONE style so far, we don't allow setting
-    // the control to an invalid date, but this restriction may be lifted in
-    // the future
-    wxCHECK_RET( dt.IsValid(), _T("invalid date") );
+    wxCHECK_RET( dt.IsValid() || HasFlag(wxDP_ALLOWNONE),
+                    _T("this control requires a valid date") );
 
     SYSTEMTIME st;
-    wxToSystemTime(&st, dt);
-    if ( !DateTime_SetSystemtime(GetHwnd(), GDT_VALID, &st) )
+    if ( dt.IsValid() )
+        wxToSystemTime(&st, dt);
+    if ( !DateTime_SetSystemtime(GetHwnd(),
+                                 dt.IsValid() ? GDT_VALID : GDT_NONE,
+                                 &st) )
     {
         wxLogDebug(_T("DateTime_SetSystemtime() failed"));
     }