Fix wxListCtrl background colour bug Part I

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

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

-#include <wx/hash.h>
+#include "wx/hash.h"

 
 #ifdef new
 #undef new
 
 #ifdef new
 #undef new


@@ -150,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;


@@ -542,8 +542,9 @@ void BibReadValue(wxSTD istream& istr, char *buffer, bool ignoreBraces = TRUE,
     if (i >= 4000)
     {
       char buf[100];
     if (i >= 4000)
     {
       char buf[100];

-      sprintf(buf, "Sorry, value > 4000 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);
     


@@ -1183,6 +1184,13 @@ char *RegisterSetting(char *settingName, char *settingValue, bool interactive)
     htmlFrameContents = StringTobool(settingValue);
   else if (StringMatch(settingName, "upperCaseNames", FALSE, TRUE))
     upperCaseNames = StringTobool(settingValue);
     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)


@@ -1463,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;


@@ -1476,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)