#if wxUSE_DATEPICKCTRL
-#include "wx/datectrl.h"
-
-// use this version if we're explicitly requested to do it or if it's the only
-// one we have
-#if !defined(wxHAS_NATIVE_DATEPICKCTRL) || \
- (defined(wxUSE_DATEPICKCTRL_GENERIC) && wxUSE_DATEPICKCTRL_GENERIC)
-
#ifndef WX_PRECOMP
#include "wx/dialog.h"
#include "wx/dcmemory.h"
#include "wx/valtext.h"
#endif
-#ifdef wxHAS_NATIVE_DATEPICKCTRL
- // this header is not included from wx/datectrl.h if we have a native
- // version, but we do need it here
- #include "wx/generic/datectrl.h"
-#endif
-
-#include "wx/dateevt.h"
+#include "wx/datectrl.h"
+#include "wx/generic/datectrl.h"
-#include "wx/calctrl.h"
-#include "wx/generic/calctrlg.h"
-#include "wx/combo.h"
// ----------------------------------------------------------------------------
// constants
// ----------------------------------------------------------------------------
-#if defined(__WXMSW__)
- #define CALBORDER 0
-#else
- #define CALBORDER 4
-#endif
// ----------------------------------------------------------------------------
// global variables
// local classes
// ----------------------------------------------------------------------------
-class wxCalendarComboPopup : public wxGenericCalendarCtrl,
+class wxCalendarComboPopup : public wxCalendarCtrl,
public wxComboPopup
{
public:
- wxCalendarComboPopup() : wxGenericCalendarCtrl(),
+ wxCalendarComboPopup() : wxCalendarCtrl(),
wxComboPopup()
{
}
// certainly introduce new bugs.
virtual bool Create(wxWindow* parent)
{
- if ( !wxGenericCalendarCtrl::Create(parent, wxID_ANY, wxDefaultDateTime,
+ if ( !wxCalendarCtrl::Create(parent, wxID_ANY, wxDefaultDateTime,
wxPoint(0, 0), wxDefaultSize,
- wxCAL_SHOW_HOLIDAYS | wxBORDER_SUNKEN) )
+ wxCAL_SEQUENTIAL_MONTH_SELECTION
+ | wxCAL_SHOW_HOLIDAYS | wxBORDER_SUNKEN) )
return false;
- wxWindow *yearControl = wxGenericCalendarCtrl::GetYearControl();
-
- wxClientDC dc(yearControl);
- dc.SetFont(yearControl->GetFont());
- wxCoord width, dummy;
- dc.GetTextExtent(wxT("2000"), &width, &dummy);
- width += ConvertDialogToPixels(wxSize(20, 0)).x;
+ SetFormat(GetLocaleDateFormat());
- wxSize calSize = wxGenericCalendarCtrl::GetBestSize();
- wxSize yearSize = yearControl->GetSize();
- yearSize.x = width;
-
- wxPoint yearPosition = yearControl->GetPosition();
-
- SetFormat("%x");
-
- width = yearPosition.x + yearSize.x+2+CALBORDER/2;
- if (width < calSize.x-4)
- width = calSize.x-4;
-
- int calPos = (width-calSize.x)/2;
- if (calPos == -1)
- {
- calPos = 0;
- width += 2;
- }
- wxGenericCalendarCtrl::SetSize(calPos, 0, calSize.x, calSize.y);
- yearControl->SetSize(width-yearSize.x-CALBORDER/2, yearPosition.y,
- yearSize.x, yearSize.y);
- wxGenericCalendarCtrl::GetMonthControl()->Move(0, 0);
-
- m_useSize.x = width+CALBORDER/2;
- m_useSize.y = calSize.y-2+CALBORDER;
+ m_useSize = wxCalendarCtrl::GetBestSize();
wxWindow* tx = m_combo->GetTextCtrl();
if ( !tx )
}
}
+ 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)
+ // it expands "%x" format and changes %y to %Y if wxDP_SHOWCENTURY flag
+ // is given. If the locale format can't be easily analyzed (e.g. when
+ // the month is given as a name, not number), "%x" is returned
+ wxString GetLocaleDateFormat() const
{
- m_format.clear();
+ wxString x_format(wxT("%x"));
+ wxString fmt;
+ int year_cnt = 0, month_cnt = 0, day_cnt = 0;
wxDateTime dt;
- dt.ParseFormat(wxT("2003-10-13"), wxT("%Y-%m-%d"));
- wxString str(dt.Format(fmt));
+ dt.ParseFormat(wxT("2003-10-17"), wxT("%Y-%m-%d"));
+ wxString str(dt.Format(x_format));
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 (wxIsdigit(*p))
{
- if ( HasDPFlag(wxDP_SHOWCENTURY) )
- m_format.Append(wxT("%Y"));
+ int n=wxAtoi(p);
+ if (n == dt.GetDay())
+ {
+ fmt.Append(wxT("%d"));
+ day_cnt++;
+ p += 2;
+ }
+ else if (n == (int)dt.GetMonth()+1)
+ {
+ fmt.Append(wxT("%m"));
+ month_cnt++;
+ p += 2;
+ }
+ else if (n == dt.GetYear())
+ {
+ fmt.Append(wxT("%Y"));
+ year_cnt++;
+ p += 4;
+ }
+ else if (n == (dt.GetYear() % 100))
+ {
+ if ( HasDPFlag(wxDP_SHOWCENTURY) )
+ fmt.Append(wxT("%Y"));
+ else
+ fmt.Append(wxT("%y"));
+ year_cnt++;
+ p += 2;
+ }
else
- m_format.Append(wxT("%y"));
- p += 2;
+ // this shouldn't happen
+ return x_format;
+ }
+ else {
+ fmt.Append(*p);
+ p++;
}
- else
- m_format.Append(*p++);
}
+ if (year_cnt == 1 && month_cnt == 1 && day_cnt == 1)
+ return fmt;
+ else
+ return x_format;
+ }
+
+ bool SetFormat(const wxString& fmt)
+ {
+ m_format = fmt;
+
if ( m_combo )
{
wxArrayString allowedChars;
};
-BEGIN_EVENT_TABLE(wxCalendarComboPopup, wxGenericCalendarCtrl)
+BEGIN_EVENT_TABLE(wxCalendarComboPopup, wxCalendarCtrl)
EVT_KEY_DOWN(wxCalendarComboPopup::OnCalKey)
EVT_CALENDAR_SEL_CHANGED(wxID_ANY, wxCalendarComboPopup::OnSelChange)
EVT_CALENDAR_PAGE_CHANGED(wxID_ANY, wxCalendarComboPopup::OnSelChange)
wxDateTime wxDatePickerCtrlGeneric::GetValue() const
{
+ if ( HasFlag(wxDP_ALLOWNONE) && m_popup->IsTextEmpty() )
+ return wxInvalidDateTime;
return m_popup->GetDate();
}
bool wxDatePickerCtrlGeneric::GetRange(wxDateTime *dt1, wxDateTime *dt2) const
{
- if (dt1)
- *dt1 = m_popup->GetLowerDateLimit();
- if (dt2)
- *dt2 = m_popup->GetUpperDateLimit();
- return true;
+ return m_popup->GetDateRange(dt1, dt2);
}
m_popup->SetDateRange(dt1, dt2);
}
-wxGenericCalendarCtrl *wxDatePickerCtrlGeneric::GetCalendar() const
+wxCalendarCtrl *wxDatePickerCtrlGeneric::GetCalendar() const
{
return m_popup;
}
// 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);
}
-#endif // wxUSE_DATEPICKCTRL_GENERIC
-
#endif // wxUSE_DATEPICKCTRL
projects / wxWidgets.git / blobdiff