diff --git a/utils/tex2rtf/src/htmlutil.cpp b/utils/tex2rtf/src/htmlutil.cpp
index 2ba1279576..7e3a6b8d6d 100644
--- a/utils/tex2rtf/src/htmlutil.cpp
+++ b/utils/tex2rtf/src/htmlutil.cpp
@@ -720,8 +720,8 @@ void HTMLOnMacro(int macroId, int no_args, bool start)
// Add this section title to the list of keywords
if (htmlIndex)
{
- OutputCurrentSectionToString(wxBuffer);
- AddKeyWordForTopic(topicName, wxBuffer, ConvertCase(currentFileName));
+ OutputCurrentSectionToString(wxTex2RTFBuffer);
+ AddKeyWordForTopic(topicName, wxTex2RTFBuffer, ConvertCase(currentFileName));
}
}
break;
@@ -782,8 +782,8 @@ void HTMLOnMacro(int macroId, int no_args, bool start)
// Add this section title to the list of keywords
if (htmlIndex)
{
- OutputCurrentSectionToString(wxBuffer);
- AddKeyWordForTopic(topicName, wxBuffer, currentFileName);
+ OutputCurrentSectionToString(wxTex2RTFBuffer);
+ AddKeyWordForTopic(topicName, wxTex2RTFBuffer, currentFileName);
}
}
break;
@@ -889,8 +889,8 @@ void HTMLOnMacro(int macroId, int no_args, bool start)
// Add this section title to the list of keywords
if (htmlIndex)
{
- OutputCurrentSectionToString(wxBuffer);
- AddKeyWordForTopic(topicName, wxBuffer, currentFileName);
+ OutputCurrentSectionToString(wxTex2RTFBuffer);
+ AddKeyWordForTopic(topicName, wxTex2RTFBuffer, currentFileName);
}
}
@@ -967,8 +967,8 @@ void HTMLOnMacro(int macroId, int no_args, bool start)
// Add this section title to the list of keywords
if (htmlIndex)
{
- OutputCurrentSectionToString(wxBuffer);
- AddKeyWordForTopic(topicName, wxBuffer, currentFileName);
+ OutputCurrentSectionToString(wxTex2RTFBuffer);
+ AddKeyWordForTopic(topicName, wxTex2RTFBuffer, currentFileName);
}
}
}
diff --git a/utils/tex2rtf/src/rtfutils.cpp b/utils/tex2rtf/src/rtfutils.cpp
index 3e0d934b9e..a33c1628b8 100644
--- 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)
{
- OutputCurrentSectionToString(wxBuffer);
+ OutputCurrentSectionToString(wxTex2RTFBuffer);
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
- else if ( wxBuffer[i] == '{' )
+ else if ( wxTex2RTFBuffer[i] == '{' )
return;
fprintf(fd, "K{\\footnote {K} ");
- fprintf(fd, "%s", wxBuffer);
+ fprintf(fd, "%s", wxTex2RTFBuffer);
fprintf(fd, "}\n");
}
@@ -1113,8 +1113,8 @@ void RTFOnMacro(int macroId, int no_args, bool start)
if (winHelpContents && winHelp && !InPopups())
{
- OutputCurrentSectionToString(wxBuffer);
- WriteWinHelpContentsFileLine(topicName, wxBuffer, 1);
+ OutputCurrentSectionToString(wxTex2RTFBuffer);
+ WriteWinHelpContentsFileLine(topicName, wxTex2RTFBuffer, 1);
}
AddTexRef(topicName, NULL, ChapterNameString, chapterNo);
@@ -1255,8 +1255,8 @@ void RTFOnMacro(int macroId, int no_args, bool start)
NotifyParentHasChildren(1);
if (winHelpContents && winHelp && !InPopups())
{
- OutputCurrentSectionToString(wxBuffer);
- WriteWinHelpContentsFileLine(topicName, wxBuffer, 2);
+ OutputCurrentSectionToString(wxTex2RTFBuffer);
+ WriteWinHelpContentsFileLine(topicName, wxTex2RTFBuffer, 2);
}
AddTexRef(topicName, NULL, SectionNameString, chapterNo, sectionNo);
@@ -1439,8 +1439,8 @@ void RTFOnMacro(int macroId, int no_args, bool start)
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);
@@ -1589,8 +1589,8 @@ void RTFOnMacro(int macroId, int no_args, bool start)
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);
diff --git a/utils/tex2rtf/src/tex2any.cpp b/utils/tex2rtf/src/tex2any.cpp
index 8109c52f12..51fdab5dbd 100644
--- a/utils/tex2rtf/src/tex2any.cpp
+++ b/utils/tex2rtf/src/tex2any.cpp
@@ -1145,7 +1145,7 @@ int ParseArg(TexChunk *thisArg, wxList& children, char *buffer, int pos, char *e
pos ++;
int noBraces = 1;
- wxBuffer[0] = 0;
+ wxTex2RTFBuffer[0] = 0;
int i = 0;
bool end = FALSE;
while (!end)
@@ -1156,37 +1156,37 @@ int ParseArg(TexChunk *thisArg, wxList& children, char *buffer, int pos, char *e
noBraces --;
if (noBraces == 0)
{
- wxBuffer[i] = 0;
+ wxTex2RTFBuffer[i] = 0;
end = TRUE;
}
else
{
- wxBuffer[i] = '}';
+ wxTex2RTFBuffer[i] = '}';
i ++;
}
pos ++;
}
else if (ch == '{')
{
- wxBuffer[i] = '{';
+ wxTex2RTFBuffer[i] = '{';
i ++;
pos ++;
}
else if (ch == '\\' && buffer[pos+1] == '}')
{
- wxBuffer[i] = '}';
+ wxTex2RTFBuffer[i] = '}';
pos += 2;
i++;
}
else if (ch == '\\' && buffer[pos+1] == '{')
{
- wxBuffer[i] = '{';
+ wxTex2RTFBuffer[i] = '{';
pos += 2;
i++;
}
else
{
- wxBuffer[i] = ch;
+ wxTex2RTFBuffer[i] = ch;
pos ++;
i ++;
if (ch == 0)
@@ -1207,7 +1207,7 @@ int ParseArg(TexChunk *thisArg, wxList& children, char *buffer, int pos, char *e
TexChunk *argValue = new TexChunk(CHUNK_TYPE_STRING);
arg->children.Append((wxObject *)argValue);
argValue->argn = 1;
- argValue->value = copystring(wxBuffer);
+ argValue->value = copystring(wxTex2RTFBuffer);
children.Append((wxObject *)chunk);
}
diff --git a/utils/tex2rtf/src/tex2any.h b/utils/tex2rtf/src/tex2any.h
index 2bf3672015..5280483dd3 100644
--- a/utils/tex2rtf/src/tex2any.h
+++ b/utils/tex2rtf/src/tex2any.h
@@ -139,6 +139,7 @@ extern wxHashTable TopicTable;
void AddKeyWordForTopic(char *topic, char *entry, char *filename = NULL);
void ClearKeyWordTable(void);
+extern char wxTex2RTFBuffer[];
extern TexChunk *TopLevel;
extern wxHashTable MacroDefs;
extern wxStringList IgnorableInputFiles; // Ignorable \input files, e.g. psbox.tex
diff --git a/utils/tex2rtf/src/tex2rtf.cpp b/utils/tex2rtf/src/tex2rtf.cpp
index 50b4466234..a8cb70c961 100644
--- a/utils/tex2rtf/src/tex2rtf.cpp
+++ b/utils/tex2rtf/src/tex2rtf.cpp
@@ -132,13 +132,9 @@ int BufSize = 500;
bool Go(void);
void ShowOptions(void);
-#ifdef NO_GUI
+char wxTex2RTFBuffer[1500];
-#if wxUSE_GUI || !defined(__UNIX__)
-// wxBase for Unix does not have wxBuffer
-extern
-#endif
-char *wxBuffer; // we must init it, otherwise tex2rtf will crash
+#ifdef NO_GUI
int main(int argc, char **argv)
#else
@@ -187,9 +183,6 @@ bool MyApp::OnInit()
}
#ifdef NO_GUI
- wxBuffer = new char[1500];
- // this is done in wxApp, but NO_GUI version doesn't call it :-(
-
if (!InputFile || !OutputFile)
{
wxSTD cout << "Tex2RTF: input or output file is missing.\n";
@@ -446,7 +439,6 @@ bool MyApp::OnInit()
// Return the main frame window
return TRUE;
#else
- delete[] wxBuffer;
return FALSE;
#endif
}