#include "wx/app.h"
#include "wx/intl.h"
#include "wx/dcclient.h"
+ #include "wx/settings.h"
#include "wx/msw/private.h"
#endif
#include "wx/datectrl.h"
-#include "wx/dynlib.h"
-#define _WX_DEFINE_DATE_EVENTS_
+#include "wx/msw/private/datecontrols.h"
+
#include "wx/dateevt.h"
// apparently some versions of mingw define these macros erroneously
// 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
// ----------------------------------------------------------------------------
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 )
- {
-#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(
-#ifdef __WXWINCE__
- _T("commctrl.dll")
-#else
- _T("comctl32.dll")
-#endif
- , wxDL_VERBATIM);
-
- if ( dllComCtl32.IsLoaded() )
- {
- typedef BOOL (WINAPI *ICCEx_t)(INITCOMMONCONTROLSEX *);
- wxDYNLIB_FUNCTION( ICCEx_t, InitCommonControlsEx, dllComCtl32 );
-
- if ( pfnInitCommonControlsEx )
- {
- (*pfnInitCommonControlsEx)(&icex);
- }
-
- s_initDone = true;
- }
-#endif
- }
-
+ if ( !wxMSWDateControls::CheckInitialization() )
+ return false;
// use wxDP_SPIN if wxDP_DEFAULT (0) was given as style
if ( !(style & wxDP_DROPDOWN) )
wxSize wxDatePickerCtrl::DoGetBestSize() const
{
- wxClientDC dc(wx_const_cast(wxDatePickerCtrl *, this));
- dc.SetFont(GetFont());
+ 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
const DWORD rc = ::GetLastError();
if ( rc != ERROR_INSUFFICIENT_BUFFER )
{
- wxLogApiError(_T("GetDateFormat"), rc);
+ wxLogApiError(wxT("GetDateFormat"), rc);
// fall back on wxDateTime, what else to do?
s = wxDateTime::Today().FormatDate();
}
}
- // the control adds a lot of extra space around separators
- s.Replace(_T(","), _T(" , "));
+ // 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 += wxT("WW");
int x, y;
dc.GetTextExtent(s, &x, &y);
- wxSize best(x + 40 /* margin + arrows */, EDIT_HEIGHT_FROM_CHAR_HEIGHT(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;
}
void wxDatePickerCtrl::SetValue(const wxDateTime& dt)
{
wxCHECK_RET( dt.IsValid() || HasFlag(wxDP_ALLOWNONE),
- _T("this control requires a valid date") );
+ wxT("this control requires a valid date") );
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"));
+ wxLogDebug(wxT("DateTime_SetSystemtime() failed"));
}
- wxFromSystemTime(&m_date, st);
+ // 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__
+#if wxDEBUG_LEVEL
wxDateTime dt;
SYSTEMTIME st;
if ( DateTime_GetSystemtime(GetHwnd(), &st) == GDT_VALID )
{
- wxFromSystemTime(&dt, st);
+ dt.SetFromMSWSysDate(st);
}
wxASSERT_MSG( m_date.IsValid() == dt.IsValid() &&
(!dt.IsValid() || dt == m_date),
- _T("bug in wxDatePickerCtrl: m_date not in sync") );
-#endif // __WXDEBUG__
+ wxT("bug in wxDatePickerCtrl: m_date not in sync") );
+#endif // wxDEBUG_LEVEL
return m_date;
}
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;
}
if ( !DateTime_SetRange(GetHwnd(), flags, st) )
{
- wxLogDebug(_T("DateTime_SetRange() failed"));
+ wxLogDebug(wxT("DateTime_SetRange() failed"));
}
}
if ( dt1 )
{
if ( flags & GDTR_MIN )
- wxFromSystemTime(dt1, st[0]);
+ dt1->SetFromMSWSysDate(st[0]);
else
*dt1 = wxDefaultDateTime;
}
if ( dt2 )
{
if ( flags & GDTR_MAX )
- wxFromSystemTime(dt2, st[1]);
+ dt2->SetFromMSWSysDate(st[1]);
else
*dt2 = wxDefaultDateTime;
}
NMDATETIMECHANGE *dtch = (NMDATETIMECHANGE *)hdr;
wxDateTime dt;
if ( dtch->dwFlags == GDT_VALID )
- wxFromSystemTime(&dt, dtch->st);
+ dt.SetFromMSWSysDate(dtch->st);
// filter out duplicate DTN_DATETIMECHANGE events which the native
// control sends us when using wxDP_DROPDOWN style
- if ( !m_date.IsValid() || dt != m_date )
+ if ( (m_date.IsValid() != dt.IsValid()) ||
+ (m_date.IsValid() && dt != m_date) )
{
m_date = dt;
wxDateEvent event(this, dt, wxEVT_DATE_CHANGED);
- if ( GetEventHandler()->ProcessEvent(event) )
+ if ( HandleWindowEvent(event) )
{
*result = 0;
return true;
}
}
+ //else: both the old and new values are invalid, nothing changed
}
}
projects / wxWidgets.git / blobdiff