added InitCommandEventWithItems() and call it from wxChoice and wxComboBox code to...

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

diff --git a/src/msw/datectrl.cpp b/src/msw/datectrl.cpp
index 75cada840f430cd2210e6a0f5c5fdc190ff56c30..8602e3d966f77b1233b1e5a1cdfb7ff08e102527 100644 (file)
--- 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,32 +23,34 @@
     #pragma hdrstop
 #endif
 
+#if wxUSE_DATEPICKCTRL
+
 #ifndef WX_PRECOMP
+    #include "wx/app.h"
+    #include "wx/intl.h"
+    #include "wx/dcclient.h"
+    #include "wx/msw/wrapwin.h"
+    #include "wx/msw/wrapcctl.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
+#endif
 
-#ifdef __GNUWIN32__
-typedef struct tagNMDATETIMECHANGE
-{
-    NMHDR       nmhdr;
-    DWORD       dwFlags;
-    SYSTEMTIME  st;
-} NMDATETIMECHANGE, FAR * LPNMDATETIMECHANGE;
+#ifndef DateTime_SetSystemtime
+    #define DateTime_SetSystemtime DateTime_SetSystemTime
 #endif
 
+IMPLEMENT_DYNAMIC_CLASS(wxDatePickerCtrl, wxControl)
+
 // ============================================================================
 // implementation
 // ============================================================================
@@ -98,17 +100,18 @@ 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 )
     {
-        if ( wxTheApp->GetComCtl32Version() < 470 )
+        if ( wxApp::GetComCtl32Version() < 470 )
         {
             wxLogError(_("This system doesn't support date picker control, please upgrade your version of comctl32.dll"));
 
             return false;
         }
 
+#if wxUSE_DYNLIB_CLASS
         INITCOMMONCONTROLSEX icex;
         icex.dwSize = sizeof(icex);
         icex.dwICC = ICC_DATE_CLASSES;
@@ -124,6 +127,7 @@ wxDatePickerCtrl::Create(wxWindow *parent,
         }
 
         s_initDone = true;
+#endif
     }
 
 
@@ -136,10 +140,10 @@ 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() )
+    if ( dt.IsValid() || (style & wxDP_ALLOWNONE) )
         SetValue(dt);
 
     return true;
@@ -151,7 +155,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
 
@@ -162,6 +166,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,33 +180,65 @@ 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());
+
+    // 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;
+        }
 
-    return wxSize(DEFAULT_ITEM_WIDTH, EDIT_HEIGHT_FROM_CHAR_HEIGHT(y));
+        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;
 }
 
 // ----------------------------------------------------------------------------
 // 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"));
     }
@@ -292,4 +331,3 @@ wxDatePickerCtrl::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result)
 }
 
 #endif // wxUSE_DATEPICKCTRL
-