dont use wxChar* arguments in wxDatePickerCtrlGeneric API
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@47004 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -58,7 +58,7 @@ public:
|
|||||||
const wxDateTime& upperdate = wxDefaultDateTime);
|
const wxDateTime& upperdate = wxDefaultDateTime);
|
||||||
|
|
||||||
// extra methods available only in this (generic) implementation
|
// extra methods available only in this (generic) implementation
|
||||||
bool SetFormat(const wxChar *fmt);
|
bool SetFormat(const wxString& fmt);
|
||||||
wxCalendarCtrl *GetCalendar() const { return m_cal; }
|
wxCalendarCtrl *GetCalendar() const { return m_cal; }
|
||||||
|
|
||||||
|
|
||||||
|
@@ -113,7 +113,7 @@ public:
|
|||||||
|
|
||||||
wxPoint yearPosition = yearControl->GetPosition();
|
wxPoint yearPosition = yearControl->GetPosition();
|
||||||
|
|
||||||
SetFormat(wxT("%x"));
|
SetFormat("%x");
|
||||||
|
|
||||||
width = yearPosition.x + yearSize.x+2+CALBORDER/2;
|
width = yearPosition.x + yearSize.x+2+CALBORDER/2;
|
||||||
if (width < calSize.x-4)
|
if (width < calSize.x-4)
|
||||||
@@ -259,7 +259,7 @@ private:
|
|||||||
return m_combo->GetParent()->HasFlag(flag);
|
return m_combo->GetParent()->HasFlag(flag);
|
||||||
}
|
}
|
||||||
|
|
||||||
bool SetFormat(const wxChar *fmt)
|
bool SetFormat(const wxString& fmt)
|
||||||
{
|
{
|
||||||
m_format.clear();
|
m_format.clear();
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user