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

8
include/wx/qt/listbox.h
View File

@@ -22,7 +22,7 @@ public:
int n = 0, const wxString choices[] = NULL,
long style = 0,
const wxValidator& validator = wxDefaultValidator,
const wxString& name = wxListBoxNameStr);
const wxString& name = wxASCII_STR(wxListBoxNameStr));
wxListBox(wxWindow *parent, wxWindowID id,
const wxPoint& pos,
@@ -30,7 +30,7 @@ public:
const wxArrayString& choices,
long style = 0,
const wxValidator& validator = wxDefaultValidator,
const wxString& name = wxListBoxNameStr);
const wxString& name = wxASCII_STR(wxListBoxNameStr));
virtual ~wxListBox();
@@ -40,14 +40,14 @@ public:
int n = 0, const wxString choices[] = NULL,
long style = 0,
const wxValidator& validator = wxDefaultValidator,
const wxString& name = wxListBoxNameStr);
const wxString& name = wxASCII_STR(wxListBoxNameStr));
bool Create(wxWindow *parent, wxWindowID id,
const wxPoint& pos,
const wxSize& size,
const wxArrayString& choices,
long style = 0,
const wxValidator& validator = wxDefaultValidator,
const wxString& name = wxListBoxNameStr);
const wxString& name = wxASCII_STR(wxListBoxNameStr));
virtual bool IsSelected(int n) const wxOVERRIDE;
virtual int GetSelections(wxArrayInt& aSelections) const wxOVERRIDE;