#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/msw/private/datecontrols.h"
-
#include "wx/dateevt.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)
// ============================================================================
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, wxEmptyString, pos, size) )
- return false;
-
- if ( dt.IsValid() || (style & wxDP_ALLOWNONE) )
- SetValue(dt);
- else
- SetValue(wxDateTime::Today());
-
- return true;
+ return MSWCreateDateTimePicker(parent, id, dt,
+ pos, size, style,
+ validator, name);
}
WXDWORD wxDatePickerCtrl::MSWGetStyle(long style, WXDWORD *exstyle) const
// TODO: handle WM_WININICHANGE
-// ----------------------------------------------------------------------------
-// wxDatePickerCtrl geometry
-// ----------------------------------------------------------------------------
-
-wxSize wxDatePickerCtrl::DoGetBestSize() const
+wxLocaleInfo wxDatePickerCtrl::MSWGetFormat() const
{
- 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);
-
- wxSize best(x + 40 /* margin + arrows */, EDIT_HEIGHT_FROM_CHAR_HEIGHT(y));
- CacheBestSize(best);
- return best;
+ return wxLOCALE_SHORT_DATE_FMT;
}
// ----------------------------------------------------------------------------
void wxDatePickerCtrl::SetValue(const wxDateTime& dt)
{
- wxCHECK_RET( dt.IsValid() || HasFlag(wxDP_ALLOWNONE),
- _T("this control requires a valid date") );
-
- SYSTEMTIME st;
if ( dt.IsValid() )
- wxMSWDateControls::ToSystemTime(&st, dt);
- if ( !DateTime_SetSystemtime(GetHwnd(),
- dt.IsValid() ? GDT_VALID : GDT_NONE,
- &st) )
{
- wxLogDebug(_T("DateTime_SetSystemtime() failed"));
+ // Don't try setting the date if it's out of range: calendar control
+ // under XP (and presumably all the other pre-Vista Windows versions)
+ // doesn't return false from DateTime_SetSystemtime() in this case but
+ // doesn't actually change the date, so we can't update our m_date
+ // unconditionally and would need to check whether it was changed
+ // before doing it. It looks simpler to just check whether it's in
+ // range here instead.
+ //
+ // If we ever drop support for XP we could rely on the return value of
+ // DateTime_SetSystemtime() but this probably won't happen in near
+ // future.
+ wxDateTime dtStart, dtEnd;
+ GetRange(&dtStart, &dtEnd);
+ if ( (dtStart.IsValid() && dt < dtStart) ||
+ (dtEnd.IsValid() && dt > dtEnd) )
+ {
+ // Fail silently, some existing code relies on SetValue() with an
+ // out of range value simply doing nothing -- so don't.
+ return;
+ }
}
+ wxDateTimePickerCtrl::SetValue(dt);
+
// 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 )
{
- wxMSWDateControls::FromSystemTime(&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 wxDateTimePickerCtrl: m_date not in sync") );
+#endif // wxDEBUG_LEVEL
- return m_date;
+ return wxDateTimePickerCtrl::GetValue();
}
void wxDatePickerCtrl::SetRange(const wxDateTime& dt1, const wxDateTime& dt2)
DWORD flags = 0;
if ( dt1.IsValid() )
{
- wxMSWDateControls::ToSystemTime(&st[0], dt1);
+ dt1.GetAsMSWSysTime(st + 0);
flags |= GDTR_MIN;
}
if ( dt2.IsValid() )
{
- wxMSWDateControls::ToSystemTime(&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 )
- wxMSWDateControls::FromSystemTime(dt1, st[0]);
+ dt1->SetFromMSWSysDate(st[0]);
else
*dt1 = wxDefaultDateTime;
}
if ( dt2 )
{
if ( flags & GDTR_MAX )
- wxMSWDateControls::FromSystemTime(dt2, st[1]);
+ dt2->SetFromMSWSysDate(st[1]);
else
*dt2 = wxDefaultDateTime;
}
// wxDatePickerCtrl events
// ----------------------------------------------------------------------------
-bool
-wxDatePickerCtrl::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result)
+bool wxDatePickerCtrl::MSWOnDateTimeChange(const NMDATETIMECHANGE& dtch)
{
- NMHDR* hdr = (NMHDR *)lParam;
- switch ( hdr->code )
- {
- case DTN_DATETIMECHANGE:
- {
- NMDATETIMECHANGE *dtch = (NMDATETIMECHANGE *)hdr;
- wxDateTime dt;
- if ( dtch->dwFlags == GDT_VALID )
- wxMSWDateControls::FromSystemTime(&dt, dtch->st);
-
- // 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) )
- {
- 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
- }
- }
+ wxDateTime dt;
+ if ( dtch.dwFlags == GDT_VALID )
+ dt.SetFromMSWSysDate(dtch.st);
- return wxDatePickerCtrlBase::MSWOnNotify(idCtrl, lParam, result);
+ // 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) )
+ return false;
+
+ m_date = dt;
+ wxDateEvent event(this, dt, wxEVT_DATE_CHANGED);
+ return HandleWindowEvent(event);
}
#endif // wxUSE_DATEPICKCTRL
projects / wxWidgets.git / blobdiff