applied patch #630001 (fixes \ escapement)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_4_BRANCH@17667 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -580,7 +580,13 @@ static wxString ConvertText(const wxString& str)
|
|||||||
case wxT('\n') : str2 << wxT("\\n"); break;
|
case wxT('\n') : str2 << wxT("\\n"); break;
|
||||||
case wxT('\t') : str2 << wxT("\\t"); break;
|
case wxT('\t') : str2 << wxT("\\t"); break;
|
||||||
case wxT('\r') : str2 << wxT("\\r"); break;
|
case wxT('\r') : str2 << wxT("\\r"); break;
|
||||||
case wxT('\\') : str2 << wxT("\\\\"); break;
|
case wxT('\\') : if ((*(dt+1) != 'n') &&
|
||||||
|
(*(dt+1) != 't') &&
|
||||||
|
(*(dt+1) != 'r'))
|
||||||
|
str2 << wxT("\\\\");
|
||||||
|
else
|
||||||
|
str2 << wxT("\\");
|
||||||
|
break;
|
||||||
case wxT('"') : str2 << wxT("\\\""); break;
|
case wxT('"') : str2 << wxT("\\\""); break;
|
||||||
default : str2 << *dt; break;
|
default : str2 << *dt; break;
|
||||||
}
|
}
|
||||||
|
@@ -580,7 +580,13 @@ static wxString ConvertText(const wxString& str)
|
|||||||
case wxT('\n') : str2 << wxT("\\n"); break;
|
case wxT('\n') : str2 << wxT("\\n"); break;
|
||||||
case wxT('\t') : str2 << wxT("\\t"); break;
|
case wxT('\t') : str2 << wxT("\\t"); break;
|
||||||
case wxT('\r') : str2 << wxT("\\r"); break;
|
case wxT('\r') : str2 << wxT("\\r"); break;
|
||||||
case wxT('\\') : str2 << wxT("\\\\"); break;
|
case wxT('\\') : if ((*(dt+1) != 'n') &&
|
||||||
|
(*(dt+1) != 't') &&
|
||||||
|
(*(dt+1) != 'r'))
|
||||||
|
str2 << wxT("\\\\");
|
||||||
|
else
|
||||||
|
str2 << wxT("\\");
|
||||||
|
break;
|
||||||
case wxT('"') : str2 << wxT("\\\""); break;
|
case wxT('"') : str2 << wxT("\\\""); break;
|
||||||
default : str2 << *dt; break;
|
default : str2 << *dt; break;
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user