Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use wxASCII_STR() on string literals

Browse Source 
Fix the build with wxNO_IMPLICIT_WXSTRING_ENCODING.
This commit is contained in:
Arrigo Marchiori
2019-10-22 12:34:29 +02:00
committed by Vadim Zeitlin
parent 65cbf40b7e
commit c86bcf962d
351 changed files with 965 additions and 950 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
include/wx/generic/listctrl.h
View File

@@ -46,7 +46,7 @@ public:
const wxSize &size = wxDefaultSize,
long style = wxLC_ICON,
const wxValidator& validator = wxDefaultValidator,
const wxString &name = wxListCtrlNameStr)
const wxString &name = wxASCII_STR(wxListCtrlNameStr))
: wxScrollHelper(this)
{
Create(parent, winid, pos, size, style, validator, name);
@@ -62,7 +62,7 @@ public:
const wxSize &size = wxDefaultSize,
long style = wxLC_ICON,
const wxValidator& validator = wxDefaultValidator,
const wxString &name = wxListCtrlNameStr);
const wxString &name = wxASCII_STR(wxListCtrlNameStr));
bool GetColumn( int col, wxListItem& item ) const wxOVERRIDE;
bool SetColumn( int col, const wxListItem& item ) wxOVERRIDE;
@@ -258,7 +258,7 @@ public:
const wxSize& size = wxDefaultSize,
long style = wxLC_ICON,
const wxValidator &validator = wxDefaultValidator,
const wxString &name = wxListCtrlNameStr)
const wxString &name = wxASCII_STR(wxListCtrlNameStr))
: wxGenericListCtrl(parent, winid, pos, size, style, validator, name)
{
}