From cac85ffa8bb47cf8a103bf4b38e407383c2d0302 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=A1clav=20Slav=C3=ADk?= Date: Sat, 2 Nov 2002 12:26:02 +0000 Subject: [PATCH] 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 --- contrib/utils/wxrc/wxrc.cpp | 8 +++++++- utils/wxrc/wxrc.cpp | 8 +++++++- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/contrib/utils/wxrc/wxrc.cpp b/contrib/utils/wxrc/wxrc.cpp index 3cd90a1d95..3864178587 100644 --- a/contrib/utils/wxrc/wxrc.cpp +++ b/contrib/utils/wxrc/wxrc.cpp @@ -580,7 +580,13 @@ static wxString ConvertText(const wxString& str) case wxT('\n') : str2 << wxT("\\n"); break; case wxT('\t') : str2 << wxT("\\t"); 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; default : str2 << *dt; break; } diff --git a/utils/wxrc/wxrc.cpp b/utils/wxrc/wxrc.cpp index 3cd90a1d95..3864178587 100644 --- a/utils/wxrc/wxrc.cpp +++ b/utils/wxrc/wxrc.cpp @@ -580,7 +580,13 @@ static wxString ConvertText(const wxString& str) case wxT('\n') : str2 << wxT("\\n"); break; case wxT('\t') : str2 << wxT("\\t"); 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; default : str2 << *dt; break; }