/////////////////////////////////////////////////////////////////////////////
-// Name: msw/datectrl.cpp
+// Name: src/msw/datectrl.cpp
// Purpose: wxDatePickerCtrl implementation
// Author: Vadim Zeitlin
// Modified by:
#pragma hdrstop
#endif
+#if wxUSE_DATEPICKCTRL
+
#ifndef WX_PRECOMP
+ #include "wx/app.h"
+ #include "wx/intl.h"
+ #include "wx/dcclient.h"
+ #include "wx/msw/wrapwin.h"
+ #include "wx/msw/wrapcctl.h"
+ #include "wx/msw/private.h"
#endif
#include "wx/datectrl.h"
+#include "wx/dynlib.h"
#define _WX_DEFINE_DATE_EVENTS_
#include "wx/dateevt.h"
-#ifndef __WXUNIVERSAL__
+// 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
-#include "wx/msw/wrapwin.h"
-#include "wx/msw/wrapcctl.h"
-#include "wx/msw/private.h"
+IMPLEMENT_DYNAMIC_CLASS(wxDatePickerCtrl, wxControl)
// ============================================================================
// implementation
{
const wxDateTime::Tm tm(dt.GetTm());
- st->wYear = tm.year;
- st->wMonth = tm.mon - wxDateTime::Jan + 1;
+ st->wYear = (WXWORD)tm.year;
+ st->wMonth = (WXWORD)(tm.mon - wxDateTime::Jan + 1);
st->wDay = tm.mday;
st->wDayOfWeek =
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
+ }
+
+
+ // 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);
return true;
{
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;
}
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;
+ }
+ }
- return wxSize(DEFAULT_ITEM_WIDTH, EDIT_HEIGHT_FROM_CHAR_HEIGHT(y));
+ // 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;
}
// ----------------------------------------------------------------------------
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() )
+ wxToSystemTime(&st, dt);
+ if ( !DateTime_SetSystemtime(GetHwnd(),
+ dt.IsValid() ? GDT_VALID : GDT_NONE,
+ &st) )
{
wxLogDebug(_T("DateTime_SetSystemtime() failed"));
}
switch ( hdr->code )
{
case DTN_DATETIMECHANGE:
+ {
NMDATETIMECHANGE *dtch = (NMDATETIMECHANGE *)hdr;
wxDateTime dt;
if ( dtch->dwFlags == GDT_VALID )
*result = 0;
return true;
}
+ }
}
return wxDatePickerCtrlBase::MSWOnNotify(idCtrl, lParam, result);
}
-#endif // !__WXUNIVERSAL__
+#endif // wxUSE_DATEPICKCTRL
projects / wxWidgets.git / blobdiff