fixed array tests compilation and a bug in obj array test

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

diff --git a/utils/tex2rtf/src/texutils.cpp b/utils/tex2rtf/src/texutils.cpp
index 5de8abcae7fbe0feb2a3d2126d505206db492a55..ef76580db1534ad83370868ce3b8fedd289aa2ce 100644 (file)
--- a/utils/tex2rtf/src/texutils.cpp
+++ b/utils/tex2rtf/src/texutils.cpp
@@ -24,7 +24,11 @@
 #include "wx/wx.h"
 #endif
 
 #include "wx/wx.h"
 #endif
 

-#include <wx/hash.h>
+#include "wx/hash.h"
+
+#ifdef new
+#undef new
+#endif

 
 #if wxUSE_IOSTREAMH
 #include <iostream.h>
 
 #if wxUSE_IOSTREAMH
 #include <iostream.h>


@@ -146,7 +150,7 @@ void ResetTopicCounter(void)
 
 static char *forceTopicName = NULL;
 
 
 static char *forceTopicName = NULL;
 

-void ForceTopicName(char *name)
+void ForceTopicName(const char *name)

 {
   if (forceTopicName)
     delete[] forceTopicName;
 {
   if (forceTopicName)
     delete[] forceTopicName;


@@ -239,9 +243,9 @@ int ParseUnitArgument(char *unitArg)
       if (strcmp(units, "in") == 0)
         conversionFactor = 72.0;
       else if (strcmp(units, "cm") == 0)
       if (strcmp(units, "in") == 0)
         conversionFactor = 72.0;
       else if (strcmp(units, "cm") == 0)

-        conversionFactor = 72.0/2.51;
+        conversionFactor = (float)72.0/(float)2.51;

       else if (strcmp(units, "mm") == 0)
       else if (strcmp(units, "mm") == 0)

-        conversionFactor = 72.0/25.1;
+        conversionFactor = (float)72.0/(float)25.1;

       else if (strcmp(units, "pt") == 0)
         conversionFactor = 1;
     }
       else if (strcmp(units, "pt") == 0)
         conversionFactor = 1;
     }


@@ -378,7 +382,7 @@ void AddTexRef(char *name, char *file, char *sectionName,
 
 void WriteTexReferences(char *filename)
 {
 
 void WriteTexReferences(char *filename)
 {

-  ofstream ostr(filename);
+  wxSTD ofstream ostr(filename);

   if (ostr.bad()) return;
   char buf[200];
   
   if (ostr.bad()) return;
   char buf[200];
   


@@ -402,7 +406,11 @@ void WriteTexReferences(char *filename)
 
 void ReadTexReferences(char *filename)
 {
 
 void ReadTexReferences(char *filename)
 {

-  ifstream istr(filename, ios::nocreate | ios::in);
+  if (!wxFileExists(filename))
+      return;
+
+  wxSTD ifstream istr(filename, ios::in);
+

   if (istr.bad()) return;
 
   char label[100];
   if (istr.bad()) return;
 
   char label[100];


@@ -428,7 +436,14 @@ void ReadTexReferences(char *filename)
         istr.get(ch);
       }
       section[i] = 0;
         istr.get(ch);
       }
       section[i] = 0;

+
+      // gt - needed to trick the hash table "TexReferences" into deleting the key 
+      // strings it creates in the Put() function, but not the item that is
+      // created here, as that is destroyed elsewhere.  Without doing this, there
+      // were massive memory leaks
+      TexReferences.DeleteContents(TRUE);

       TexReferences.Put(label, new TexRef(label, file, section, sectionName));
       TexReferences.Put(label, new TexRef(label, file, section, sectionName));

+      TexReferences.DeleteContents(FALSE);

     }
   }
 }
     }
   }
 }


@@ -439,7 +454,7 @@ void ReadTexReferences(char *filename)
  *
  */
 
  *
  */
 

-void BibEatWhiteSpace(istream& str)
+void BibEatWhiteSpace(wxSTD istream& str)

 {
   char ch = str.peek();
   
 {
   char ch = str.peek();
   


@@ -467,7 +482,7 @@ void BibEatWhiteSpace(istream& str)
 }
 
 // Read word up to { or , or space
 }
 
 // Read word up to { or , or space

-void BibReadWord(istream& istr, char *buffer)
+void BibReadWord(wxSTD istream& istr, char *buffer)

 {
   int i = 0;
   buffer[i] = 0;
 {
   int i = 0;
   buffer[i] = 0;


@@ -484,7 +499,7 @@ void BibReadWord(istream& istr, char *buffer)
 }
 
 // Read string (double-quoted or not) to end quote or EOL
 }
 
 // Read string (double-quoted or not) to end quote or EOL

-void BibReadToEOL(istream& istr, char *buffer)
+void BibReadToEOL(wxSTD istream& istr, char *buffer)

 {
   int i = 0;
   buffer[i] = 0;
 {
   int i = 0;
   buffer[i] = 0;


@@ -513,7 +528,7 @@ void BibReadToEOL(istream& istr, char *buffer)
 }
 
 // Read }-terminated value, taking nested braces into account.
 }
 
 // Read }-terminated value, taking nested braces into account.

-void BibReadValue(istream& istr, char *buffer, bool ignoreBraces = TRUE,
+void BibReadValue(wxSTD istream& istr, char *buffer, bool ignoreBraces = TRUE,

                   bool quotesMayTerminate = TRUE)
 {
   int braceCount = 1;
                   bool quotesMayTerminate = TRUE)
 {
   int braceCount = 1;


@@ -524,11 +539,12 @@ void BibReadValue(istream& istr, char *buffer, bool ignoreBraces = TRUE,
   while (!istr.eof() && !stopping)
   {
 //    i ++;
   while (!istr.eof() && !stopping)
   {
 //    i ++;

-    if (i >= 2000)
+    if (i >= 4000)

     {
       char buf[100];
     {
       char buf[100];

-      sprintf(buf, "Sorry, value > 2000 chars in bib file at line %ld, terminating.", BibLine);
-      wxFatalError(buf, "Tex2RTF Fatal Error");
+      sprintf(buf, "Sorry, value > 4000 chars in bib file at line %ld.", BibLine);
+      wxLogError(buf, "Tex2RTF Fatal Error");
+      return;

     }
     istr.get(ch);
     
     }
     istr.get(ch);
     


@@ -565,8 +581,11 @@ void BibReadValue(istream& istr, char *buffer, bool ignoreBraces = TRUE,
  
 bool ReadBib(char *filename)
 {
  
 bool ReadBib(char *filename)
 {

+  if (!wxFileExists(filename))
+      return FALSE;
+

   char buf[300];
   char buf[300];

-  ifstream istr(filename, ios::nocreate | ios::in);
+  wxSTD ifstream istr(filename, ios::in);

   if (istr.bad()) return FALSE;
 
   BibLine = 1;
   if (istr.bad()) return FALSE;
 
   BibLine = 1;


@@ -574,7 +593,7 @@ bool ReadBib(char *filename)
   OnInform("Reading .bib file...");
 
   char ch;
   OnInform("Reading .bib file...");
 
   char ch;

-  char fieldValue[2000];
+  char fieldValue[4000];

   char recordType[100];
   char recordKey[100];
   char recordField[100];
   char recordType[100];
   char recordKey[100];
   char recordField[100];


@@ -1159,10 +1178,19 @@ char *RegisterSetting(char *settingName, char *settingValue, bool interactive)
     winHelpContents = StringTobool(settingValue);
   else if (StringMatch(settingName, "htmlIndex", FALSE, TRUE))
     htmlIndex = StringTobool(settingValue);
     winHelpContents = StringTobool(settingValue);
   else if (StringMatch(settingName, "htmlIndex", FALSE, TRUE))
     htmlIndex = StringTobool(settingValue);

+  else if (StringMatch(settingName, "htmlWorkshopFiles", FALSE, TRUE))
+    htmlWorkshopFiles = StringTobool(settingValue);

   else if (StringMatch(settingName, "htmlFrameContents", FALSE, TRUE))
     htmlFrameContents = StringTobool(settingValue);
   else if (StringMatch(settingName, "upperCaseNames", FALSE, TRUE))
     upperCaseNames = StringTobool(settingValue);
   else if (StringMatch(settingName, "htmlFrameContents", FALSE, TRUE))
     htmlFrameContents = StringTobool(settingValue);
   else if (StringMatch(settingName, "upperCaseNames", FALSE, TRUE))
     upperCaseNames = StringTobool(settingValue);

+  else if (StringMatch(settingName, "ignoreBadRefs", FALSE, TRUE))
+    ignoreBadRefs = StringTobool(settingValue);
+  else if (StringMatch(settingName, "htmlFaceName", FALSE, TRUE))
+  {
+    delete[] htmlFaceName;
+    htmlFaceName = copystring(settingValue);
+  }

   else if (StringMatch(settingName, "winHelpTitle", FALSE, TRUE))
   {
     if (winHelpTitle)
   else if (StringMatch(settingName, "winHelpTitle", FALSE, TRUE))
   {
     if (winHelpTitle)


@@ -1283,7 +1311,11 @@ char *RegisterSetting(char *settingName, char *settingValue, bool interactive)
 
 bool ReadCustomMacros(char *filename)
 {
 
 bool ReadCustomMacros(char *filename)
 {

-  ifstream istr(filename, ios::nocreate | ios::in);
+  if (!wxFileExists(filename))
+      return FALSE;
+
+  wxSTD ifstream istr(filename, ios::in);
+

   if (istr.bad()) return FALSE;
 
   CustomMacroList.Clear();
   if (istr.bad()) return FALSE;
 
   CustomMacroList.Clear();


@@ -1439,7 +1471,7 @@ char *ParseMultifieldString(char *allFields, int *pos)
  *
  */
  
  *
  */
  

-ColourTableEntry::ColourTableEntry(char *theName, unsigned int r,  unsigned int g,  unsigned int b)
+ColourTableEntry::ColourTableEntry(const char *theName, unsigned int r,  unsigned int g,  unsigned int b)

 {
   name = copystring(theName);
   red = r;
 {
   name = copystring(theName);
   red = r;


@@ -1452,7 +1484,7 @@ ColourTableEntry::~ColourTableEntry(void)
   delete[] name;
 }
 
   delete[] name;
 }
 

-void AddColour(char *theName, unsigned int r,  unsigned int g,  unsigned int b)
+void AddColour(const char *theName, unsigned int r,  unsigned int g,  unsigned int b)

 {
   wxNode *node = ColourTable.Find(theName);
   if (node)
 {
   wxNode *node = ColourTable.Find(theName);
   if (node)


@@ -1556,7 +1588,8 @@ void Tex2RTFYield(bool force)
     yieldCount = 0;
   if (yieldCount == 0)
   {
     yieldCount = 0;
   if (yieldCount == 0)
   {

-    wxYield();
+    if (wxTheApp)
+        wxYield();

     yieldCount = 10;
   }
   yieldCount --;
     yieldCount = 10;
   }
   yieldCount --;


@@ -1626,10 +1659,10 @@ char *ConvertCase(char *s)
   int i;
   if (upperCaseNames)
     for (i = 0; i < len; i ++)
   int i;
   if (upperCaseNames)
     for (i = 0; i < len; i ++)

-      buf[i] = wxToUpper(s[i]);
+      buf[i] = toupper(s[i]);

   else
     for (i = 0; i < len; i ++)
   else
     for (i = 0; i < len; i ++)

-      buf[i] = wxToLower(s[i]);
+      buf[i] = tolower(s[i]);

   buf[i] = 0;
   return buf;  
 }
   buf[i] = 0;
   return buf;  
 }