more wxSocket code wx-ification: use wxDynamicLibrary instead of raw Win32 calls

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

diff --git a/src/msw/datectrl.cpp b/src/msw/datectrl.cpp
index c0d3396ddc9da09e6836cbed84cc5f7675497c17..1009211b4d9dc777eca784dc1838d88b11011dbc 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:
 // Purpose:     wxDatePickerCtrl implementation
 // Author:      Vadim Zeitlin
 // Modified by:


@@ -23,22 +23,23 @@
     #pragma hdrstop
 #endif
 
     #pragma hdrstop
 #endif
 

+#if wxUSE_DATEPICKCTRL
+

 #ifndef WX_PRECOMP
 #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/settings.h"
+    #include "wx/msw/private.h"

 #endif
 
 #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"
+#include "wx/msw/private/datecontrols.h"

 
 

-#include "wx/msw/wrapwin.h"
-#include "wx/msw/wrapcctl.h"
-#include "wx/msw/private.h"
+#include "wx/dateevt.h"

 
 // apparently some versions of mingw define these macros erroneously
 #ifndef DateTime_GetSystemtime
 
 // apparently some versions of mingw define these macros erroneously
 #ifndef DateTime_GetSystemtime


@@ -55,33 +56,6 @@ IMPLEMENT_DYNAMIC_CLASS(wxDatePickerCtrl, wxControl)
 // implementation
 // ============================================================================
 
 // implementation
 // ============================================================================
 

-// ----------------------------------------------------------------------------
-// helpers for wxDateTime <-> SYSTEMTIME conversion
-// ----------------------------------------------------------------------------
-
-static inline void wxFromSystemTime(wxDateTime *dt, const SYSTEMTIME& st)
-{
-    dt->Set(st.wDay,
-            wx_static_cast(wxDateTime::Month, wxDateTime::Jan + st.wMonth - 1),
-            st.wYear,
-            0, 0, 0);
-}
-
-static inline void wxToSystemTime(SYSTEMTIME *st, const wxDateTime& dt)
-{
-    const wxDateTime::Tm tm(dt.GetTm());
-
-    st->wYear = (WXWORD)tm.year;
-    st->wMonth = (WXWORD)(tm.mon - wxDateTime::Jan + 1);
-    st->wDay = tm.mday;
-
-    st->wDayOfWeek =
-    st->wHour =
-    st->wMinute =
-    st->wSecond =
-    st->wMilliseconds = 0;
-}
-

 // ----------------------------------------------------------------------------
 // wxDatePickerCtrl creation
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // wxDatePickerCtrl creation
 // ----------------------------------------------------------------------------


@@ -96,38 +70,8 @@ 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 explicitly
-    static bool s_initDone = false; // MT-ok: used from GUI thread only
-    if ( !s_initDone )
-    {
-        if ( wxApp::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;
-    }
-
+    if ( !wxMSWDateControls::CheckInitialization() )
+        return false;

 
     // use wxDP_SPIN if wxDP_DEFAULT (0) was given as style
     if ( !(style & wxDP_DROPDOWN) )
 
     // use wxDP_SPIN if wxDP_DEFAULT (0) was given as style
     if ( !(style & wxDP_DROPDOWN) )


@@ -143,6 +87,8 @@ wxDatePickerCtrl::Create(wxWindow *parent,
 
     if ( dt.IsValid() || (style & wxDP_ALLOWNONE) )
         SetValue(dt);
 
     if ( dt.IsValid() || (style & wxDP_ALLOWNONE) )
         SetValue(dt);

+    else
+        SetValue(wxDateTime::Today());

 
     return true;
 }
 
     return true;
 }


@@ -178,9 +124,55 @@ WXDWORD wxDatePickerCtrl::MSWGetStyle(long style, WXDWORD *exstyle) const
 
 wxSize wxDatePickerCtrl::DoGetBestSize() const
 {
 
 wxSize wxDatePickerCtrl::DoGetBestSize() const
 {

-    const int y = GetCharHeight();
+    wxClientDC dc(const_cast<wxDatePickerCtrl *>(this));
+
+    // 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);

 
 

-    wxSize best(DEFAULT_ITEM_WIDTH, EDIT_HEIGHT_FROM_CHAR_HEIGHT(y));
+            // fall back on wxDateTime, what else to do?
+            s = wxDateTime::Today().FormatDate();
+            break;
+        }
+    }
+
+    // the best size for the control is bigger than just the string
+    // representation of todays date because the control must accommodate any
+    // date and while the widths of all digits are usually about the same, the
+    // width of the month string varies a lot, so try to account for it
+    s += _T("WW");
+
+    int x, y;
+    dc.GetTextExtent(s, &x, &y);
+
+    // account for the drop-down arrow or spin arrows
+    x += wxSystemSettings::GetMetric(wxSYS_HSCROLL_ARROW_X);
+
+    // and for the checkbox if we have it
+    if ( HasFlag(wxDP_ALLOWNONE) )
+        x += 3*GetCharWidth();
+
+    wxSize best(x, EDIT_HEIGHT_FROM_CHAR_HEIGHT(y));

     CacheBestSize(best);
     return best;
 }
     CacheBestSize(best);
     return best;
 }


@@ -196,25 +188,37 @@ void wxDatePickerCtrl::SetValue(const wxDateTime& dt)
 
     SYSTEMTIME st;
     if ( dt.IsValid() )
 
     SYSTEMTIME st;
     if ( dt.IsValid() )

-        wxToSystemTime(&st, dt);
+        dt.GetAsMSWSysTime(&st);

     if ( !DateTime_SetSystemtime(GetHwnd(),
                                  dt.IsValid() ? GDT_VALID : GDT_NONE,
                                  &st) )
     {
         wxLogDebug(_T("DateTime_SetSystemtime() failed"));
     }
     if ( !DateTime_SetSystemtime(GetHwnd(),
                                  dt.IsValid() ? GDT_VALID : GDT_NONE,
                                  &st) )
     {
         wxLogDebug(_T("DateTime_SetSystemtime() failed"));
     }

+
+    // we need to keep only the date part, times don't make sense for this
+    // control (in particular, comparisons with other dates would fail)
+    m_date = dt;
+    if ( m_date.IsValid() )
+        m_date.ResetTime();

 }
 
 wxDateTime wxDatePickerCtrl::GetValue() const
 {
 }
 
 wxDateTime wxDatePickerCtrl::GetValue() const
 {

+#ifdef __WXDEBUG__

     wxDateTime dt;
     SYSTEMTIME st;
     if ( DateTime_GetSystemtime(GetHwnd(), &st) == GDT_VALID )
     {
     wxDateTime dt;
     SYSTEMTIME st;
     if ( DateTime_GetSystemtime(GetHwnd(), &st) == GDT_VALID )
     {

-        wxFromSystemTime(&dt, st);
+        dt.SetFromMSWSysTime(st);

     }
 
     }
 

-    return dt;
+    wxASSERT_MSG( m_date.IsValid() == dt.IsValid() &&
+                    (!dt.IsValid() || dt == m_date),
+                  _T("bug in wxDatePickerCtrl: m_date not in sync") );
+#endif // __WXDEBUG__
+
+    return m_date;

 }
 
 void wxDatePickerCtrl::SetRange(const wxDateTime& dt1, const wxDateTime& dt2)
 }
 
 void wxDatePickerCtrl::SetRange(const wxDateTime& dt1, const wxDateTime& dt2)


@@ -224,13 +228,13 @@ void wxDatePickerCtrl::SetRange(const wxDateTime& dt1, const wxDateTime& dt2)
     DWORD flags = 0;
     if ( dt1.IsValid() )
     {
     DWORD flags = 0;
     if ( dt1.IsValid() )
     {

-        wxToSystemTime(&st[0], dt1);
+        dt1.GetAsMSWSysTime(st + 0);

         flags |= GDTR_MIN;
     }
 
     if ( dt2.IsValid() )
     {
         flags |= GDTR_MIN;
     }
 
     if ( dt2.IsValid() )
     {

-        wxToSystemTime(&st[1], dt2);
+        dt2.GetAsMSWSysTime(st + 1);

         flags |= GDTR_MAX;
     }
 
         flags |= GDTR_MAX;
     }
 


@@ -248,7 +252,7 @@ bool wxDatePickerCtrl::GetRange(wxDateTime *dt1, wxDateTime *dt2) const
     if ( dt1 )
     {
         if ( flags & GDTR_MIN )
     if ( dt1 )
     {
         if ( flags & GDTR_MIN )

-            wxFromSystemTime(dt1, st[0]);
+            dt1->SetFromMSWSysTime(st[0]);

         else
             *dt1 = wxDefaultDateTime;
     }
         else
             *dt1 = wxDefaultDateTime;
     }


@@ -256,7 +260,7 @@ bool wxDatePickerCtrl::GetRange(wxDateTime *dt1, wxDateTime *dt2) const
     if ( dt2 )
     {
         if ( flags & GDTR_MAX )
     if ( dt2 )
     {
         if ( flags & GDTR_MAX )

-            wxFromSystemTime(dt2, st[1]);
+            dt2->SetFromMSWSysTime(st[1]);

         else
             *dt2 = wxDefaultDateTime;
     }
         else
             *dt2 = wxDefaultDateTime;
     }


@@ -275,21 +279,30 @@ wxDatePickerCtrl::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result)
     switch ( hdr->code )
     {
         case DTN_DATETIMECHANGE:
     switch ( hdr->code )
     {
         case DTN_DATETIMECHANGE:

+        {

             NMDATETIMECHANGE *dtch = (NMDATETIMECHANGE *)hdr;
             wxDateTime dt;
             if ( dtch->dwFlags == GDT_VALID )
             NMDATETIMECHANGE *dtch = (NMDATETIMECHANGE *)hdr;
             wxDateTime dt;
             if ( dtch->dwFlags == GDT_VALID )

-                wxFromSystemTime(&dt, dtch->st);
+                dt.SetFromMSWSysTime(dtch->st);

 
 

-            wxDateEvent event(this, dt, wxEVT_DATE_CHANGED);
-            if ( GetEventHandler()->ProcessEvent(event) )
+            // filter out duplicate DTN_DATETIMECHANGE events which the native
+            // control sends us when using wxDP_DROPDOWN style
+            if ( (m_date.IsValid() != dt.IsValid()) ||
+                    (m_date.IsValid() && dt != m_date) )

             {
             {

-                *result = 0;
-                return true;
+                m_date = dt;
+                wxDateEvent event(this, dt, wxEVT_DATE_CHANGED);
+                if ( HandleWindowEvent(event) )
+                {
+                    *result = 0;
+                    return true;
+                }

             }
             }

+            //else: both the old and new values are invalid, nothing changed
+        }

     }
 
     return wxDatePickerCtrlBase::MSWOnNotify(idCtrl, lParam, result);
 }
 
 #endif // wxUSE_DATEPICKCTRL
     }
 
     return wxDatePickerCtrlBase::MSWOnNotify(idCtrl, lParam, result);
 }
 
 #endif // wxUSE_DATEPICKCTRL

-