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

12
include/wx/htmllbox.h
View File

@@ -49,7 +49,7 @@ public:
const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize,
long style = 0,
const wxString& name = wxHtmlListBoxNameStr);
const wxString& name = wxASCII_STR(wxHtmlListBoxNameStr));
// really creates the control and sets the initial number of items in it
// (which may be changed later with SetItemCount())
@@ -62,7 +62,7 @@ public:
const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize,
long style = 0,
const wxString& name = wxHtmlListBoxNameStr);
const wxString& name = wxASCII_STR(wxHtmlListBoxNameStr));
// destructor cleans up whatever resources we use
virtual ~wxHtmlListBox();
@@ -215,7 +215,7 @@ public:
int n = 0, const wxString choices[] = NULL,
long style = wxHLB_DEFAULT_STYLE,
const wxValidator& validator = wxDefaultValidator,
const wxString& name = wxSimpleHtmlListBoxNameStr)
const wxString& name = wxASCII_STR(wxSimpleHtmlListBoxNameStr))
{
Create(parent, id, pos, size, n, choices, style, validator, name);
}
@@ -227,7 +227,7 @@ public:
const wxArrayString& choices,
long style = wxHLB_DEFAULT_STYLE,
const wxValidator& validator = wxDefaultValidator,
const wxString& name = wxSimpleHtmlListBoxNameStr)
const wxString& name = wxASCII_STR(wxSimpleHtmlListBoxNameStr))
{
Create(parent, id, pos, size, choices, style, validator, name);
}
@@ -238,14 +238,14 @@ public:
int n = 0, const wxString choices[] = NULL,
long style = wxHLB_DEFAULT_STYLE,
const wxValidator& validator = wxDefaultValidator,
const wxString& name = wxSimpleHtmlListBoxNameStr);
const wxString& name = wxASCII_STR(wxSimpleHtmlListBoxNameStr));
bool Create(wxWindow *parent, wxWindowID id,
const wxPoint& pos,
const wxSize& size,
const wxArrayString& choices,
long style = wxHLB_DEFAULT_STYLE,
const wxValidator& validator = wxDefaultValidator,
const wxString& name = wxSimpleHtmlListBoxNameStr);
const wxString& name = wxASCII_STR(wxSimpleHtmlListBoxNameStr));
virtual ~wxSimpleHtmlListBox();