X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2fda1fe5fd9bad33a2976eef9f8060d29d4bdd40..6ba718d7aee2f519d9146b90424ccec9e2243479:/src/generic/datectlg.cpp diff --git a/src/generic/datectlg.cpp b/src/generic/datectlg.cpp index 5028bb79b0..6ea3d01c4a 100644 --- a/src/generic/datectlg.cpp +++ b/src/generic/datectlg.cpp @@ -4,7 +4,6 @@ // Author: Andreas Pflug // Modified by: // Created: 2005-01-19 -// RCS-ID: $Id$ // Copyright: (c) 2005 Andreas Pflug // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -25,46 +24,25 @@ #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 @@ -96,42 +74,13 @@ public: { 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; + SetFormat(GetLocaleDateFormat()); - wxSize calSize = wxCalendarCtrl::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; - } - 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 ) @@ -158,16 +107,20 @@ public: 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); } + } - SetDate(date); + bool IsTextEmpty() const + { + return m_combo->GetTextCtrl()->IsEmpty(); } bool ParseDateTime(const wxString& s, wxDateTime* pDt) @@ -176,7 +129,7 @@ public: if ( !s.empty() ) { - pDt->ParseFormat(s.c_str(), m_format); + pDt->ParseFormat(s, m_format); if ( !pDt->IsValid() ) return false; } @@ -186,14 +139,10 @@ public: 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); + wxCalendarEvent cev(datePicker, dt, wxEVT_CALENDAR_SEL_CHANGED); datePicker->GetEventHandler()->ProcessEvent(cev); wxDateEvent event(datePicker, dt, wxEVT_DATE_CHANGED); @@ -238,6 +187,9 @@ private: 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() && (!dtOld.IsValid() || dt != dtOld)) || (!dt.IsValid() && dtOld.IsValid()) ) @@ -247,54 +199,34 @@ private: } } - bool HasDPFlag(int flag) + bool HasDPFlag(int flag) const { return m_combo->GetParent()->HasFlag(flag); } - bool SetFormat(const wxString& 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(); @@ -322,11 +254,9 @@ private: virtual void SetStringValue(const wxString& s) { wxDateTime dt; - if ( ParseDateTime(s, &dt) ) + if ( !s.empty() && ParseDateTime(s, &dt) ) SetDate(dt); - else if ( HasDPFlag(wxDP_ALLOWNONE) ) - SetDate(wxInvalidDateTime); - //else: !wxDP_ALLOWNONE, keep the old value + //else: keep the old value } virtual wxString GetStringValue() const @@ -356,9 +286,7 @@ private: 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() @@ -391,7 +319,7 @@ bool wxDatePickerCtrlGeneric::Create(wxWindow *parent, 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, @@ -450,7 +378,27 @@ bool wxDatePickerCtrlGeneric::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; } // ---------------------------------------------------------------------------- @@ -467,6 +415,8 @@ wxDatePickerCtrlGeneric::SetDateRange(const wxDateTime& lowerdate, wxDateTime wxDatePickerCtrlGeneric::GetValue() const { + if ( HasFlag(wxDP_ALLOWNONE) && m_popup->IsTextEmpty() ) + return wxInvalidDateTime; return m_popup->GetDate(); } @@ -479,11 +429,7 @@ void wxDatePickerCtrlGeneric::SetValue(const wxDateTime& date) 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); } @@ -521,7 +467,7 @@ void wxDatePickerCtrlGeneric::OnText(wxCommandEvent &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); @@ -534,7 +480,5 @@ void wxDatePickerCtrlGeneric::OnFocus(wxFocusEvent& WXUNUSED(event)) } -#endif // wxUSE_DATEPICKCTRL_GENERIC - #endif // wxUSE_DATEPICKCTRL