X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/31582e4e11d504a28461d62b05411202d3a906d0..3f4a2351e4c677c88c18ea812b609477adee7380:/src/msw/datectrl.cpp?ds=sidebyside

diff --git a/src/msw/datectrl.cpp b/src/msw/datectrl.cpp
index 7f00c820f5..ebe60e9318 100644
--- a/src/msw/datectrl.cpp
+++ b/src/msw/datectrl.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        msw/datectrl.cpp
+// Name:        src/msw/datectrl.cpp
 // Purpose:     wxDatePickerCtrl implementation
 // Author:      Vadim Zeitlin
 // Modified by:
@@ -23,23 +23,23 @@
     #pragma hdrstop
 #endif
 
+#if wxUSE_DATEPICKCTRL
+
 #ifndef WX_PRECOMP
+    #include "wx/msw/wrapwin.h"
+    #include "wx/msw/wrapcctl.h" // include <commctrl.h> "properly"
+    #include "wx/app.h"
+    #include "wx/intl.h"
+    #include "wx/dcclient.h"
+    #include "wx/msw/private.h"
 #endif
 
-#if wxUSE_DATEPICKCTRL
-
 #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"
 
-#include "wx/msw/wrapwin.h"
-#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
@@ -100,32 +100,45 @@ wxDatePickerCtrl::Create(wxWindow *parent,
     // 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
+    // it explicitly
     static bool s_initDone = false; // MT-ok: used from GUI thread only
     if ( !s_initDone )
     {
+#ifndef __WXWINCE__
         if ( wxApp::GetComCtl32Version() < 470 )
         {
             wxLogError(_("This system doesn't support date picker control, please upgrade your version of comctl32.dll"));
 
             return false;
         }
+#endif
 
+#if wxUSE_DYNLIB_CLASS
         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 );
+        wxDynamicLibrary dllComCtl32(
+#ifdef __WXWINCE__
+            _T("commctrl.dll")
+#else
+            _T("comctl32.dll")
+#endif
+            , wxDL_VERBATIM);
 
-        if ( pfnInitCommonControlsEx )
+        if ( dllComCtl32.IsLoaded() )
         {
-            (*pfnInitCommonControlsEx)(&icex);
-        }
+            typedef BOOL (WINAPI *ICCEx_t)(INITCOMMONCONTROLSEX *);
+            wxDYNLIB_FUNCTION( ICCEx_t, InitCommonControlsEx, dllComCtl32 );
 
-        s_initDone = true;
+            if ( pfnInitCommonControlsEx )
+            {
+                (*pfnInitCommonControlsEx)(&icex);
+            }
+
+            s_initDone = true;
+        }
+#endif
     }
 
 
@@ -178,9 +191,46 @@ WXDWORD wxDatePickerCtrl::MSWGetStyle(long style, WXDWORD *exstyle) const
 
 wxSize wxDatePickerCtrl::DoGetBestSize() const
 {
-    const int y = GetCharHeight();
+    wxClientDC dc(wx_const_cast(wxDatePickerCtrl *, this));
+    dc.SetFont(GetFont());
 
-    wxSize best(DEFAULT_ITEM_WIDTH, EDIT_HEIGHT_FROM_CHAR_HEIGHT(y));
+    // we can't use FormatDate() here as the CRT doesn't always use the same
+    // format as the date picker control
+    wxString s;
+    for ( int len = 100; ; len *= 2 )
+    {
+        if ( ::GetDateFormat
+               (
+                    LOCALE_USER_DEFAULT,    // the control should use the same
+                    DATE_SHORTDATE,         // the format used by the control
+                    NULL,                   // use current date (we don't care)
+                    NULL,                   // no custom format
+                    wxStringBuffer(s, len), // output buffer
+                    len                     // and its length
+               ) )
+        {
+            // success
+            break;
+        }
+
+        const DWORD rc = ::GetLastError();
+        if ( rc != ERROR_INSUFFICIENT_BUFFER )
+        {
+            wxLogApiError(_T("GetDateFormat"), rc);
+
+            // fall back on wxDateTime, what else to do?
+            s = wxDateTime::Today().FormatDate();
+            break;
+        }
+    }
+
+    // the control adds a lot of extra space around separators
+    s.Replace(_T(","), _T("    ,    "));
+
+    int x, y;
+    dc.GetTextExtent(s, &x, &y);
+
+    wxSize best(x + 40 /* margin + arrows */, EDIT_HEIGHT_FROM_CHAR_HEIGHT(y));
     CacheBestSize(best);
     return best;
 }
@@ -275,6 +325,7 @@ wxDatePickerCtrl::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result)
     switch ( hdr->code )
     {
         case DTN_DATETIMECHANGE:
+        {
             NMDATETIMECHANGE *dtch = (NMDATETIMECHANGE *)hdr;
             wxDateTime dt;
             if ( dtch->dwFlags == GDT_VALID )
@@ -286,10 +337,10 @@ wxDatePickerCtrl::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result)
                 *result = 0;
                 return true;
             }
+        }
     }
 
     return wxDatePickerCtrlBase::MSWOnNotify(idCtrl, lParam, result);
 }
 
 #endif // wxUSE_DATEPICKCTRL
-