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/collheaderctrl.h
View File

@@ -35,7 +35,7 @@ public:
const wxSize& size = wxDefaultSize,
long style = wxBORDER_NONE,
const wxValidator& validator = wxDefaultValidator,
const wxString& name = wxCollapsibleHeaderCtrlNameStr)
const wxString& name = wxASCII_STR(wxCollapsibleHeaderCtrlNameStr))
{
Create(parent, id, label, pos, size, style, validator, name);
}
@@ -47,7 +47,7 @@ public:
const wxSize& size = wxDefaultSize,
long style = wxBORDER_NONE,
const wxValidator& validator = wxDefaultValidator,
const wxString& name = wxCollapsibleHeaderCtrlNameStr)
const wxString& name = wxASCII_STR(wxCollapsibleHeaderCtrlNameStr))
{
if ( !wxControl::Create(parent, id, pos, size, style, validator, name) )
return false;
@@ -91,7 +91,7 @@ public:
const wxSize& size = wxDefaultSize,
long style = wxBORDER_NONE,
const wxValidator& validator = wxDefaultValidator,
const wxString& name = wxCollapsibleHeaderCtrlNameStr)
const wxString& name = wxASCII_STR(wxCollapsibleHeaderCtrlNameStr))
{
Create(parent, id, label, pos, size, style, validator, name);
}