renamed global variable to avoid conflict with export from Mac OS X framework

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

diff --git a/utils/tex2rtf/src/tex2rtf.cpp b/utils/tex2rtf/src/tex2rtf.cpp
index 425b82807534e5d04f9f0f95b1d5dc75406da1e5..0730851bf7b1a1f3e46d1b06906ae69c988d1efc 100644 (file)
--- a/utils/tex2rtf/src/tex2rtf.cpp
+++ b/utils/tex2rtf/src/tex2rtf.cpp
@@ -119,7 +119,7 @@ char *ContentsName = NULL;    // Contents page from last time around
 char *TmpContentsName = NULL; // Current contents page
 char *TmpFrameContentsName = NULL; // Current frame contents page
 char *WinHelpContentsFileName = NULL; // WinHelp .cnt file
 char *TmpContentsName = NULL; // Current contents page
 char *TmpFrameContentsName = NULL; // Current frame contents page
 char *WinHelpContentsFileName = NULL; // WinHelp .cnt file

-char *RefName = NULL;         // Reference file name
+char *RefFileName = NULL;         // Reference file name

 
 char *RTFCharset = copystring("ansi");
 
 
 char *RTFCharset = copystring("ansi");
 


@@ -161,7 +161,7 @@ bool MyApp::OnInit()
   TmpContentsName = new char[300];
   TmpFrameContentsName = new char[300];
   WinHelpContentsFileName = new char[300];
   TmpContentsName = new char[300];
   TmpFrameContentsName = new char[300];
   WinHelpContentsFileName = new char[300];

-  RefName = new char[300];
+  RefFileName = new char[300];

 
   ColourTable.DeleteContents(TRUE);
 
 
   ColourTable.DeleteContents(TRUE);
 


@@ -530,10 +530,10 @@ int MyApp::OnExit()
       delete WinHelpContentsFileName;
       WinHelpContentsFileName = NULL;
     }
       delete WinHelpContentsFileName;
       WinHelpContentsFileName = NULL;
     }

-    if (RefName)
+    if (RefFileName)

     {
     {

-      delete RefName;
-      RefName = NULL;
+      delete RefFileName;
+      RefFileName = NULL;

     }
     if (TopLevel)
     {
     }
     if (TopLevel)
     {


@@ -954,7 +954,7 @@ bool Go(void)
   sprintf(TmpContentsName, "%s.cn1", FileRoot);
   sprintf(TmpFrameContentsName, "%s.frc", FileRoot);
   sprintf(WinHelpContentsFileName, "%s.cnt", FileRoot);
   sprintf(TmpContentsName, "%s.cn1", FileRoot);
   sprintf(TmpFrameContentsName, "%s.frc", FileRoot);
   sprintf(WinHelpContentsFileName, "%s.cnt", FileRoot);

-  sprintf(RefName, "%s.ref", FileRoot);
+  sprintf(RefFileName, "%s.ref", FileRoot);

 
   TexPathList.EnsureFileAccessible(InputFile);
   if (!bulletFile)
 
   TexPathList.EnsureFileAccessible(InputFile);
   if (!bulletFile)


@@ -967,8 +967,8 @@ bool Go(void)
     }
   }
 
     }
   }
 

-  if (wxFileExists(RefName))
-    ReadTexReferences(RefName);
+  if (wxFileExists(RefFileName))
+    ReadTexReferences(RefFileName);

 
   bool success = FALSE;
 
 
   bool success = FALSE;
 


@@ -1027,7 +1027,7 @@ bool Go(void)
 
   if (success)
   {
 
   if (success)
   {

-    WriteTexReferences(RefName);
+    WriteTexReferences(RefFileName);

     TexCleanUp();
     startedSections = FALSE;
 
     TexCleanUp();
     startedSections = FALSE;