X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/3200f37d25e1e0fae6c054e773701a73318657fd..0bbe61b8c18a1795189f0cf73cc61c14a0fb846d:/src/msw/datectrl.cpp diff --git a/src/msw/datectrl.cpp b/src/msw/datectrl.cpp index 683c359077..3a694a227e 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,32 +23,23 @@ #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 -#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" - -#if defined(__GNUWIN32__) && !wxCHECK_W32API_VERSION( 2, 4 ) -typedef struct tagNMDATETIMECHANGE -{ - NMHDR nmhdr; - DWORD dwFlags; - SYSTEMTIME st; -} NMDATETIMECHANGE; -#endif // old gcc headers - // apparently some versions of mingw define these macros erroneously #ifndef DateTime_GetSystemtime #define DateTime_GetSystemtime DateTime_GetSystemTime @@ -58,6 +49,8 @@ typedef struct tagNMDATETIMECHANGE #define DateTime_SetSystemtime DateTime_SetSystemTime #endif +IMPLEMENT_DYNAMIC_CLASS(wxDatePickerCtrl, wxControl) + // ============================================================================ // implementation // ============================================================================ @@ -107,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 ) { - if ( wxTheApp->GetComCtl32Version() < 470 ) +#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 } @@ -148,8 +154,10 @@ wxDatePickerCtrl::Create(wxWindow *parent, 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; } @@ -160,7 +168,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 @@ -185,9 +193,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()); + + // 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); - return wxSize(DEFAULT_ITEM_WIDTH, EDIT_HEIGHT_FROM_CHAR_HEIGHT(y)); + wxSize best(x + 40 /* margin + arrows */, EDIT_HEIGHT_FROM_CHAR_HEIGHT(y)); + CacheBestSize(best); + return best; } // ---------------------------------------------------------------------------- @@ -208,10 +255,19 @@ void wxDatePickerCtrl::SetValue(const wxDateTime& dt) { 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(); } +#include + wxDateTime wxDatePickerCtrl::GetValue() const { +#ifdef __WXDEBUG__ wxDateTime dt; SYSTEMTIME st; if ( DateTime_GetSystemtime(GetHwnd(), &st) == GDT_VALID ) @@ -219,7 +275,12 @@ wxDateTime wxDatePickerCtrl::GetValue() const wxFromSystemTime(&dt, 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) @@ -280,21 +341,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); - 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 -