Use wxASCII_STR() on string literals
Fix the build with wxNO_IMPLICIT_WXSTRING_ENCODING.
This commit is contained in:
committed by
Vadim Zeitlin
parent
65cbf40b7e
commit
c86bcf962d
@@ -22,7 +22,7 @@ public:
|
||||
const wxPoint& pos = wxDefaultPosition,
|
||||
const wxSize& size = wxDefaultSize,
|
||||
long style = wxTB_DEFAULT_STYLE | wxNO_BORDER,
|
||||
const wxString& name = wxToolBarNameStr)
|
||||
const wxString& name = wxASCII_STR(wxToolBarNameStr))
|
||||
{
|
||||
Init();
|
||||
|
||||
@@ -36,7 +36,7 @@ public:
|
||||
const wxPoint& pos = wxDefaultPosition,
|
||||
const wxSize& size = wxDefaultSize,
|
||||
long style = wxTB_DEFAULT_STYLE | wxNO_BORDER,
|
||||
const wxString& name = wxToolBarNameStr);
|
||||
const wxString& name = wxASCII_STR(wxToolBarNameStr));
|
||||
|
||||
virtual wxToolBarToolBase *FindToolForPosition(wxCoord x, wxCoord y) const wxOVERRIDE;
|
||||
|
||||
|
Reference in New Issue
Block a user