#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/intl.h"
#include "wx/panel.h"
#include "wx/textctrl.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"
-#else
- // we need to define _WX_DEFINE_DATE_EVENTS_ before including wx/dateevt.h to
- // define the event types we use if we're the only date picker control version
- // being compiled -- otherwise it's defined in the native version implementation
- #define _WX_DEFINE_DATE_EVENTS_
-#endif
-
-#include "wx/dateevt.h"
-
#include "wx/calctrl.h"
#include "wx/combo.h"
+#include "wx/datectrl.h"
+#include "wx/generic/datectrl.h"
+
// ----------------------------------------------------------------------------
// constants
// ----------------------------------------------------------------------------
-#if defined(__WXMSW__)
- #define CALBORDER 0
-#else
- #define CALBORDER 4
-#endif
// ----------------------------------------------------------------------------
// global variables
// ----------------------------------------------------------------------------
-// this should have been a flag in wxDatePickerCtrlGeneric itself but adding it
-// there now would break backwards compatibility, so put it here as a global:
-// this shouldn't be a big problem as only one (GUI) thread normally can call
-// wxDatePickerCtrlGeneric::SetValue() and so it can be only ever used for one
-// control at a time
-//
-// if the value is not NULL, it points to the control which is inside SetValue()
-static wxDatePickerCtrlGeneric *gs_inSetValue = NULL;
// ----------------------------------------------------------------------------
// local classes
{
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 = wxCalendarCtrl::GetYearControl();
-
- wxClientDC dc(yearControl);
- dc.SetFont(yearControl->GetFont());
- wxCoord width, dummy;
- dc.GetTextExtent(wxT("2000"), &width, &dummy);
- width += ConvertDialogToPixels(wxSize(20, 0)).x;
-
- wxSize calSize = wxCalendarCtrl::GetBestSize();
- wxSize yearSize = yearControl->GetSize();
- yearSize.x = width;
-
- wxPoint yearPosition = yearControl->GetPosition();
-
- SetFormat(wxT("%x"));
+ SetFormat(GetLocaleDateFormat());
- 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;
- }
- wxCalendarCtrl::SetSize(calPos, 0, calSize.x, calSize.y);
- yearControl->SetSize(width-yearSize.x-CALBORDER/2, yearPosition.y,
- yearSize.x, yearSize.y);
- wxCalendarCtrl::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 )
if ( date.IsValid() )
{
m_combo->SetText(date.Format(m_format));
+ SetDate(date);
}
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);
}
-
- m_currentDate = date;
}
- const wxDateTime& GetDateValue() const
+ bool IsTextEmpty() const
{
- return m_currentDate;
+ return m_combo->GetTextCtrl()->IsEmpty();
}
bool ParseDateTime(const wxString& s, wxDateTime* pDt)
void SendDateEvent(const wxDateTime& dt)
{
- //
// Sends both wxCalendarEvent and wxDateEvent
wxWindow* datePicker = m_combo->GetParent();
- wxCalendarEvent cev((wxCalendarCtrl*) this, wxEVT_CALENDAR_SEL_CHANGED);
- cev.SetEventObject(datePicker);
- cev.SetId(datePicker->GetId());
- cev.SetDate(dt);
- GetParent()->ProcessEvent(cev);
+ wxCalendarEvent cev(datePicker, dt, wxEVT_CALENDAR_SEL_CHANGED);
+ datePicker->GetEventHandler()->ProcessEvent(cev);
wxDateEvent event(datePicker, dt, wxEVT_DATE_CHANGED);
- datePicker->GetParent()->ProcessEvent(event);
+ datePicker->GetEventHandler()->ProcessEvent(event);
}
private:
void OnSelChange(wxCalendarEvent &ev)
{
- m_currentDate = wxCalendarCtrl::GetDate();
- m_combo->SetText(m_currentDate.Format(m_format));
+ m_combo->SetText(GetDate().Format(m_format));
if ( ev.GetEventType() == wxEVT_CALENDAR_DOUBLECLICKED )
{
Dismiss();
}
- SendDateEvent(m_currentDate);
+ SendDateEvent(GetDate());
}
void OnKillTextFocus(wxFocusEvent &ev)
{
ev.Skip();
+ const wxDateTime& dtOld = GetDate();
+
wxDateTime dt;
wxString value = m_combo->GetValue();
if ( !ParseDateTime(value, &dt) )
{
if ( !HasDPFlag(wxDP_ALLOWNONE) )
- dt = m_currentDate;
+ dt = dtOld;
}
- if ( dt.IsValid() )
- m_combo->SetText(dt.Format(m_format));
- else
- m_combo->SetText(wxEmptyString);
+ m_combo->SetText(GetStringValueFor(dt));
+
+ if ( !dt.IsValid() && HasDPFlag(wxDP_ALLOWNONE) )
+ return;
// notify that we had to change the date after validation
- if ( (dt.IsValid() && (!m_currentDate.IsValid() || m_currentDate != dt)) ||
- (!dt.IsValid() && m_currentDate.IsValid()) )
+ if ( (dt.IsValid() && (!dtOld.IsValid() || dt != dtOld)) ||
+ (!dt.IsValid() && dtOld.IsValid()) )
{
- m_currentDate = dt;
+ SetDate(dt);
SendDateEvent(dt);
}
}
- bool HasDPFlag(int flag)
+ bool HasDPFlag(int flag) const
{
return m_combo->GetParent()->HasFlag(flag);
}
- bool SetFormat(const wxChar *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();
-
- wxDateTime dt;
- dt.ParseFormat(wxT("2003-10-13"), wxT("%Y-%m-%d"));
- wxString str(dt.Format(fmt));
+#if wxUSE_INTL
+ wxString fmt = wxLocale::GetInfo(wxLOCALE_SHORT_DATE_FMT);
+ if ( HasDPFlag(wxDP_SHOWCENTURY) )
+ fmt.Replace("%y", "%Y");
+
+ return fmt;
+#else // !wxUSE_INTL
+ return wxT("x");
+#endif // wxUSE_INTL/!wxUSE_INTL
+ }
- 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();
m_combo->SetValidator(tv);
#endif
- if (m_currentDate.IsValid())
- m_combo->SetText(m_currentDate.Format(m_format));
+ if ( GetDate().IsValid() )
+ m_combo->SetText(GetDate().Format(m_format));
}
return true;
virtual void SetStringValue(const wxString& s)
{
wxDateTime dt;
- if ( ParseDateTime(s, &dt) )
- m_currentDate = dt;
- else if ( HasDPFlag(wxDP_ALLOWNONE) )
- m_currentDate = dt;
+ if ( !s.empty() && ParseDateTime(s, &dt) )
+ SetDate(dt);
+ //else: keep the old value
}
virtual wxString GetStringValue() const
{
- if ( !m_currentDate.IsValid() )
- return wxEmptyString;
-
- return m_currentDate.Format(m_format);
+ return GetStringValueFor(GetDate());
}
private:
+ // returns either the given date representation using the current format or
+ // an empty string if it's invalid
+ wxString GetStringValueFor(const wxDateTime& dt) const
+ {
+ wxString val;
+ if ( dt.IsValid() )
+ val = dt.Format(m_format);
+
+ return val;
+ }
wxSize m_useSize;
wxString m_format;
- wxDateTime m_currentDate;
DECLARE_EVENT_TABLE()
};
BEGIN_EVENT_TABLE(wxCalendarComboPopup, wxCalendarCtrl)
EVT_KEY_DOWN(wxCalendarComboPopup::OnCalKey)
EVT_CALENDAR_SEL_CHANGED(wxID_ANY, wxCalendarComboPopup::OnSelChange)
- EVT_CALENDAR_DAY(wxID_ANY, wxCalendarComboPopup::OnSelChange)
- EVT_CALENDAR_MONTH(wxID_ANY, wxCalendarComboPopup::OnSelChange)
- EVT_CALENDAR_YEAR(wxID_ANY, wxCalendarComboPopup::OnSelChange)
+ EVT_CALENDAR_PAGE_CHANGED(wxID_ANY, wxCalendarComboPopup::OnSelChange)
EVT_CALENDAR(wxID_ANY, wxCalendarComboPopup::OnSelChange)
END_EVENT_TABLE()
BEGIN_EVENT_TABLE(wxDatePickerCtrlGeneric, wxDatePickerCtrlBase)
EVT_TEXT(wxID_ANY, wxDatePickerCtrlGeneric::OnText)
EVT_SIZE(wxDatePickerCtrlGeneric::OnSize)
+ EVT_SET_FOCUS(wxDatePickerCtrlGeneric::OnFocus)
END_EVENT_TABLE()
#ifndef wxHAS_NATIVE_DATEPICKCTRL
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,
m_combo = new wxComboCtrl(this, -1, wxEmptyString,
wxDefaultPosition, wxDefaultSize);
+ m_combo->SetCtrlMainWnd(this);
+
m_popup = new wxCalendarComboPopup();
#if defined(__WXMSW__)
#endif
m_combo->SetPopupControl(m_popup);
- m_cal = m_popup;
-
m_popup->SetDateValue(date.IsValid() ? date : wxDateTime::Today());
- SetBestFittingSize(size);
+ SetInitialSize(size);
return true;
}
void wxDatePickerCtrlGeneric::Init()
{
m_combo = NULL;
- m_cal = NULL;
m_popup = NULL;
}
m_combo->Destroy();
m_combo = NULL;
- m_cal = NULL;
m_popup = NULL;
return wxControl::Destroy();
wxSize wxDatePickerCtrlGeneric::DoGetBestSize() const
{
- return m_combo->GetBestSize();
+ // A better solution would be to use a custom text control that would have
+ // the best size determined by the current date format and let m_combo take
+ // care of the best size computation, but this isn't easily possible with
+ // wxComboCtrl currently, so we compute our own best size here instead even
+ // if this means adding some extra margins to account for text control
+ // borders, space between it and the button and so on.
+ wxSize size = m_combo->GetButtonSize();
+
+ wxTextCtrl* const text = m_combo->GetTextCtrl();
+ size.x += text->GetTextExtent(text->GetValue()).x;
+ size.x += 2*text->GetCharWidth(); // This is the margin mentioned above.
+
+ return size;
+}
+
+wxWindowList wxDatePickerCtrlGeneric::GetCompositeWindowParts() const
+{
+ wxWindowList parts;
+ parts.push_back(m_combo);
+ parts.push_back(m_popup);
+ return parts;
}
// ----------------------------------------------------------------------------
wxDatePickerCtrlGeneric::SetDateRange(const wxDateTime& lowerdate,
const wxDateTime& upperdate)
{
- return m_cal->SetDateRange(lowerdate, upperdate);
+ return m_popup->SetDateRange(lowerdate, upperdate);
}
wxDateTime wxDatePickerCtrlGeneric::GetValue() const
{
- return m_popup->GetDateValue();
+ 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_cal->GetLowerDateLimit();
- if (dt2)
- *dt2 = m_cal->GetUpperDateLimit();
- return true;
+ return m_popup->GetDateRange(dt1, dt2);
}
void
wxDatePickerCtrlGeneric::SetRange(const wxDateTime &dt1, const wxDateTime &dt2)
{
- m_cal->SetDateRange(dt1, dt2);
+ m_popup->SetDateRange(dt1, dt2);
+}
+
+wxCalendarCtrl *wxDatePickerCtrlGeneric::GetCalendar() const
+{
+ return m_popup;
}
// ----------------------------------------------------------------------------
{
ev.SetEventObject(this);
ev.SetId(GetId());
- GetParent()->ProcessEvent(ev);
+ GetParent()->GetEventHandler()->ProcessEvent(ev);
// 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
+void wxDatePickerCtrlGeneric::OnFocus(wxFocusEvent& WXUNUSED(event))
+{
+ m_combo->SetFocus();
+}
+
#endif // wxUSE_DATEPICKCTRL
projects / wxWidgets.git / blobdiff