Backslashes now allowed in \input filenames

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

diff --git a/utils/tex2rtf/src/tex2any.cpp b/utils/tex2rtf/src/tex2any.cpp
index a408e8a738a6f6e448f3a8109a796b7bc325edba..26519cf47b80fbbd10f86168c0a3a0f0f7468862 100644 (file)
--- a/utils/tex2rtf/src/tex2any.cpp
+++ b/utils/tex2rtf/src/tex2any.cpp
@@ -594,17 +594,21 @@ bool read_a_line(char *buf)
 
     if (buf[j-1] == '}') buf[j-1] = 0; // Ignore final brace
 
 
     if (buf[j-1] == '}') buf[j-1] = 0; // Ignore final brace
 

+    // Remove backslashes from name
+    wxString fileNameStr(fileName);
+    fileNameStr.Replace("\\", "");
+

     // Ignore some types of input files (e.g. macro definition files)
     // Ignore some types of input files (e.g. macro definition files)

-    char *fileOnly = FileNameFromPath(fileName);
+    char *fileOnly = FileNameFromPath((char*) (const char*) fileNameStr);

     currentFileName = fileOnly;
     if (IgnorableInputFiles.Member(fileOnly))
       return read_a_line(buf);
 
     currentFileName = fileOnly;
     if (IgnorableInputFiles.Member(fileOnly))
       return read_a_line(buf);
 

-    wxString actualFile = TexPathList.FindValidPath(fileName);
+    wxString actualFile = TexPathList.FindValidPath(fileNameStr);

     if (actualFile == "")
     {
       char buf2[400];
     if (actualFile == "")
     {
       char buf2[400];

-      sprintf(buf2, "%s.tex", fileName);
+      sprintf(buf2, "%s.tex", (const char*) fileNameStr);

       actualFile = TexPathList.FindValidPath(buf2);
     }
     currentFileName = actualFile;
       actualFile = TexPathList.FindValidPath(buf2);
     }
     currentFileName = actualFile;