Fixed a long-standing issue where wxSlider controls with a hardcoded size would mispl...

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

diff --git a/src/msw/datectrl.cpp b/src/msw/datectrl.cpp
index 3f97a7f7bcac50cf67bc4dd3bc45cb073b4d3a76..f487d33eeb80e4dab9d4f2971a55916c651a8b5e 100644 (file)
--- a/src/msw/datectrl.cpp
+++ b/src/msw/datectrl.cpp
@@ -26,7 +26,12 @@
 #ifndef WX_PRECOMP
 #endif
 
 #ifndef WX_PRECOMP
 #endif
 

+#if wxUSE_DATEPICKCTRL
+

 #include "wx/datectrl.h"
 #include "wx/datectrl.h"

+#include "wx/app.h"
+#include "wx/intl.h"
+#include "wx/dynlib.h"

 
 #define _WX_DEFINE_DATE_EVENTS_
 #include "wx/dateevt.h"
 
 #define _WX_DEFINE_DATE_EVENTS_
 #include "wx/dateevt.h"


@@ -55,8 +60,8 @@ static inline void wxToSystemTime(SYSTEMTIME *st, const wxDateTime& dt)
 {
     const wxDateTime::Tm tm(dt.GetTm());
 
 {
     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 =
     st->wDay = tm.mday;
 
     st->wDayOfWeek =


@@ -80,6 +85,43 @@ wxDatePickerCtrl::Create(wxWindow *parent,
                          const wxValidator& validator,
                          const wxString& name)
 {
                          const wxValidator& validator,
                          const wxString& name)
 {

+    // although we already call InitCommonControls() in app.cpp which is
+    // supposed to initialize all common controls, in comctl32.dll 4.72 (and
+    // presumably earlier versions 4.70 and 4.71, date time picker not being
+    // supported in < 4.70 anyhow) it does not do it and we have to initialize
+    // it explicitely
+    static bool s_initDone = false; // MT-ok: used from GUI thread only
+    if ( !s_initDone )
+    {
+        if ( wxTheApp->GetComCtl32Version() < 470 )
+        {
+            wxLogError(_("This system doesn't support date picker control, please upgrade your version of comctl32.dll"));
+
+            return false;
+        }
+
+        INITCOMMONCONTROLSEX icex;
+        icex.dwSize = sizeof(icex);
+        icex.dwICC = ICC_DATE_CLASSES;
+
+        wxDynamicLibrary dllComCtl32(_T("comctl32.dll"), wxDL_VERBATIM);
+
+        typedef BOOL (WINAPI *ICCEx_t)(INITCOMMONCONTROLSEX *);
+        wxDYNLIB_FUNCTION( ICCEx_t, InitCommonControlsEx, dllComCtl32 );
+
+        if ( pfnInitCommonControlsEx )
+        {
+            (*pfnInitCommonControlsEx)(&icex);
+        }
+
+        s_initDone = true;
+    }
+
+
+    // use wxDP_SPIN if wxDP_DEFAULT (0) was given as style
+    if ( !(style & wxDP_DROPDOWN) )
+        style |= wxDP_SPIN;
+

     // initialize the base class
     if ( !CreateControl(parent, id, pos, size, style, validator, name) )
         return false;
     // initialize the base class
     if ( !CreateControl(parent, id, pos, size, style, validator, name) )
         return false;


@@ -98,9 +140,18 @@ WXDWORD wxDatePickerCtrl::MSWGetStyle(long style, WXDWORD *exstyle) const
 {
     WXDWORD styleMSW = wxDatePickerCtrlBase::MSWGetStyle(style, exstyle);
 
 {
     WXDWORD styleMSW = wxDatePickerCtrlBase::MSWGetStyle(style, exstyle);
 

-    // for now this is unconditional, but we should support drop down control
-    // style as well later
-    styleMSW |= DTS_UPDOWN | DTS_SHORTDATEFORMAT;
+    // although MSDN doesn't mention it, DTS_UPDOWN doesn't work with
+    // comctl32.dll 4.72
+    if ( wxTheApp->GetComCtl32Version() > 472 && (style & wxDP_SPIN) )
+        styleMSW |= DTS_UPDOWN;
+    //else: drop down by default
+
+#ifdef DTS_SHORTDATECENTURYFORMAT
+    if ( style & wxDP_SHOWCENTURY )
+        styleMSW |= DTS_SHORTDATECENTURYFORMAT;
+    else
+#endif // DTS_SHORTDATECENTURYFORMAT
+        styleMSW |= DTS_SHORTDATEFORMAT;

 
     return styleMSW;
 }
 
     return styleMSW;
 }


@@ -122,6 +173,14 @@ wxSize wxDatePickerCtrl::DoGetBestSize() const
 // wxDatePickerCtrl operations
 // ----------------------------------------------------------------------------
 
 // 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
 void wxDatePickerCtrl::SetValue(const wxDateTime& dt)
 {
     // as we don't support DTS_SHOWNONE style so far, we don't allow setting


@@ -223,3 +282,5 @@ wxDatePickerCtrl::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result)
     return wxDatePickerCtrlBase::MSWOnNotify(idCtrl, lParam, result);
 }
 
     return wxDatePickerCtrlBase::MSWOnNotify(idCtrl, lParam, result);
 }
 

+#endif // wxUSE_DATEPICKCTRL
+