applied patch #599264 (fixes to wxrc -g)

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@16716 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/contrib/utils/wxrc/wxrc.cpp b/contrib/utils/wxrc/wxrc.cpp
index dd500783005ca2ed182603c29acab098e64e0d2c..ca65863eaf6f3df907f51ab327edb81933847a0a 100644 (file)
--- a/contrib/utils/wxrc/wxrc.cpp
+++ b/contrib/utils/wxrc/wxrc.cpp
@@ -567,6 +567,8 @@ 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('"')  : str2 << wxT("\\\""); break;
                 default        : str2 << *dt; break;
             }
         }

diff --git a/utils/wxrc/wxrc.cpp b/utils/wxrc/wxrc.cpp
index dd500783005ca2ed182603c29acab098e64e0d2c..ca65863eaf6f3df907f51ab327edb81933847a0a 100644 (file)
--- a/utils/wxrc/wxrc.cpp
+++ b/utils/wxrc/wxrc.cpp
@@ -567,6 +567,8 @@ 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('"')  : str2 << wxT("\\\""); break;
                 default        : str2 << *dt; break;
             }
         }