X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/d1b736b7968ceea4233f3fceecdb01173f68a9a3..69562a1d4c4c8d96116af3f229fa2269828c4489:/src/generic/datectlg.cpp diff --git a/src/generic/datectlg.cpp b/src/generic/datectlg.cpp index 3c5d6933b8..6527a991b6 100644 --- a/src/generic/datectlg.cpp +++ b/src/generic/datectlg.cpp @@ -113,7 +113,7 @@ public: wxPoint yearPosition = yearControl->GetPosition(); - SetFormat(wxT("%x")); + SetFormat("%x"); width = yearPosition.x + yearSize.x+2+CALBORDER/2; if (width < calSize.x-4) @@ -181,7 +181,7 @@ public: if ( !s.empty() ) { - pDt->ParseFormat(s, m_format); + pDt->ParseFormat(s.c_str(), m_format); if ( !pDt->IsValid() ) return false; } @@ -259,7 +259,7 @@ private: return m_combo->GetParent()->HasFlag(flag); } - bool SetFormat(const wxChar *fmt) + bool SetFormat(const wxString& fmt) { m_format.clear();