X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/29c8694822a192934278ba0f98eaf437024c0278..172541f64be8fcddb08f1c121da256d08c24a70b:/src/generic/datectlg.cpp diff --git a/src/generic/datectlg.cpp b/src/generic/datectlg.cpp index b265e27738..90258753ae 100644 --- a/src/generic/datectlg.cpp +++ b/src/generic/datectlg.cpp @@ -1,6 +1,6 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: generic/datectrl.cpp -// Purpose: generic wxDatePickerCtrl implementation +// Name: generic/datectlg.cpp +// Purpose: generic wxDatePickerCtrlGeneric implementation // Author: Andreas Pflug // Modified by: // Created: 2005-01-19 @@ -23,8 +23,38 @@ #pragma hdrstop #endif +#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 wxUSE_DATEPICKCTRL_GENERIC || !defined(wxHAS_NATIVE_DATEPICKCTRL) + +#ifndef WX_PRECOMP + #include "wx/bmpbuttn.h" + #include "wx/dialog.h" + #include "wx/dcmemory.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/renderer.h" // ---------------------------------------------------------------------------- // constants @@ -42,128 +72,306 @@ enum #define DEFAULT_ITEM_WIDTH 100 #endif -// ============================================================================ -// wxDatePickerCtrl implementation -// ============================================================================ - -BEGIN_EVENT_TABLE(wxDatePickerCtrl, wxDatePickerCtrlBase) - EVT_BUTTON(CTRLID_BTN, wxDatePickerCtrl::OnClick) - EVT_TEXT(CTRLID_TXT, wxDatePickerCtrl::OnText) - EVT_CHILD_FOCUS(wxDatePickerCtrl::OnChildSetFocus) -END_EVENT_TABLE() +#ifdef __WXMSW__ + #undef wxUSE_POPUPWIN + #define wxUSE_POPUPWIN 0 // Popup not working + #define TXTCTRL_FLAGS wxNO_BORDER + #define BTN_FLAGS wxNO_BORDER + #define CALBORDER 0 + #define RIGHTBUTTONBORDER 4 + #define TOPBUTTONBORDER 0 + #define BUTTONBORDER 4 + #define TXTPOSY 1 +#else + #define TXTCTRL_FLAGS 0 + #define BTN_FLAGS wxBU_AUTODRAW + #define CALBORDER 4 + #define RIGHTBUTTONBORDER 0 + #define TOPBUTTONBORDER 0 + #define BUTTONBORDER 0 + #define TXTPOSY 0 +#endif -IMPLEMENT_DYNAMIC_CLASS(wxDatePickerCtrl, wxDatePickerCtrlBase) // ---------------------------------------------------------------------------- -// creation +// local classes // ---------------------------------------------------------------------------- -wxDatePickerCtrl::wxDatePickerCtrl(wxWindow *parent, - wxWindowID id, - const wxDateTime& date, - const wxPoint& pos, - const wxSize& size, - long style, - const wxString& name) + +class wxDropdownButton : public wxBitmapButton +{ +public: + wxDropdownButton() { Init(); } + wxDropdownButton(wxWindow *parent, + wxWindowID id, + const wxPoint& pos = wxDefaultPosition, + const wxSize& size = wxDefaultSize, + long style=0, + const wxValidator& validator = wxDefaultValidator); + + void Init() + { + m_borderX = -1; + m_borderY = -1; + } + bool Create(wxWindow *parent, + wxWindowID id, + const wxPoint& pos = wxDefaultPosition, + const wxSize& size = wxDefaultSize, + long style = 0, + const wxValidator& validator = wxDefaultValidator); + + void DoMoveWindow(int x, int y, int w, int h); + +protected: + int m_borderX, m_borderY; +}; + + +wxDropdownButton::wxDropdownButton(wxWindow *parent, + wxWindowID id, + const wxPoint& pos, + const wxSize& size, + long style, + const wxValidator& validator) { Init(); - Create(parent, id, date, pos, size, style, name); + Create(parent, id, pos, size, style, validator); +} + + +bool wxDropdownButton::Create(wxWindow *parent, + wxWindowID id, + const wxPoint& pos, + const wxSize& size, + long WXUNUSED(style), + const wxValidator& validator) +{ + m_marginX = 0; + m_marginY = 0; + + wxBitmap chkBmp(15,15); // arbitrary + if ( !wxBitmapButton::Create(parent, id, chkBmp, + pos, wxDefaultSize, BTN_FLAGS, validator) ) + return false; + + const wxSize sz = GetSize(); + int w = chkBmp.GetWidth(), + h = chkBmp.GetHeight(); + m_borderX = sz.x - m_marginX - w; + m_borderY = sz.y - m_marginY - h; + + w = size.x > 0 ? size.x : sz.x; + h = size.y > 0 ? size.y : sz.y; + + DoMoveWindow(pos.x, pos.y, w, h); + + return true; +} + + +void wxDropdownButton::DoMoveWindow(int x, int y, int w, int h) +{ + if (m_borderX >= 0 && m_borderY >= 0 && (w >= 0 || h >= 0)) + { + wxMemoryDC dc; + if (w < 0) + w = GetSize().x; +#ifdef __WXGTK__ + else + w = m_marginX + m_borderX + 15; // GTK magic size +#endif + if (h < 0) + h = GetSize().y; + + int borderX = m_marginX + m_borderX; + int borderY = m_marginY + m_borderY; + int bw = w - borderX; + int bh = h - borderY; + if (bh < 11) bh=11; + if (bw < 9) bw=9; + + wxBitmap bmp(bw, bh); + dc.SelectObject(bmp); + + wxRendererNative& renderer = wxRendererNative::Get(); + +#ifdef __WXGTK__ + wxRect r(-(borderX/2),-(borderY/2),w,h); + wxColour magic(255,0,255); + dc.SetBrush( wxBrush( magic ) ); + dc.SetPen( *wxTRANSPARENT_PEN ); + dc.DrawRectangle(0,0,bw,bh); + renderer.DrawDropArrow(this, dc, r); + wxMask *mask = new wxMask( bmp, magic ); + bmp.SetMask( mask ); +#else + wxRect r(0,0,bw,bh); + renderer.DrawComboBoxDropButton(this, dc, r); +#endif + SetBitmapLabel(bmp); + + wxBitmap bmpSel(bw, bh); + dc.SelectObject(bmpSel); + +#ifdef __WXGTK__ + dc.SetBrush( wxBrush( magic ) ); + dc.SetPen( *wxTRANSPARENT_PEN ); + dc.DrawRectangle(0,0,bw,bh); + renderer.DrawDropArrow(this, dc, r, wxCONTROL_PRESSED); + mask = new wxMask( bmpSel, magic ); + bmpSel.SetMask( mask ); +#else + renderer.DrawComboBoxDropButton(this, dc, r, wxCONTROL_PRESSED); +#endif + SetBitmapSelected(bmpSel); + } + + wxBitmapButton::DoMoveWindow(x, y, w, h); } -bool wxDatePickerCtrl::Create(wxWindow *parent, - wxWindowID id, - const wxDateTime& date, - const wxPoint& pos, - const wxSize& size, - long style, - const wxString& name) +#if wxUSE_POPUPWIN + +#include "wx/popupwin.h" + +class wxDatePopupInternal : public wxPopupTransientWindow +{ +public: + wxDatePopupInternal(wxWindow *parent) : wxPopupTransientWindow(parent) { } + + void ShowAt(int x, int y) + { + Position(wxPoint(x, y), wxSize(0, 0)); + Popup(); + } + + void Hide() + { + Dismiss(); + } +}; + +#else // !wxUSE_POPUPWIN + +class wxDatePopupInternal : public wxDialog +{ +public: + wxDatePopupInternal(wxWindow *parent) + : wxDialog(parent, + wxID_ANY, + wxEmptyString, + wxDefaultPosition, + wxDefaultSize, + wxSIMPLE_BORDER) + { + } + + void ShowAt(int x, int y) + { + Show(); + Move(x, y); + } + + void Hide() + { + wxDialog::Hide(); + } +}; + +#endif // wxUSE_POPUPWIN/!wxUSE_POPUPWIN + +// ============================================================================ +// 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() + +#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) { wxASSERT_MSG( !(style & wxDP_SPIN), _T("wxDP_SPIN style not supported, use wxDP_DEFAULT") ); - wxString txt; - if (date.IsValid()) - txt = date.FormatDate(); - if ( !wxControl::Create(parent, id, pos, size, style | wxCLIP_CHILDREN | wxWANTS_CHARS, - wxDefaultValidator, name) ) + validator, name) ) { return false; } - SetWindowStyle(style | wxWANTS_CHARS); InheritAttributes(); - wxBitmap bmp(8, 4); - { - wxMemoryDC dc; + m_txt = new wxTextCtrl(this, CTRLID_TXT, wxEmptyString, wxDefaultPosition, wxDefaultSize, TXTCTRL_FLAGS); - 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->Connect(wxEVT_KEY_DOWN, + wxKeyEventHandler(wxDatePickerCtrlGeneric::OnEditKey), + NULL, this); + m_txt->Connect(wxEVT_KILL_FOCUS, + wxFocusEventHandler(wxDatePickerCtrlGeneric::OnKillFocus), + NULL, this); - m_txt=new wxTextCtrl(this, CTRLID_TXT, txt); - m_txt->Connect(wxID_ANY, wxID_ANY, wxEVT_KEY_DOWN, - (wxObjectEventFunction)&wxDatePickerCtrl::OnEditKey, - 0, this); - m_txt->Connect(wxID_ANY, wxID_ANY, wxEVT_KILL_FOCUS, - (wxObjectEventFunction)&wxDatePickerCtrl::OnKillFocus, - 0, this); - SetFormat(wxT("%x")); + const int height = m_txt->GetBestSize().y - BUTTONBORDER; - m_btn = new wxBitmapButton(this, CTRLID_BTN, bmp); + m_btn = new wxDropdownButton(this, CTRLID_BTN, wxDefaultPosition, wxSize(height, height)); - m_dlg = new wxDialog(this, CTRLID_CAL, wxEmptyString, - wxDefaultPosition, wxDefaultSize, - wxSIMPLE_BORDER); - m_dlg->SetFont(GetFont()); + m_popup = new wxDatePopupInternal(this); + m_popup->SetFont(GetFont()); - wxPanel *panel=new wxPanel(m_dlg, CTRLID_PAN, + 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, + wxPoint(0, 0), wxDefaultSize, wxCAL_SHOW_HOLIDAYS | wxSUNKEN_BORDER); - m_cal->Connect(CTRLID_CAL, CTRLID_CAL, wxEVT_CALENDAR_SEL_CHANGED, - (wxObjectEventFunction)&wxDatePickerCtrl::OnSelChange, - 0, this); - m_cal->Connect(wxID_ANY, wxID_ANY, wxEVT_KEY_DOWN, - (wxObjectEventFunction)&wxDatePickerCtrl::OnCalKey, - 0, this); - m_cal->Connect(CTRLID_CAL, CTRLID_CAL, wxEVT_CALENDAR_DOUBLECLICKED, - (wxObjectEventFunction)&wxDatePickerCtrl::OnSelChange, - 0, this); - m_cal->Connect(CTRLID_CAL, CTRLID_CAL, wxEVT_CALENDAR_DAY_CHANGED, - (wxObjectEventFunction)&wxDatePickerCtrl::OnSelChange, - 0, this); - m_cal->Connect(CTRLID_CAL, CTRLID_CAL, wxEVT_CALENDAR_MONTH_CHANGED, - (wxObjectEventFunction)&wxDatePickerCtrl::OnSelChange, - 0, this); - m_cal->Connect(CTRLID_CAL, CTRLID_CAL, wxEVT_CALENDAR_YEAR_CHANGED, - (wxObjectEventFunction)&wxDatePickerCtrl::OnSelChange, - 0, this); + m_cal->Connect(wxEVT_CALENDAR_SEL_CHANGED, + wxCalendarEventHandler(wxDatePickerCtrlGeneric::OnSelChange), + NULL, this); + m_cal->Connect(wxEVT_KEY_DOWN, + wxKeyEventHandler(wxDatePickerCtrlGeneric::OnCalKey), + NULL, this); + m_cal->Connect(wxEVT_CALENDAR_DOUBLECLICKED, + wxCalendarEventHandler(wxDatePickerCtrlGeneric::OnSelChange), + NULL, this); + m_cal->Connect(wxEVT_CALENDAR_DAY_CHANGED, + wxCalendarEventHandler(wxDatePickerCtrlGeneric::OnSelChange), + NULL, this); + m_cal->Connect(wxEVT_CALENDAR_MONTH_CHANGED, + wxCalendarEventHandler(wxDatePickerCtrlGeneric::OnSelChange), + NULL, this); + m_cal->Connect(wxEVT_CALENDAR_YEAR_CHANGED, + wxCalendarEventHandler(wxDatePickerCtrlGeneric::OnSelChange), + NULL, this); wxWindow *yearControl = m_cal->GetYearControl(); - Connect(wxID_ANY, wxID_ANY, wxEVT_SET_FOCUS, - (wxObjectEventFunction)&wxDatePickerCtrl::OnSetFocus); + Connect(wxEVT_SET_FOCUS, + wxFocusEventHandler(wxDatePickerCtrlGeneric::OnSetFocus)); wxClientDC dc(yearControl); - dc.SetFont(m_font); + dc.SetFont(yearControl->GetFont()); wxCoord width, dummy; dc.GetTextExtent(wxT("2000"), &width, &dummy); - width += ConvertDialogToPixels(wxSize(20,0)).x; + width += ConvertDialogToPixels(wxSize(20, 0)).x; wxSize calSize = m_cal->GetBestSize(); wxSize yearSize = yearControl->GetSize(); @@ -171,11 +379,7 @@ bool wxDatePickerCtrl::Create(wxWindow *parent, wxPoint yearPosition = yearControl->GetPosition(); -#ifdef __WXMSW__ -#define CALBORDER 0 -#else -#define CALBORDER 4 -#endif + SetFormat(wxT("%x")); width = yearPosition.x + yearSize.x+2+CALBORDER/2; if (width < calSize.x-4) @@ -195,15 +399,20 @@ bool wxDatePickerCtrl::Create(wxWindow *parent, panel->SetClientSize(width+CALBORDER/2, calSize.y-2+CALBORDER); - m_dlg->SetClientSize(panel->GetSize()); + m_popup->SetClientSize(panel->GetSize()); + m_popup->Hide(); - return TRUE; + SetValue(date.IsValid() ? date : wxDateTime::Today()); + + SetBestFittingSize(size); + + return true; } -void wxDatePickerCtrl::Init() +void wxDatePickerCtrlGeneric::Init() { - m_dlg = NULL; + m_popup = NULL; m_txt = NULL; m_cal = NULL; m_btn = NULL; @@ -213,18 +422,18 @@ void wxDatePickerCtrl::Init() } -bool wxDatePickerCtrl::Destroy() +bool wxDatePickerCtrlGeneric::Destroy() { if (m_cal) m_cal->Destroy(); - if (m_dlg) - m_dlg->Destroy(); + if (m_popup) + m_popup->Destroy(); if (m_txt) m_txt->Destroy(); if (m_btn) m_btn->Destroy(); - m_dlg = NULL; + m_popup = NULL; m_txt = NULL; m_cal = NULL; m_btn = NULL; @@ -236,20 +445,20 @@ bool wxDatePickerCtrl::Destroy() // overridden base class methods // ---------------------------------------------------------------------------- -void wxDatePickerCtrl::DoMoveWindow(int x, int y, int w, int h) +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; - 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); + m_txt->SetSize(0, TXTPOSY, w-bs.x-RIGHTBUTTONBORDER, h > eh ? eh-TXTPOSY : h-TXTPOSY); + m_btn->SetSize(w - bs.x-RIGHTBUTTONBORDER, TOPBUTTONBORDER, bs.x, h > bs.y ? bs.y : h); if (m_dropped) - DropDown(); + DropDown(true); } -wxSize wxDatePickerCtrl::DoGetBestSize() const +wxSize wxDatePickerCtrlGeneric::DoGetBestSize() const { int bh=m_btn->GetBestSize().y; int eh=m_txt->GetBestSize().y; @@ -257,55 +466,57 @@ wxSize wxDatePickerCtrl::DoGetBestSize() const } -bool wxDatePickerCtrl::Show(bool show) +bool wxDatePickerCtrlGeneric::Show(bool show) { if ( !wxControl::Show(show) ) { - return FALSE; + return false; } - if (!show) + if ( !show ) { - if (m_dlg) + if ( m_popup ) { - m_dlg->Hide(); + m_popup->Hide(); m_dropped = false; } } - return TRUE; + return true; } -bool wxDatePickerCtrl::Enable(bool enable) +bool wxDatePickerCtrlGeneric::Enable(bool enable) { if ( !wxControl::Enable(enable) ) { - return FALSE; + return false; } - if (!enable) + if ( !enable ) { - if (m_cal) - m_cal->Hide(); + if ( m_popup ) + m_popup->Hide(); } - if (m_btn) + + if ( m_btn ) m_btn->Enable(enable); - return TRUE; + + return true; } // ---------------------------------------------------------------------------- -// wxDatePickerCtrl API +// wxDatePickerCtrlGeneric API // ---------------------------------------------------------------------------- bool -wxDatePickerCtrl::SetDateRange(const wxDateTime& lowerdate, - const wxDateTime& upperdate) +wxDatePickerCtrlGeneric::SetDateRange(const wxDateTime& lowerdate, + const wxDateTime& upperdate) { return m_cal->SetDateRange(lowerdate, upperdate); } -bool wxDatePickerCtrl::SetFormat(const wxChar *fmt) +bool wxDatePickerCtrlGeneric::SetFormat(const wxChar *fmt) { wxDateTime dt; dt.ParseFormat(wxT("2003-10-13"), wxT("%Y-%m-%d")); @@ -332,58 +543,73 @@ bool wxDatePickerCtrl::SetFormat(const wxChar *fmt) m_format.Append(wxT("%Y")); p += 4; } + else if (n == (dt.GetYear() % 100)) + { + if (GetWindowStyle() & wxDP_SHOWCENTURY) + m_format.Append(wxT("%Y")); + else + m_format.Append(wxT("%y")); + p += 2; + } else m_format.Append(*p++); } if (m_txt) { - wxStringList valList; - wxChar c; - for (c='0'; c <= '9'; c++) - valList.Add(wxString(c, 1)); - wxChar *p=(wxChar*)m_format.c_str(); + wxArrayString allowedChars; + for ( wxChar c = _T('0'); c <= _T('9'); c++ ) + allowedChars.Add(wxString(c, 1)); + + const wxChar *p = m_format.c_str(); while (*p) { if (*p == '%') p += 2; else - valList.Add(wxString(*p++, 1)); + allowedChars.Add(wxString(*p++, 1)); } - wxTextValidator tv(wxFILTER_INCLUDE_CHAR_LIST); - tv.SetIncludeList(valList); +#if wxUSE_VALIDATORS + wxTextValidator tv(wxFILTER_INCLUDE_CHAR_LIST); + tv.SetIncludes(allowedChars); m_txt->SetValidator(tv); +#endif + + if (m_currentDate.IsValid()) + m_txt->SetValue(m_currentDate.Format(m_format)); } + return true; } -wxDateTime wxDatePickerCtrl::GetValue() const +wxDateTime wxDatePickerCtrlGeneric::GetValue() const { - wxDateTime dt; - wxString txt=m_txt->GetValue(); - - if (!txt.IsEmpty()) - dt.ParseFormat(txt, m_format); - - return dt; + return m_currentDate; } -void wxDatePickerCtrl::SetValue(const wxDateTime& date) +void wxDatePickerCtrlGeneric::SetValue(const wxDateTime& date) { if (m_cal) { if (date.IsValid()) - m_txt->SetValue(date.FormatDate()); + m_txt->SetValue(date.Format(m_format)); else + { + wxASSERT_MSG( HasFlag(wxDP_ALLOWNONE), + _T("this control must have a valid date") ); + m_txt->SetValue(wxEmptyString); + } + + m_currentDate = date; } } -bool wxDatePickerCtrl::GetRange(wxDateTime *dt1, wxDateTime *dt2) const +bool wxDatePickerCtrlGeneric::GetRange(wxDateTime *dt1, wxDateTime *dt2) const { if (dt1) *dt1 = m_cal->GetLowerDateLimit(); @@ -393,7 +619,8 @@ bool wxDatePickerCtrl::GetRange(wxDateTime *dt1, wxDateTime *dt2) const } -void wxDatePickerCtrl::SetRange(const wxDateTime &dt1, const wxDateTime &dt2) +void +wxDatePickerCtrlGeneric::SetRange(const wxDateTime &dt1, const wxDateTime &dt2) { m_cal->SetDateRange(dt1, dt2); } @@ -402,37 +629,37 @@ void wxDatePickerCtrl::SetRange(const wxDateTime &dt1, const wxDateTime &dt2) // event handlers // ---------------------------------------------------------------------------- -void wxDatePickerCtrl::DropDown(bool down) +void wxDatePickerCtrlGeneric::DropDown(bool down) { - if (m_dlg) + if (m_popup) { if (down) { - if (m_txt->GetValue().IsEmpty()) - m_cal->SetDate(wxDateTime::Today()); - else - { - wxDateTime dt; + wxDateTime dt; + if (!m_txt->GetValue().empty()) dt.ParseFormat(m_txt->GetValue(), m_format); + + if (dt.IsValid()) m_cal->SetDate(dt); - } - wxPoint pos=GetParent()->ClientToScreen(GetPosition()); + else + m_cal->SetDate(wxDateTime::Today()); - m_dlg->Move(pos.x, pos.y + GetSize().y); - m_dlg->Show(); + wxPoint pos=GetParent()->ClientToScreen(GetPosition()); + m_popup->ShowAt(pos.x, pos.y + GetSize().y); m_dropped = true; + m_cal->SetFocus(); } else { if (m_dropped) - m_dlg->Hide(); + m_popup->Hide(); m_dropped = false; } } } -void wxDatePickerCtrl::OnChildSetFocus(wxChildFocusEvent &ev) +void wxDatePickerCtrlGeneric::OnChildSetFocus(wxChildFocusEvent &ev) { ev.Skip(); m_ignoreDrop = false; @@ -440,7 +667,7 @@ void wxDatePickerCtrl::OnChildSetFocus(wxChildFocusEvent &ev) wxWindow *w=(wxWindow*)ev.GetEventObject(); while (w) { - if (w == m_dlg) + if (w == m_popup) return; w = w->GetParent(); } @@ -454,7 +681,7 @@ void wxDatePickerCtrl::OnChildSetFocus(wxChildFocusEvent &ev) } -void wxDatePickerCtrl::OnClick(wxCommandEvent& event) +void wxDatePickerCtrlGeneric::OnClick(wxCommandEvent& WXUNUSED(event)) { if (m_ignoreDrop) { @@ -469,34 +696,50 @@ void wxDatePickerCtrl::OnClick(wxCommandEvent& event) } -void wxDatePickerCtrl::OnSetFocus(wxFocusEvent &ev) +void wxDatePickerCtrlGeneric::OnSetFocus(wxFocusEvent& WXUNUSED(ev)) { if (m_txt) { m_txt->SetFocus(); - m_txt->SetSelection(0, 100); + m_txt->SetSelection(-1, -1); // select everything } } -void wxDatePickerCtrl::OnKillFocus(wxFocusEvent &ev) +void wxDatePickerCtrlGeneric::OnKillFocus(wxFocusEvent &ev) { ev.Skip(); wxDateTime dt; dt.ParseFormat(m_txt->GetValue(), m_format); - if (!dt.IsValid()) - m_txt->SetValue(wxEmptyString); - else + if ( !dt.IsValid() ) + { + if ( !HasFlag(wxDP_ALLOWNONE) ) + dt = m_currentDate; + } + + if(dt.IsValid()) m_txt->SetValue(dt.Format(m_format)); + else + m_txt->SetValue(wxEmptyString); + + // notify that we had to change the date after validation + if ( (dt.IsValid() && m_currentDate != dt) || + (!dt.IsValid() && m_currentDate.IsValid()) ) + { + m_currentDate = dt; + wxDateEvent event(this, dt, wxEVT_DATE_CHANGED); + GetEventHandler()->ProcessEvent(event); + } } -void wxDatePickerCtrl::OnSelChange(wxCalendarEvent &ev) +void wxDatePickerCtrlGeneric::OnSelChange(wxCalendarEvent &ev) { if (m_cal) { - m_txt->SetValue(m_cal->GetDate().FormatDate()); + m_currentDate = m_cal->GetDate(); + m_txt->SetValue(m_currentDate.Format(m_format)); if (ev.GetEventType() == wxEVT_CALENDAR_DOUBLECLICKED) { DropDown(false); @@ -506,20 +749,23 @@ void wxDatePickerCtrl::OnSelChange(wxCalendarEvent &ev) ev.SetEventObject(this); ev.SetId(GetId()); GetParent()->ProcessEvent(ev); + + wxDateEvent dev(this, ev.GetDate(), wxEVT_DATE_CHANGED); + GetParent()->ProcessEvent(dev); } -void wxDatePickerCtrl::OnText(wxCommandEvent &ev) +void wxDatePickerCtrlGeneric::OnText(wxCommandEvent &ev) { ev.SetEventObject(this); ev.SetId(GetId()); GetParent()->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 + wxString txt = m_txt->GetValue(); wxDateTime dt; - if (!txt.IsEmpty()) + if (!txt.empty()) { dt.ParseFormat(txt, m_format); if (!dt.IsValid()) @@ -532,19 +778,22 @@ void wxDatePickerCtrl::OnText(wxCommandEvent &ev) cev.SetDate(dt); GetParent()->ProcessEvent(cev); + + wxDateEvent dev(this, dt, wxEVT_DATE_CHANGED); + GetParent()->ProcessEvent(dev); } -void wxDatePickerCtrl::OnEditKey(wxKeyEvent & ev) +void wxDatePickerCtrlGeneric::OnEditKey(wxKeyEvent & ev) { if (ev.GetKeyCode() == WXK_DOWN && !ev.HasModifiers()) - DropDown(); + DropDown(true); else ev.Skip(); } -void wxDatePickerCtrl::OnCalKey(wxKeyEvent & ev) +void wxDatePickerCtrlGeneric::OnCalKey(wxKeyEvent & ev) { if (ev.GetKeyCode() == WXK_ESCAPE && !ev.HasModifiers()) DropDown(false); @@ -552,3 +801,7 @@ void wxDatePickerCtrl::OnCalKey(wxKeyEvent & ev) ev.Skip(); } +#endif // wxUSE_DATEPICKCTRL_GENERIC + +#endif // wxUSE_DATEPICKCTRL +