X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a9e41db760792a4e666492d77290f4c51e9c5b19..da6f998486f1070e205f2e0a54f22a1b67cb32a4:/src/generic/datectlg.cpp diff --git a/src/generic/datectlg.cpp b/src/generic/datectlg.cpp index 2ebe9c7c4b..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 ///////////////////////////////////////////////////////////////////////////// @@ -130,7 +129,7 @@ public: if ( !s.empty() ) { - pDt->ParseFormat(s.c_str(), m_format); + pDt->ParseFormat(s, m_format); if ( !pDt->IsValid() ) return false; } @@ -209,11 +208,15 @@ private: // functions honours wxDP_SHOWCENTURY flag. wxString GetLocaleDateFormat() const { +#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 } bool SetFormat(const wxString& fmt) @@ -375,7 +378,19 @@ 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