Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

merged 2.4 branch into the trunk

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18040 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2002-12-04 14:11:26 +00:00
parent 59a944cb63
commit 2b5f62a0b2
1057 changed files with 37805 additions and 24034 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
utils/tex2rtf/src/tex2any.cpp
View File

@@ -146,7 +146,7 @@ char *followedLinkColourString = NULL;
bool combineSubSections = FALSE;
bool htmlWorkshopFiles = FALSE;
bool ignoreBadRefs = FALSE;
char *htmlFaceName = copystring("Times New Roman");
char *htmlFaceName = NULL;
extern int passNumber;
@@ -750,7 +750,7 @@ bool read_a_line(char *buf)
fileNameStr.Replace("\\", "");
// Ignore some types of input files (e.g. macro definition files)
char *fileOnly = FileNameFromPath((char*) (const char*) fileNameStr);
char *fileOnly = wxFileNameFromPath((char*) (const char*) fileNameStr);
currentFileName = fileOnly;
if (IgnorableInputFiles.Member(fileOnly))
return read_a_line(buf);