Deprecated lib tweaks

[wxWidgets.git] / utils / tex2rtf / src / rtfutils.cpp

diff --git a/utils/tex2rtf/src/rtfutils.cpp b/utils/tex2rtf/src/rtfutils.cpp
index 3e0d934b9e2bf84c85a5054ded91b09fc67717e4..e4e08c30bbefe225afceff8783fbed389dbd835a 100644 (file)
--- a/utils/tex2rtf/src/rtfutils.cpp
+++ b/utils/tex2rtf/src/rtfutils.cpp
@@ -213,18 +213,18 @@ void ResetContentsLevels(int l)
 // : for space.
 void OutputSectionKeyword(FILE *fd)
 {
 // : for space.
 void OutputSectionKeyword(FILE *fd)
 {

-  OutputCurrentSectionToString(wxBuffer);
+  OutputCurrentSectionToString(wxTex2RTFBuffer);

   
   unsigned int i;
   
   unsigned int i;

-  for (i = 0; i < strlen(wxBuffer); i++)
-    if (wxBuffer[i] == ':')
-      wxBuffer[i] = ' ';
+  for (i = 0; i < strlen(wxTex2RTFBuffer); i++)
+    if (wxTex2RTFBuffer[i] == ':')
+      wxTex2RTFBuffer[i] = ' ';

     // Don't write to index if there's some RTF in the string
     // Don't write to index if there's some RTF in the string

-    else if ( wxBuffer[i] == '{' )
+    else if ( wxTex2RTFBuffer[i] == '{' )

         return;
 
   fprintf(fd, "K{\\footnote {K} ");
         return;
 
   fprintf(fd, "K{\\footnote {K} ");

-  fprintf(fd, "%s", wxBuffer);
+  fprintf(fd, "%s", wxTex2RTFBuffer);

   
   fprintf(fd, "}\n");
 }
   
   fprintf(fd, "}\n");
 }


@@ -527,7 +527,7 @@ bool WriteHPJ(char *filename)
   StripExtension(hpjFilename);
   strcat(hpjFilename, ".hpj");
 
   StripExtension(hpjFilename);
   strcat(hpjFilename, ".hpj");
 

-  strcpy(helpFile, FileNameFromPath(filename));
+  strcpy(helpFile, wxFileNameFromPath(filename));

   StripExtension(helpFile);
   strcpy(rtfFile, helpFile);
   strcat(helpFile, ".hlp");
   StripExtension(helpFile);
   strcpy(rtfFile, helpFile);
   strcat(helpFile, ".hlp");


@@ -1113,8 +1113,8 @@ void RTFOnMacro(int macroId, int no_args, bool start)
 
       if (winHelpContents && winHelp && !InPopups())
       {
 
       if (winHelpContents && winHelp && !InPopups())
       {

-        OutputCurrentSectionToString(wxBuffer);
-        WriteWinHelpContentsFileLine(topicName, wxBuffer, 1);
+        OutputCurrentSectionToString(wxTex2RTFBuffer);
+        WriteWinHelpContentsFileLine(topicName, wxTex2RTFBuffer, 1);

       }
       AddTexRef(topicName, NULL, ChapterNameString, chapterNo);
 
       }
       AddTexRef(topicName, NULL, ChapterNameString, chapterNo);
 


@@ -1195,7 +1195,7 @@ void RTFOnMacro(int macroId, int no_args, bool start)
             fprintf(Chapters, "!{\\footnote DisableButton(\"Up\")}\n");
           else
             fprintf(Chapters, "!{\\footnote EnableButton(\"Up\");ChangeButtonBinding(\"Up\", \"JumpId(`%s.hlp', `%s')\")}\n",
             fprintf(Chapters, "!{\\footnote DisableButton(\"Up\")}\n");
           else
             fprintf(Chapters, "!{\\footnote EnableButton(\"Up\");ChangeButtonBinding(\"Up\", \"JumpId(`%s.hlp', `%s')\")}\n",

-               FileNameFromPath(FileRoot), "Contents");
+               wxFileNameFromPath(FileRoot), "Contents");

         }
       }
 
         }
       }
 


@@ -1255,8 +1255,8 @@ void RTFOnMacro(int macroId, int no_args, bool start)
       NotifyParentHasChildren(1);
       if (winHelpContents && winHelp && !InPopups())
       {
       NotifyParentHasChildren(1);
       if (winHelpContents && winHelp && !InPopups())
       {

-        OutputCurrentSectionToString(wxBuffer);
-        WriteWinHelpContentsFileLine(topicName, wxBuffer, 2);
+        OutputCurrentSectionToString(wxTex2RTFBuffer);
+        WriteWinHelpContentsFileLine(topicName, wxTex2RTFBuffer, 2);

       }
       AddTexRef(topicName, NULL, SectionNameString, chapterNo, sectionNo);
 
       }
       AddTexRef(topicName, NULL, SectionNameString, chapterNo, sectionNo);
 


@@ -1350,12 +1350,12 @@ void RTFOnMacro(int macroId, int no_args, bool start)
           if (DocumentStyle == LATEX_ARTICLE)
           {
             fprintf(Sections, "!{\\footnote EnableButton(\"Up\");ChangeButtonBinding(\"Up\", \"JumpId(`%s.hlp', `%s')\")}\n",
           if (DocumentStyle == LATEX_ARTICLE)
           {
             fprintf(Sections, "!{\\footnote EnableButton(\"Up\");ChangeButtonBinding(\"Up\", \"JumpId(`%s.hlp', `%s')\")}\n",

-               FileNameFromPath(FileRoot), "Contents");
+               wxFileNameFromPath(FileRoot), "Contents");

           }
           else if (CurrentChapterName)
           {
             fprintf(Sections, "!{\\footnote EnableButton(\"Up\");ChangeButtonBinding(\"Up\", \"JumpId(`%s.hlp', `%s')\")}\n",
           }
           else if (CurrentChapterName)
           {
             fprintf(Sections, "!{\\footnote EnableButton(\"Up\");ChangeButtonBinding(\"Up\", \"JumpId(`%s.hlp', `%s')\")}\n",

-               FileNameFromPath(FileRoot), CurrentChapterName);
+               wxFileNameFromPath(FileRoot), CurrentChapterName);

           }
         }
       }
           }
         }
       }


@@ -1439,8 +1439,8 @@ void RTFOnMacro(int macroId, int no_args, bool start)
       NotifyParentHasChildren(2);
       if (winHelpContents && winHelp && !InPopups())
       {
       NotifyParentHasChildren(2);
       if (winHelpContents && winHelp && !InPopups())
       {

-        OutputCurrentSectionToString(wxBuffer);
-        WriteWinHelpContentsFileLine(topicName, wxBuffer, 3);
+        OutputCurrentSectionToString(wxTex2RTFBuffer);
+        WriteWinHelpContentsFileLine(topicName, wxTex2RTFBuffer, 3);

       }
       AddTexRef(topicName, NULL, SectionNameString, chapterNo, sectionNo, subsectionNo);
 
       }
       AddTexRef(topicName, NULL, SectionNameString, chapterNo, sectionNo, subsectionNo);
 


@@ -1501,7 +1501,7 @@ void RTFOnMacro(int macroId, int no_args, bool start)
         if (useUpButton && CurrentSectionName)
         {
           fprintf(Subsections, "!{\\footnote EnableButton(\"Up\");ChangeButtonBinding(\"Up\", \"JumpId(`%s.hlp', `%s')\")}\n",
         if (useUpButton && CurrentSectionName)
         {
           fprintf(Subsections, "!{\\footnote EnableButton(\"Up\");ChangeButtonBinding(\"Up\", \"JumpId(`%s.hlp', `%s')\")}\n",

-             FileNameFromPath(FileRoot), CurrentSectionName);
+             wxFileNameFromPath(FileRoot), CurrentSectionName);

         }
       }
       if (!winHelp && indexSubsections && useWord)
         }
       }
       if (!winHelp && indexSubsections && useWord)


@@ -1589,8 +1589,8 @@ void RTFOnMacro(int macroId, int no_args, bool start)
       NotifyParentHasChildren(3);
       if (winHelpContents && winHelp)
       {
       NotifyParentHasChildren(3);
       if (winHelpContents && winHelp)
       {

-        OutputCurrentSectionToString(wxBuffer);
-        WriteWinHelpContentsFileLine(topicName, wxBuffer, 4);
+        OutputCurrentSectionToString(wxTex2RTFBuffer);
+        WriteWinHelpContentsFileLine(topicName, wxTex2RTFBuffer, 4);

       }
       AddTexRef(topicName, NULL, SectionNameString, chapterNo, sectionNo, subsectionNo, subsubsectionNo);
 
       }
       AddTexRef(topicName, NULL, SectionNameString, chapterNo, sectionNo, subsectionNo, subsubsectionNo);
 


@@ -1647,7 +1647,7 @@ void RTFOnMacro(int macroId, int no_args, bool start)
         if (useUpButton && CurrentSubsectionName)
         {
           fprintf(Subsubsections, "!{\\footnote EnableButton(\"Up\");ChangeButtonBinding(\"Up\", \"JumpId(`%s.hlp', `%s')\")}\n",
         if (useUpButton && CurrentSubsectionName)
         {
           fprintf(Subsubsections, "!{\\footnote EnableButton(\"Up\");ChangeButtonBinding(\"Up\", \"JumpId(`%s.hlp', `%s')\")}\n",

-             FileNameFromPath(FileRoot), CurrentSubsectionName);
+             wxFileNameFromPath(FileRoot), CurrentSubsectionName);

         }
       }
       if (!winHelp && indexSubsections && useWord)
         }
       }
       if (!winHelp && indexSubsections && useWord)


@@ -2205,7 +2205,6 @@ void RTFOnMacro(int macroId, int no_args, bool start)
       {
         struc->currentItem += 1;
 
       {
         struc->currentItem += 1;
 

-        int indentSize = struc->indentation;

         int oldIndent = 0;
         wxNode *node2 = NULL;
         if (itemizeStack.Number() > 1) // TODO: do I actually mean Nth(0) here??
         int oldIndent = 0;
         wxNode *node2 = NULL;
         if (itemizeStack.Number() > 1) // TODO: do I actually mean Nth(0) here??


@@ -4898,7 +4897,7 @@ bool RTFOnArgument(int macroId, int arg_no, bool start)
         if (useUpButton)
         {
           fprintf(Chapters, "!{\\footnote EnableButton(\"Up\");ChangeButtonBinding(\"Up\", \"JumpId(`%s.hlp', `%s')\")}\n",
         if (useUpButton)
         {
           fprintf(Chapters, "!{\\footnote EnableButton(\"Up\");ChangeButtonBinding(\"Up\", \"JumpId(`%s.hlp', `%s')\")}\n",

-               FileNameFromPath(FileRoot), "Contents");
+               wxFileNameFromPath(FileRoot), "Contents");

         }
       }
       
         }
       }
       


@@ -5248,7 +5247,7 @@ bool RTFGo(void)
     {
       wxConcatFiles("header.rtf", "chapters.rtf", "tmp1.rtf");
       Tex2RTFYield(TRUE);
     {
       wxConcatFiles("header.rtf", "chapters.rtf", "tmp1.rtf");
       Tex2RTFYield(TRUE);

-      if (FileExists(OutputFile))
+      if (wxFileExists(OutputFile))

           wxRemoveFile(OutputFile);
 
       char *cwdStr;
           wxRemoveFile(OutputFile);
 
       char *cwdStr;


@@ -5274,7 +5273,7 @@ bool RTFGo(void)
       wxRemoveFile("tmp1.rtf");
     }
     
       wxRemoveFile("tmp1.rtf");
     }
     

-    if (FileExists(ContentsName)) wxRemoveFile(ContentsName);
+    if (wxFileExists(ContentsName)) wxRemoveFile(ContentsName);

 
     if (!wxRenameFile(TmpContentsName, ContentsName))
     {
 
     if (!wxRenameFile(TmpContentsName, ContentsName))
     {