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
@@ -15,6 +15,7 @@
|
||||
#include "wx/bitmap.h"
|
||||
|
||||
class WXDLLIMPEXP_FWD_CORE wxSelectionStore;
|
||||
|
||||
extern WXDLLIMPEXP_DATA_CORE(const char) wxVListBoxNameStr[];
|
||||
|
||||
// ----------------------------------------------------------------------------
|
||||
@@ -45,7 +46,7 @@ public:
|
||||
const wxPoint& pos = wxDefaultPosition,
|
||||
const wxSize& size = wxDefaultSize,
|
||||
long style = 0,
|
||||
const wxString& name = wxVListBoxNameStr)
|
||||
const wxString& name = wxASCII_STR(wxVListBoxNameStr))
|
||||
{
|
||||
Init();
|
||||
|
||||
@@ -63,7 +64,7 @@ public:
|
||||
const wxPoint& pos = wxDefaultPosition,
|
||||
const wxSize& size = wxDefaultSize,
|
||||
long style = 0,
|
||||
const wxString& name = wxVListBoxNameStr);
|
||||
const wxString& name = wxASCII_STR(wxVListBoxNameStr));
|
||||
|
||||
// dtor does some internal cleanup (deletes m_selStore if any)
|
||||
virtual ~wxVListBox();
|
||||
|
Reference in New Issue
Block a user