// 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/generic/calctrlg.h"
#include "wx/combo.h"
// ----------------------------------------------------------------------------
// 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
// ----------------------------------------------------------------------------
-class wxCalendarComboPopup : public wxCalendarCtrl,
+class wxCalendarComboPopup : public wxGenericCalendarCtrl,
public wxComboPopup
{
public:
- wxCalendarComboPopup() : wxCalendarCtrl(),
+ wxCalendarComboPopup() : wxGenericCalendarCtrl(),
wxComboPopup()
{
}
// certainly introduce new bugs.
virtual bool Create(wxWindow* parent)
{
- if ( !wxCalendarCtrl::Create(parent, wxID_ANY, wxDefaultDateTime,
+ if ( !wxGenericCalendarCtrl::Create(parent, wxID_ANY, wxDefaultDateTime,
wxPoint(0, 0), wxDefaultSize,
wxCAL_SHOW_HOLIDAYS | wxBORDER_SUNKEN) )
return false;
- wxWindow *yearControl = wxCalendarCtrl::GetYearControl();
+ wxWindow *yearControl = wxGenericCalendarCtrl::GetYearControl();
wxClientDC dc(yearControl);
dc.SetFont(yearControl->GetFont());
dc.GetTextExtent(wxT("2000"), &width, &dummy);
width += ConvertDialogToPixels(wxSize(20, 0)).x;
- wxSize calSize = wxCalendarCtrl::GetBestSize();
+ wxSize calSize = wxGenericCalendarCtrl::GetBestSize();
wxSize yearSize = yearControl->GetSize();
yearSize.x = width;
wxPoint yearPosition = yearControl->GetPosition();
- SetFormat(wxT("%x"));
+ SetFormat("%x");
width = yearPosition.x + yearSize.x+2+CALBORDER/2;
if (width < calSize.x-4)
calPos = 0;
width += 2;
}
- wxCalendarCtrl::SetSize(calPos, 0, calSize.x, calSize.y);
+ wxGenericCalendarCtrl::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);
+ wxGenericCalendarCtrl::GetMonthControl()->Move(0, 0);
m_useSize.x = width+CALBORDER/2;
m_useSize.y = calSize.y-2+CALBORDER;
m_combo->SetText(wxEmptyString);
}
- m_currentDate = date;
- }
-
- const wxDateTime& GetDateValue() const
- {
- return m_currentDate;
+ SetDate(date);
}
bool ParseDateTime(const wxString& s, wxDateTime* pDt)
if ( !s.empty() )
{
- pDt->ParseFormat(s, m_format);
+ pDt->ParseFormat(s.c_str(), m_format);
if ( !pDt->IsValid() )
return false;
}
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));
// 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);
}
}
return m_combo->GetParent()->HasFlag(flag);
}
- bool SetFormat(const wxChar *fmt)
+ bool SetFormat(const wxString& fmt)
{
m_format.clear();
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;
{
wxDateTime dt;
if ( ParseDateTime(s, &dt) )
- m_currentDate = dt;
+ SetDate(dt);
else if ( HasDPFlag(wxDP_ALLOWNONE) )
- m_currentDate = dt;
+ SetDate(wxInvalidDateTime);
+ //else: !wxDP_ALLOWNONE, 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)
+BEGIN_EVENT_TABLE(wxCalendarComboPopup, wxGenericCalendarCtrl)
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
m_combo = new wxComboCtrl(this, -1, wxEmptyString,
wxDefaultPosition, wxDefaultSize);
+ m_combo->SetCtrlMainWnd(this);
+
m_popup = new wxCalendarComboPopup();
+#if defined(__WXMSW__)
+ // without this keyboard navigation in month control doesn't work
+ m_combo->UseAltPopupWindow();
+#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();
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();
+ return m_popup->GetDate();
}
bool wxDatePickerCtrlGeneric::GetRange(wxDateTime *dt1, wxDateTime *dt2) const
{
if (dt1)
- *dt1 = m_cal->GetLowerDateLimit();
+ *dt1 = m_popup->GetLowerDateLimit();
if (dt2)
- *dt2 = m_cal->GetUpperDateLimit();
+ *dt2 = m_popup->GetUpperDateLimit();
return true;
}
void
wxDatePickerCtrlGeneric::SetRange(const wxDateTime &dt1, const wxDateTime &dt2)
{
- m_cal->SetDateRange(dt1, dt2);
+ m_popup->SetDateRange(dt1, dt2);
+}
+
+wxGenericCalendarCtrl *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
}
+void wxDatePickerCtrlGeneric::OnFocus(wxFocusEvent& WXUNUSED(event))
+{
+ m_combo->SetFocus();
+}
+
+
#endif // wxUSE_DATEPICKCTRL_GENERIC
#endif // wxUSE_DATEPICKCTRL
projects / wxWidgets.git / blobdiff