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

@@ -186,7 +186,7 @@ private:
class WXDLLIMPEXP_BASE wxFFileInputStream : public wxInputStream
{
public:
wxFFileInputStream(const wxString& fileName, const wxString& mode = "rb");
wxFFileInputStream(const wxString& fileName, const wxString& mode = wxASCII_STR("rb"));
wxFFileInputStream(wxFFile& file);
wxFFileInputStream(FILE *file);
virtual ~wxFFileInputStream();
@@ -216,7 +216,7 @@ protected:
class WXDLLIMPEXP_BASE wxFFileOutputStream : public wxOutputStream
{
public:
wxFFileOutputStream(const wxString& fileName, const wxString& mode = "wb");
wxFFileOutputStream(const wxString& fileName, const wxString& mode = wxASCII_STR("wb"));
wxFFileOutputStream(wxFFile& file);
wxFFileOutputStream(FILE *file);
virtual ~wxFFileOutputStream();
@@ -249,7 +249,7 @@ class WXDLLIMPEXP_BASE wxFFileStream : public wxFFileInputStream,
public wxFFileOutputStream
{
public:
wxFFileStream(const wxString& fileName, const wxString& mode = "w+b");
wxFFileStream(const wxString& fileName, const wxString& mode = wxASCII_STR("w+b"));
// override some virtual functions to resolve ambiguities, just as in
// wxFileStream