first phase of transition to unified Unicode build:
1. changed c_str() to return wxCStrData (implicitly convertible to wxChar*) 2. added template type-safe wrappers for vararg functions 3. added wxUniChar class representing single Unicode character 4. changed wxString::operator[] and wxString::iterator to return wxUniChar git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44865 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -346,7 +346,7 @@ wxString wxExpandEnvVars(const wxString& str)
|
||||
|
||||
size_t m;
|
||||
for ( size_t n = 0; n < str.length(); n++ ) {
|
||||
switch ( str[n] ) {
|
||||
switch ( str[n].GetValue() ) {
|
||||
#ifdef __WXMSW__
|
||||
case wxT('%'):
|
||||
#endif //WINDOWS
|
||||
@@ -362,7 +362,7 @@ wxString wxExpandEnvVars(const wxString& str)
|
||||
bracket = Bracket_None;
|
||||
}
|
||||
else {
|
||||
switch ( str[n + 1] ) {
|
||||
switch ( str[n + 1].GetValue() ) {
|
||||
case wxT('('):
|
||||
bracket = Bracket_Normal;
|
||||
n++; // skip the bracket
|
||||
@@ -434,7 +434,7 @@ wxString wxExpandEnvVars(const wxString& str)
|
||||
}
|
||||
break;
|
||||
|
||||
case '\\':
|
||||
case wxT('\\'):
|
||||
// backslash can be used to suppress special meaning of % and $
|
||||
if ( n != str.length() - 1 &&
|
||||
(str[n + 1] == wxT('%') || str[n + 1] == wxT('$')) ) {
|
||||
|
||||
Reference in New Issue
Block a user