X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/5bb52a5ff0777462608cd47eeca5cc80e43b261b..e3276230de335908f70232b2a5ede43665bd8d9d:/src/msw/datectrl.cpp diff --git a/src/msw/datectrl.cpp b/src/msw/datectrl.cpp index 3f97a7f7bc..692f0462d4 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,49 +23,38 @@ #pragma hdrstop #endif +#if wxUSE_DATEPICKCTRL + #ifndef WX_PRECOMP + #include "wx/msw/wrapwin.h" + #include "wx/msw/wrapcctl.h" // include "properly" + #include "wx/app.h" + #include "wx/intl.h" + #include "wx/dcclient.h" + #include "wx/msw/private.h" #endif #include "wx/datectrl.h" -#define _WX_DEFINE_DATE_EVENTS_ +#include "wx/msw/private/datecontrols.h" + #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 + +#ifndef DateTime_SetSystemtime + #define DateTime_SetSystemtime DateTime_SetSystemTime +#endif + +IMPLEMENT_DYNAMIC_CLASS(wxDatePickerCtrl, wxControl) // ============================================================================ // 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 = tm.year; - st->wMonth = tm.mon - wxDateTime::Jan + 1; - st->wDay = tm.mday; - - st->wDayOfWeek = - st->wHour = - st->wMinute = - st->wSecond = - st->wMilliseconds = 0; -} - // ---------------------------------------------------------------------------- // wxDatePickerCtrl creation // ---------------------------------------------------------------------------- @@ -80,16 +69,25 @@ wxDatePickerCtrl::Create(wxWindow *parent, const wxValidator& validator, const wxString& name) { + if ( !wxMSWDateControls::CheckInitialization() ) + return false; + + // 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; // 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); + else + SetValue(wxDateTime::Today()); return true; } @@ -98,9 +96,21 @@ WXDWORD wxDatePickerCtrl::MSWGetStyle(long style, WXDWORD *exstyle) const { 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 ( wxApp::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; + + if ( style & wxDP_ALLOWNONE ) + styleMSW |= DTS_SHOWNONE; return styleMSW; } @@ -113,9 +123,48 @@ 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()); - return wxSize(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; } // ---------------------------------------------------------------------------- @@ -124,29 +173,42 @@ wxSize wxDatePickerCtrl::DoGetBestSize() const 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() ) + dt.GetAsMSWSysTime(&st); + 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 { +#ifdef __WXDEBUG__ 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) @@ -156,13 +218,13 @@ void wxDatePickerCtrl::SetRange(const wxDateTime& dt1, const wxDateTime& dt2) DWORD flags = 0; if ( dt1.IsValid() ) { - wxToSystemTime(&st[0], dt1); + dt1.GetAsMSWSysTime(st + 0); flags |= GDTR_MIN; } if ( dt2.IsValid() ) { - wxToSystemTime(&st[1], dt2); + dt2.GetAsMSWSysTime(st + 1); flags |= GDTR_MAX; } @@ -180,7 +242,7 @@ bool wxDatePickerCtrl::GetRange(wxDateTime *dt1, wxDateTime *dt2) const if ( dt1 ) { if ( flags & GDTR_MIN ) - wxFromSystemTime(dt1, st[0]); + dt1->SetFromMSWSysTime(st[0]); else *dt1 = wxDefaultDateTime; } @@ -188,7 +250,7 @@ bool wxDatePickerCtrl::GetRange(wxDateTime *dt1, wxDateTime *dt2) const if ( dt2 ) { if ( flags & GDTR_MAX ) - wxFromSystemTime(dt2, st[1]); + dt2->SetFromMSWSysTime(st[1]); else *dt2 = wxDefaultDateTime; } @@ -207,19 +269,30 @@ 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 ) - 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