From 330e8ab901620162d37729992d902d2adfea9409 Mon Sep 17 00:00:00 2001 From: =?utf8?q?V=C3=A1clav=20Slav=C3=ADk?= Date: Thu, 28 Jun 2007 17:03:42 +0000 Subject: [PATCH] dont use wxChar* arguments in wxDatePickerCtrlGeneric API git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@47004 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/generic/datectrl.h | 2 +- src/generic/datectlg.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/include/wx/generic/datectrl.h b/include/wx/generic/datectrl.h index e6b97d405d..e7e9ffb36b 100644 --- a/include/wx/generic/datectrl.h +++ b/include/wx/generic/datectrl.h @@ -58,7 +58,7 @@ public: const wxDateTime& upperdate = wxDefaultDateTime); // extra methods available only in this (generic) implementation - bool SetFormat(const wxChar *fmt); + bool SetFormat(const wxString& fmt); wxCalendarCtrl *GetCalendar() const { return m_cal; } diff --git a/src/generic/datectlg.cpp b/src/generic/datectlg.cpp index cac86b2505..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) @@ -259,7 +259,7 @@ private: return m_combo->GetParent()->HasFlag(flag); } - bool SetFormat(const wxChar *fmt) + bool SetFormat(const wxString& fmt) { m_format.clear(); -- 2.45.2