Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Apply implicit encoding check to wxString::{starts,ends}_with() too

Browse Source 
Don't provide the overloads taking "const char*" when compiling with
wxNO_IMPLICIT_WXSTRING_ENCODING is defined.
This commit is contained in:
Vadim Zeitlin
2020-03-23 15:52:26 +01:00
parent 34c130abfa
commit a2609429a3
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/wx/string.h
View File

@@ -3435,15 +3435,19 @@ public:
bool starts_with(const wxString &str) const bool starts_with(const wxString &str) const
{ return StartsWith(str); } { return StartsWith(str); }
#ifndef wxNO_IMPLICIT_WXSTRING_ENCODING
bool starts_with(const char *sz) const bool starts_with(const char *sz) const
{ return StartsWith(sz); } { return StartsWith(sz); }
#endif // wxNO_IMPLICIT_WXSTRING_ENCODING
bool starts_with(const wchar_t *sz) const bool starts_with(const wchar_t *sz) const
{ return StartsWith(sz); } { return StartsWith(sz); }
bool ends_with(const wxString &str) const bool ends_with(const wxString &str) const
{ return EndsWith(str); } { return EndsWith(str); }
#ifndef wxNO_IMPLICIT_WXSTRING_ENCODING
bool ends_with(const char *sz) const bool ends_with(const char *sz) const
{ return EndsWith(sz); } { return EndsWith(sz); }
#endif // wxNO_IMPLICIT_WXSTRING_ENCODING
bool ends_with(const wchar_t *sz) const bool ends_with(const wchar_t *sz) const
{ return EndsWith(sz); } { return EndsWith(sz); }