X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/7ae712f56622968fd7b23d14d22e076e3cb4c65a..3cd25cff50f35741c8f5327865068593e214e4ca:/src/generic/datectlg.cpp?ds=inline diff --git a/src/generic/datectlg.cpp b/src/generic/datectlg.cpp index 42d4c09a3e..6527a991b6 100644 --- a/src/generic/datectlg.cpp +++ b/src/generic/datectlg.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: generic/datectlg.cpp +// Name: src/generic/datectlg.cpp // Purpose: generic wxDatePickerCtrlGeneric implementation // Author: Andreas Pflug // Modified by: @@ -25,16 +25,14 @@ #if wxUSE_DATEPICKCTRL -#if defined(__WXMSW__) && !defined(__WXUNIVERSAL__) - #define HAS_NATIVE_VERSION -#endif +#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 wxUSE_DATEPICKCTRL_GENERIC || !defined(HAS_NATIVE_VERSION) +#if !defined(wxHAS_NATIVE_DATEPICKCTRL) || \ + (defined(wxUSE_DATEPICKCTRL_GENERIC) && wxUSE_DATEPICKCTRL_GENERIC) #ifndef WX_PRECOMP - #include "wx/bmpbuttn.h" #include "wx/dialog.h" #include "wx/dcmemory.h" #include "wx/panel.h" @@ -42,501 +40,474 @@ #include "wx/valtext.h" #endif -// otherwise it's defined in the native version implementation -#ifndef HAS_NATIVE_VERSION +#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/datectrl.h" #include "wx/calctrl.h" -#include "wx/popupwin.h" +#include "wx/combo.h" // ---------------------------------------------------------------------------- // constants // ---------------------------------------------------------------------------- -enum -{ - CTRLID_TXT = 101, - CTRLID_CAL, - CTRLID_BTN, - CTRLID_PAN -}; - -#ifndef DEFAULT_ITEM_WIDTH - #define DEFAULT_ITEM_WIDTH 100 +#if defined(__WXMSW__) + #define CALBORDER 0 +#else + #define CALBORDER 4 #endif -// ============================================================================ -// wxDatePickerCtrlGeneric implementation -// ============================================================================ - -BEGIN_EVENT_TABLE(wxDatePickerCtrlGeneric, wxDatePickerCtrlBase) - EVT_BUTTON(CTRLID_BTN, wxDatePickerCtrlGeneric::OnClick) - EVT_TEXT(CTRLID_TXT, wxDatePickerCtrlGeneric::OnText) - EVT_CHILD_FOCUS(wxDatePickerCtrlGeneric::OnChildSetFocus) -END_EVENT_TABLE() +// ---------------------------------------------------------------------------- +// global variables +// ---------------------------------------------------------------------------- -IMPLEMENT_DYNAMIC_CLASS(wxDatePickerCtrl, wxDatePickerCtrlBase) // ---------------------------------------------------------------------------- -// creation +// local classes // ---------------------------------------------------------------------------- -bool wxDatePickerCtrlGeneric::Create(wxWindow *parent, - wxWindowID id, - const wxDateTime& date, - const wxPoint& pos, - const wxSize& size, - long style, - const wxString& name) +class wxCalendarComboPopup : public wxCalendarCtrl, + public wxComboPopup { - wxASSERT_MSG( !(style & wxDP_SPIN), - _T("wxDP_SPIN style not supported, use wxDP_DEFAULT") ); - - if ( !wxControl::Create(parent, id, pos, size, - style | wxCLIP_CHILDREN | wxWANTS_CHARS, - wxDefaultValidator, name) ) +public: + wxCalendarComboPopup() : wxCalendarCtrl(), + wxComboPopup() { - return false; } - SetWindowStyle(style | wxWANTS_CHARS); - InheritAttributes(); - - wxBitmap bmp(8, 4); + virtual void Init() { - wxMemoryDC dc; - - dc.SelectObject(bmp); - dc.SetBrush(wxBrush(GetBackgroundColour())); - dc.SetPen(wxPen(GetBackgroundColour())); - dc.DrawRectangle(0,0, 8,4); - - dc.SetBrush(wxBrush(GetForegroundColour())); - dc.SetPen(wxPen(GetForegroundColour())); - wxPoint pt[3] = { wxPoint(0,0), wxPoint(6,0), wxPoint(3,3) }; - dc.DrawPolygon(3, pt); - dc.SelectObject(wxNullBitmap); } - m_txt=new wxTextCtrl(this, CTRLID_TXT); - m_txt->Connect(wxID_ANY, wxID_ANY, wxEVT_KEY_DOWN, - (wxObjectEventFunction)&wxDatePickerCtrlGeneric::OnEditKey, - 0, this); - m_txt->Connect(wxID_ANY, wxID_ANY, wxEVT_KILL_FOCUS, - (wxObjectEventFunction)&wxDatePickerCtrlGeneric::OnKillFocus, - 0, this); - - m_btn = new wxBitmapButton(this, CTRLID_BTN, bmp); - - m_popup = new wxPopupWindow(this); - m_popup->SetFont(GetFont()); - - wxPanel *panel=new wxPanel(m_popup, CTRLID_PAN, - wxPoint(0, 0), wxDefaultSize, - wxSUNKEN_BORDER); - m_cal = new wxCalendarCtrl(panel, CTRLID_CAL, wxDefaultDateTime, - wxPoint(0,0), wxDefaultSize, - wxCAL_SHOW_HOLIDAYS | wxSUNKEN_BORDER); - m_cal->Connect(CTRLID_CAL, CTRLID_CAL, wxEVT_CALENDAR_SEL_CHANGED, - (wxObjectEventFunction)&wxDatePickerCtrlGeneric::OnSelChange, - 0, this); - m_cal->Connect(wxID_ANY, wxID_ANY, wxEVT_KEY_DOWN, - (wxObjectEventFunction)&wxDatePickerCtrlGeneric::OnCalKey, - 0, this); - m_cal->Connect(CTRLID_CAL, CTRLID_CAL, wxEVT_CALENDAR_DOUBLECLICKED, - (wxObjectEventFunction)&wxDatePickerCtrlGeneric::OnSelChange, - 0, this); - m_cal->Connect(CTRLID_CAL, CTRLID_CAL, wxEVT_CALENDAR_DAY_CHANGED, - (wxObjectEventFunction)&wxDatePickerCtrlGeneric::OnSelChange, - 0, this); - m_cal->Connect(CTRLID_CAL, CTRLID_CAL, wxEVT_CALENDAR_MONTH_CHANGED, - (wxObjectEventFunction)&wxDatePickerCtrlGeneric::OnSelChange, - 0, this); - m_cal->Connect(CTRLID_CAL, CTRLID_CAL, wxEVT_CALENDAR_YEAR_CHANGED, - (wxObjectEventFunction)&wxDatePickerCtrlGeneric::OnSelChange, - 0, this); - - wxWindow *yearControl = m_cal->GetYearControl(); - - Connect(wxID_ANY, wxID_ANY, wxEVT_SET_FOCUS, - (wxObjectEventFunction)&wxDatePickerCtrlGeneric::OnSetFocus); - - wxClientDC dc(yearControl); - dc.SetFont(m_font); - wxCoord width, dummy; - dc.GetTextExtent(wxT("2000"), &width, &dummy); - width += ConvertDialogToPixels(wxSize(20,0)).x; - - wxSize calSize = m_cal->GetBestSize(); - wxSize yearSize = yearControl->GetSize(); - yearSize.x = width; - - wxPoint yearPosition = yearControl->GetPosition(); - - SetFormat(wxT("%x")); - - if (date.IsValid()) - m_txt->SetValue(date.Format(m_format)); - - -#ifdef __WXMSW__ -#define CALBORDER 0 -#else -#define CALBORDER 4 -#endif - - 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) + // NB: Don't create lazily since it didn't work that way before + // wxComboCtrl was used, and changing behaviour would almost + // certainly introduce new bugs. + virtual bool Create(wxWindow* parent) { - calPos = 0; - width += 2; - } - m_cal->SetSize(calPos, 0, calSize.x, calSize.y); - yearControl->SetSize(width-yearSize.x-CALBORDER/2, yearPosition.y, - yearSize.x, yearSize.y); - m_cal->GetMonthControl()->Move(0, 0); + if ( !wxCalendarCtrl::Create(parent, wxID_ANY, wxDefaultDateTime, + wxPoint(0, 0), wxDefaultSize, + 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; - panel->SetClientSize(width+CALBORDER/2, calSize.y-2+CALBORDER); - m_popup->SetClientSize(panel->GetSize()); - m_popup->Hide(); + wxSize calSize = wxCalendarCtrl::GetBestSize(); + wxSize yearSize = yearControl->GetSize(); + yearSize.x = width; - return TRUE; -} + wxPoint yearPosition = yearControl->GetPosition(); + SetFormat("%x"); -void wxDatePickerCtrlGeneric::Init() -{ - m_popup = NULL; - m_txt = NULL; - m_cal = NULL; - m_btn = NULL; + width = yearPosition.x + yearSize.x+2+CALBORDER/2; + if (width < calSize.x-4) + width = calSize.x-4; - m_dropped = false; - m_ignoreDrop = false; -} + 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; -bool wxDatePickerCtrlGeneric::Destroy() -{ - if (m_cal) - m_cal->Destroy(); - if (m_popup) - m_popup->Destroy(); - if (m_txt) - m_txt->Destroy(); - if (m_btn) - m_btn->Destroy(); + wxWindow* tx = m_combo->GetTextCtrl(); + if ( !tx ) + tx = m_combo; - m_popup = NULL; - m_txt = NULL; - m_cal = NULL; - m_btn = NULL; + tx->Connect(wxEVT_KILL_FOCUS, + wxFocusEventHandler(wxCalendarComboPopup::OnKillTextFocus), + NULL, this); - return wxControl::Destroy(); -} - -// ---------------------------------------------------------------------------- -// overridden base class methods -// ---------------------------------------------------------------------------- + return true; + } -void wxDatePickerCtrlGeneric::DoMoveWindow(int x, int y, int w, int h) -{ - wxControl::DoMoveWindow(x, y, w, h); - wxSize bs=m_btn->GetBestSize(); - int eh=m_txt->GetBestSize().y; + virtual wxSize GetAdjustedSize(int WXUNUSED(minWidth), + int WXUNUSED(prefHeight), + int WXUNUSED(maxHeight)) + { + return m_useSize; + } - m_txt->SetSize(0, 0, w-bs.x-1, h > eh ? eh : h); - m_btn->SetSize(w - bs.x, 0, bs.x, h > bs.y ? bs.y : h); + virtual wxWindow *GetControl() { return this; } - if (m_dropped) - DropDown(); -} + void SetDateValue(const wxDateTime& date) + { + if ( date.IsValid() ) + { + m_combo->SetText(date.Format(m_format)); + } + else // invalid date + { + wxASSERT_MSG( HasDPFlag(wxDP_ALLOWNONE), + _T("this control must have a valid date") ); -wxSize wxDatePickerCtrlGeneric::DoGetBestSize() const -{ - int bh=m_btn->GetBestSize().y; - int eh=m_txt->GetBestSize().y; - return wxSize(DEFAULT_ITEM_WIDTH, bh > eh ? bh : eh); -} + m_combo->SetText(wxEmptyString); + } + m_currentDate = date; + } -bool wxDatePickerCtrlGeneric::Show(bool show) -{ - if ( !wxControl::Show(show) ) + const wxDateTime& GetDateValue() const { - return FALSE; + return m_currentDate; } - if (!show) + bool ParseDateTime(const wxString& s, wxDateTime* pDt) { - if (m_popup) + wxASSERT(pDt); + + if ( !s.empty() ) { - m_popup->Hide(); - m_dropped = false; + pDt->ParseFormat(s.c_str(), m_format); + if ( !pDt->IsValid() ) + return false; } - } - return TRUE; -} - - -bool wxDatePickerCtrlGeneric::Enable(bool enable) -{ - if ( !wxControl::Enable(enable) ) - { - return FALSE; + return true; } - if (!enable) + void SendDateEvent(const wxDateTime& dt) { - if (m_cal) - m_cal->Hide(); + // + // 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); + datePicker->GetEventHandler()->ProcessEvent(cev); + + wxDateEvent event(datePicker, dt, wxEVT_DATE_CHANGED); + datePicker->GetEventHandler()->ProcessEvent(event); } - if (m_btn) - m_btn->Enable(enable); - return TRUE; -} - -// ---------------------------------------------------------------------------- -// wxDatePickerCtrlGeneric API -// ---------------------------------------------------------------------------- -bool -wxDatePickerCtrlGeneric::SetDateRange(const wxDateTime& lowerdate, - const wxDateTime& upperdate) -{ - return m_cal->SetDateRange(lowerdate, upperdate); -} +private: -bool wxDatePickerCtrlGeneric::SetFormat(const wxChar *fmt) -{ - wxString currentText; - wxDateTime currentDate; - if (m_txt) + void OnCalKey(wxKeyEvent & ev) { - currentText = m_txt->GetValue(); - if (!currentText.IsEmpty()) - currentDate.ParseFormat(currentText, m_format); + if (ev.GetKeyCode() == WXK_ESCAPE && !ev.HasModifiers()) + Dismiss(); + else + ev.Skip(); } - wxDateTime dt; - dt.ParseFormat(wxT("2003-10-13"), wxT("%Y-%m-%d")); - wxString str=dt.Format(fmt); - wxChar *p=(wxChar*)str.c_str(); - - m_format=wxEmptyString; - while (*p) + void OnSelChange(wxCalendarEvent &ev) { - int n=wxAtoi(p); - if (n == dt.GetDay()) - { - m_format.Append(wxT("%d")); - p += 2; - } - else if (n == (int)dt.GetMonth()+1) + m_currentDate = wxCalendarCtrl::GetDate(); + m_combo->SetText(m_currentDate.Format(m_format)); + + if ( ev.GetEventType() == wxEVT_CALENDAR_DOUBLECLICKED ) { - m_format.Append(wxT("%m")); - p += 2; + Dismiss(); } - else if (n == dt.GetYear()) + + SendDateEvent(m_currentDate); + } + + void OnKillTextFocus(wxFocusEvent &ev) + { + ev.Skip(); + + wxDateTime dt; + wxString value = m_combo->GetValue(); + if ( !ParseDateTime(value, &dt) ) { - m_format.Append(wxT("%Y")); - p += 4; + if ( !HasDPFlag(wxDP_ALLOWNONE) ) + dt = m_currentDate; } - else if (n == (dt.GetYear() % 100)) + + if ( dt.IsValid() ) + m_combo->SetText(dt.Format(m_format)); + else + m_combo->SetText(wxEmptyString); + + // notify that we had to change the date after validation + if ( (dt.IsValid() && (!m_currentDate.IsValid() || m_currentDate != dt)) || + (!dt.IsValid() && m_currentDate.IsValid()) ) { - m_format.Append(wxT("%y")); - p += 2; + m_currentDate = dt; + SendDateEvent(dt); } - else - m_format.Append(*p++); } - if (m_txt) + bool HasDPFlag(int flag) + { + return m_combo->GetParent()->HasFlag(flag); + } + + bool SetFormat(const wxString& fmt) { - wxStringList valList; - wxChar c; - for (c='0'; c <= '9'; c++) - valList.Add(wxString(c, 1)); - wxChar *p=(wxChar*)m_format.c_str(); - while (*p) + m_format.clear(); + + wxDateTime dt; + dt.ParseFormat(wxT("2003-10-13"), wxT("%Y-%m-%d")); + wxString str(dt.Format(fmt)); + + const wxChar *p = str.c_str(); + while ( *p ) { - if (*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 - valList.Add(wxString(*p++, 1)); + m_format.Append(*p++); } - wxTextValidator tv(wxFILTER_INCLUDE_CHAR_LIST); - tv.SetIncludeList(valList); - m_txt->SetValidator(tv); + if ( m_combo ) + { + wxArrayString allowedChars; + for ( wxChar c = _T('0'); c <= _T('9'); c++ ) + allowedChars.Add(wxString(c, 1)); + + const wxChar *p2 = m_format.c_str(); + while ( *p2 ) + { + if ( *p2 == '%') + p2 += 2; + else + allowedChars.Add(wxString(*p2++, 1)); + } + + #if wxUSE_VALIDATORS + wxTextValidator tv(wxFILTER_INCLUDE_CHAR_LIST); + tv.SetIncludes(allowedChars); + m_combo->SetValidator(tv); + #endif + + if (m_currentDate.IsValid()) + m_combo->SetText(m_currentDate.Format(m_format)); + } - if (!currentText.IsEmpty()) - m_txt->SetValue(currentDate.Format(m_format)); + return true; } - 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; + } -wxDateTime wxDatePickerCtrlGeneric::GetValue() const -{ - wxDateTime dt; - wxString txt=m_txt->GetValue(); + virtual wxString GetStringValue() const + { + if ( !m_currentDate.IsValid() ) + return wxEmptyString; - if (!txt.IsEmpty()) - dt.ParseFormat(txt, m_format); + return m_currentDate.Format(m_format); + } - return dt; -} +private: + wxSize m_useSize; + wxString m_format; + wxDateTime m_currentDate; -void wxDatePickerCtrlGeneric::SetValue(const wxDateTime& date) + 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(wxID_ANY, wxCalendarComboPopup::OnSelChange) +END_EVENT_TABLE() + + +// ============================================================================ +// wxDatePickerCtrlGeneric implementation +// ============================================================================ + +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 + IMPLEMENT_DYNAMIC_CLASS(wxDatePickerCtrl, wxControl) +#endif + +// ---------------------------------------------------------------------------- +// creation +// ---------------------------------------------------------------------------- + +bool wxDatePickerCtrlGeneric::Create(wxWindow *parent, + wxWindowID id, + const wxDateTime& date, + const wxPoint& pos, + const wxSize& size, + long style, + const wxValidator& validator, + const wxString& name) { - if (m_cal) + wxASSERT_MSG( !(style & wxDP_SPIN), + _T("wxDP_SPIN style not supported, use wxDP_DEFAULT") ); + + if ( !wxControl::Create(parent, id, pos, size, + style | wxCLIP_CHILDREN | wxWANTS_CHARS | wxBORDER_NONE, + validator, name) ) { - if (date.IsValid()) - m_txt->SetValue(date.Format(m_format)); - else - m_txt->SetValue(wxEmptyString); + return false; } -} + InheritAttributes(); + + 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()); + + SetInitialSize(size); -bool wxDatePickerCtrlGeneric::GetRange(wxDateTime *dt1, wxDateTime *dt2) const -{ - if (dt1) - *dt1 = m_cal->GetLowerDateLimit(); - if (dt1) - *dt2 = m_cal->GetUpperDateLimit(); return true; } -void -wxDatePickerCtrlGeneric::SetRange(const wxDateTime &dt1, const wxDateTime &dt2) +void wxDatePickerCtrlGeneric::Init() { - m_cal->SetDateRange(dt1, dt2); + m_combo = NULL; + m_cal = NULL; + m_popup = NULL; } -// ---------------------------------------------------------------------------- -// event handlers -// ---------------------------------------------------------------------------- +wxDatePickerCtrlGeneric::~wxDatePickerCtrlGeneric() +{ +} -void wxDatePickerCtrlGeneric::DropDown(bool down) +bool wxDatePickerCtrlGeneric::Destroy() { - if (m_popup) - { - if (down) - { - wxDateTime dt; - if (!m_txt->GetValue().IsEmpty()) - dt.ParseFormat(m_txt->GetValue(), m_format); + if ( m_combo ) + m_combo->Destroy(); - if (dt.IsValid()) - m_cal->SetDate(dt); - else - m_cal->SetDate(wxDateTime::Today()); + m_combo = NULL; + m_cal = NULL; + m_popup = NULL; - wxPoint pos=GetParent()->ClientToScreen(GetPosition()); - m_popup->Move(pos.x, pos.y + GetSize().y); - m_popup->Show(); - m_dropped = true; - } - else - { - if (m_dropped) - m_popup->Hide(); - m_dropped = false; - } - } + return wxControl::Destroy(); } +// ---------------------------------------------------------------------------- +// overridden base class methods +// ---------------------------------------------------------------------------- -void wxDatePickerCtrlGeneric::OnChildSetFocus(wxChildFocusEvent &ev) +wxSize wxDatePickerCtrlGeneric::DoGetBestSize() const { - ev.Skip(); - m_ignoreDrop = false; + return m_combo->GetBestSize(); +} - wxWindow *w=(wxWindow*)ev.GetEventObject(); - while (w) - { - if (w == m_popup) - return; - w = w->GetParent(); - } +// ---------------------------------------------------------------------------- +// wxDatePickerCtrlGeneric API +// ---------------------------------------------------------------------------- - if (m_dropped) - { - DropDown(false); - if (ev.GetEventObject() == m_btn) - m_ignoreDrop = true; - } +bool +wxDatePickerCtrlGeneric::SetDateRange(const wxDateTime& lowerdate, + const wxDateTime& upperdate) +{ + return m_cal->SetDateRange(lowerdate, upperdate); } -void wxDatePickerCtrlGeneric::OnClick(wxCommandEvent& event) +wxDateTime wxDatePickerCtrlGeneric::GetValue() const { - if (m_ignoreDrop) - { - m_ignoreDrop = false; - m_txt->SetFocus(); - } - else - { - DropDown(); - m_cal->SetFocus(); - } + return m_popup->GetDateValue(); } -void wxDatePickerCtrlGeneric::OnSetFocus(wxFocusEvent &ev) +void wxDatePickerCtrlGeneric::SetValue(const wxDateTime& date) { - if (m_txt) - { - m_txt->SetFocus(); - m_txt->SetSelection(0, 100); - } + m_popup->SetDateValue(date); } -void wxDatePickerCtrlGeneric::OnKillFocus(wxFocusEvent &ev) +bool wxDatePickerCtrlGeneric::GetRange(wxDateTime *dt1, wxDateTime *dt2) const { - ev.Skip(); + if (dt1) + *dt1 = m_cal->GetLowerDateLimit(); + if (dt2) + *dt2 = m_cal->GetUpperDateLimit(); + return true; +} - wxDateTime dt; - dt.ParseFormat(m_txt->GetValue(), m_format); - if (!dt.IsValid()) - m_txt->SetValue(wxEmptyString); - else - m_txt->SetValue(dt.Format(m_format)); + +void +wxDatePickerCtrlGeneric::SetRange(const wxDateTime &dt1, const wxDateTime &dt2) +{ + m_cal->SetDateRange(dt1, dt2); } +// ---------------------------------------------------------------------------- +// event handlers +// ---------------------------------------------------------------------------- + -void wxDatePickerCtrlGeneric::OnSelChange(wxCalendarEvent &ev) +void wxDatePickerCtrlGeneric::OnSize(wxSizeEvent& event) { - if (m_cal) - { - m_txt->SetValue(m_cal->GetDate().Format(m_format)); - if (ev.GetEventType() == wxEVT_CALENDAR_DOUBLECLICKED) - { - DropDown(false); - m_txt->SetFocus(); - } - } - ev.SetEventObject(this); - ev.SetId(GetId()); - GetParent()->ProcessEvent(ev); + if ( m_combo ) + m_combo->SetSize(GetClientSize()); + + event.Skip(); } @@ -544,45 +515,24 @@ void wxDatePickerCtrlGeneric::OnText(wxCommandEvent &ev) { 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 probable in the middle of typing - wxString txt=m_txt->GetValue(); + // If the date isn't valid, the user's probably in the middle of typing wxDateTime dt; - if (!txt.IsEmpty()) - { - dt.ParseFormat(txt, m_format); - if (!dt.IsValid()) - return; - } - - wxCalendarEvent cev(m_cal, wxEVT_CALENDAR_SEL_CHANGED); - cev.SetEventObject(this); - cev.SetId(GetId()); - cev.SetDate(dt); + if ( !m_popup->ParseDateTime(m_combo->GetValue(), &dt) ) + return; - GetParent()->ProcessEvent(cev); + m_popup->SendDateEvent(dt); } -void wxDatePickerCtrlGeneric::OnEditKey(wxKeyEvent & ev) +void wxDatePickerCtrlGeneric::OnFocus(wxFocusEvent& WXUNUSED(event)) { - if (ev.GetKeyCode() == WXK_DOWN && !ev.HasModifiers()) - DropDown(); - else - ev.Skip(); + m_combo->SetFocus(); } -void wxDatePickerCtrlGeneric::OnCalKey(wxKeyEvent & ev) -{ - if (ev.GetKeyCode() == WXK_ESCAPE && !ev.HasModifiers()) - DropDown(false); - else - ev.Skip(); -} - #endif // wxUSE_DATEPICKCTRL_GENERIC #endif // wxUSE_DATEPICKCTRL