#ifndef WX_PRECOMP
#include "wx/dialog.h"
#include "wx/dcmemory.h"
+ #include "wx/intl.h"
#include "wx/panel.h"
#include "wx/textctrl.h"
#include "wx/valtext.h"
#endif
+#include "wx/calctrl.h"
+#include "wx/combo.h"
+
#include "wx/datectrl.h"
#include "wx/generic/datectrl.h"
-
// ----------------------------------------------------------------------------
// constants
// ----------------------------------------------------------------------------
{
if ( !wxCalendarCtrl::Create(parent, wxID_ANY, wxDefaultDateTime,
wxPoint(0, 0), wxDefaultSize,
- wxCAL_SEQUENTIAL_MONTH_SELECTION
+ wxCAL_SEQUENTIAL_MONTH_SELECTION
| wxCAL_SHOW_HOLIDAYS | wxBORDER_SUNKEN) )
return false;
- SetFormat("%x");
+ SetFormat(GetLocaleDateFormat());
m_useSize = wxCalendarCtrl::GetBestSize();
else // invalid date
{
wxASSERT_MSG( HasDPFlag(wxDP_ALLOWNONE),
- _T("this control must have a valid date") );
+ wxT("this control must have a valid date") );
m_combo->SetText(wxEmptyString);
}
}
+ bool IsTextEmpty() const
+ {
+ return m_combo->GetTextCtrl()->IsEmpty();
+ }
+
bool ParseDateTime(const wxString& s, wxDateTime* pDt)
{
wxASSERT(pDt);
if ( !dt.IsValid() && HasDPFlag(wxDP_ALLOWNONE) )
return;
-
+
// notify that we had to change the date after validation
if ( (dt.IsValid() && (!dtOld.IsValid() || dt != dtOld)) ||
(!dt.IsValid() && dtOld.IsValid()) )
}
}
- bool HasDPFlag(int flag)
+ bool HasDPFlag(int flag) const
{
return m_combo->GetParent()->HasFlag(flag);
}
- bool SetFormat(const wxString& fmt)
+ // Return the format to be used for the dates shown by the control. This
+ // functions honours wxDP_SHOWCENTURY flag.
+ wxString GetLocaleDateFormat() const
{
- m_format.clear();
+ wxString fmt = wxLocale::GetInfo(wxLOCALE_SHORT_DATE_FMT);
+ if ( HasDPFlag(wxDP_SHOWCENTURY) )
+ fmt.Replace("%y", "%Y");
- wxDateTime dt;
- dt.ParseFormat(wxT("2003-10-13"), wxT("%Y-%m-%d"));
- wxString str(dt.Format(fmt));
+ return fmt;
+ }
- const wxChar *p = str.c_str();
- while ( *p )
- {
- int n=wxAtoi(p);
- if (n == dt.GetDay())
- {
- m_format.Append(wxT("%d"));
- p += 2;
- }
- else if (n == (int)dt.GetMonth()+1)
- {
- m_format.Append(wxT("%m"));
- p += 2;
- }
- else if (n == dt.GetYear())
- {
- m_format.Append(wxT("%Y"));
- p += 4;
- }
- else if (n == (dt.GetYear() % 100))
- {
- if ( HasDPFlag(wxDP_SHOWCENTURY) )
- m_format.Append(wxT("%Y"));
- else
- m_format.Append(wxT("%y"));
- p += 2;
- }
- else
- m_format.Append(*p++);
- }
+ bool SetFormat(const wxString& fmt)
+ {
+ m_format = fmt;
if ( m_combo )
{
wxArrayString allowedChars;
- for ( wxChar c = _T('0'); c <= _T('9'); c++ )
+ for ( wxChar c = wxT('0'); c <= wxT('9'); c++ )
allowedChars.Add(wxString(c, 1));
const wxChar *p2 = m_format.c_str();
const wxString& name)
{
wxASSERT_MSG( !(style & wxDP_SPIN),
- _T("wxDP_SPIN style not supported, use wxDP_DEFAULT") );
+ wxT("wxDP_SPIN style not supported, use wxDP_DEFAULT") );
if ( !wxControl::Create(parent, id, pos, size,
style | wxCLIP_CHILDREN | wxWANTS_CHARS | wxBORDER_NONE,
return m_combo->GetBestSize();
}
+wxWindowList wxDatePickerCtrlGeneric::GetCompositeWindowParts() const
+{
+ wxWindowList parts;
+ parts.push_back(m_combo);
+ parts.push_back(m_popup);
+ return parts;
+}
+
// ----------------------------------------------------------------------------
// wxDatePickerCtrlGeneric API
// ----------------------------------------------------------------------------
wxDateTime wxDatePickerCtrlGeneric::GetValue() const
{
+ if ( HasFlag(wxDP_ALLOWNONE) && m_popup->IsTextEmpty() )
+ return wxInvalidDateTime;
return m_popup->GetDate();
}
// We'll create an additional event if the date is valid.
// If the date isn't valid, the user's probably in the middle of typing
wxDateTime dt;
- if ( !m_popup->ParseDateTime(m_combo->GetValue(), &dt) )
+ if ( !m_popup || !m_popup->ParseDateTime(m_combo->GetValue(), &dt) )
return;
m_popup->SendDateEvent(dt);