Define SF_UNICODE if undefined

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

diff --git a/utils/tex2rtf/src/texutils.cpp b/utils/tex2rtf/src/texutils.cpp
index ac68e432118beabe56d51b91fc9e28dab96ef48d..7aec24bfc4fbed648fd9ee1787d466b48ae30551 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;


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


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