Applied patch [ 1167891 ] wxNotebook display problem on MSW w/ XP theming

[wxWidgets.git] / src / msw / datectrl.cpp

diff --git a/src/msw/datectrl.cpp b/src/msw/datectrl.cpp
index ea53e2236566b3d1dbb4f519e1b20341a58bd1da..2660838d00064c8a88c42b80a1de9f93b1e922ed 100644 (file)
--- a/src/msw/datectrl.cpp
+++ b/src/msw/datectrl.cpp
@@ -40,6 +40,17 @@
 #include "wx/msw/wrapcctl.h"
 #include "wx/msw/private.h"
 
+// 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
 // ============================================================================
@@ -60,8 +71,8 @@ static inline void wxToSystemTime(SYSTEMTIME *st, const wxDateTime& dt)
 {
     const wxDateTime::Tm tm(dt.GetTm());
 
-    st->wYear = tm.year;
-    st->wMonth = tm.mon - wxDateTime::Jan + 1;
+    st->wYear = (WXWORD)tm.year;
+    st->wMonth = (WXWORD)(tm.mon - wxDateTime::Jan + 1);
     st->wDay = tm.mday;
 
     st->wDayOfWeek =
@@ -93,7 +104,7 @@ wxDatePickerCtrl::Create(wxWindow *parent,
     static bool s_initDone = false; // MT-ok: used from GUI thread only
     if ( !s_initDone )
     {
-        if ( wxTheApp->GetComCtl32Version() < 470 )
+        if ( wxApp::GetComCtl32Version() < 470 )
         {
             wxLogError(_("This system doesn't support date picker control, please upgrade your version of comctl32.dll"));
 
@@ -127,7 +138,7 @@ wxDatePickerCtrl::Create(wxWindow *parent,
         return false;
 
     // create the native control
-    if ( !MSWCreateControl(DATETIMEPICK_CLASS, _T(""), pos, size) )
+    if ( !MSWCreateControl(DATETIMEPICK_CLASS, wxEmptyString, pos, size) )
         return false;
 
     if ( dt.IsValid() )
@@ -142,7 +153,7 @@ WXDWORD wxDatePickerCtrl::MSWGetStyle(long style, WXDWORD *exstyle) const
 
     // although MSDN doesn't mention it, DTS_UPDOWN doesn't work with
     // comctl32.dll 4.72
-    if ( wxTheApp->GetComCtl32Version() > 472 && (style & wxDP_SPIN) )
+    if ( wxApp::GetComCtl32Version() > 472 && (style & wxDP_SPIN) )
         styleMSW |= DTS_UPDOWN;
     //else: drop down by default
 
@@ -153,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;
 }
 
@@ -173,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"));
     }