corrections to dynamic loading for Darwin

[wxWidgets.git] / utils / tex2rtf / src / tex2any.h

diff --git a/utils/tex2rtf/src/tex2any.h b/utils/tex2rtf/src/tex2any.h
index 0fc16cd94e3910e68629cd7663d93ff62a5a7a94..2bf36720159258f6d306a023609c3dc0165dc3bb 100644 (file)
--- a/utils/tex2rtf/src/tex2any.h
+++ b/utils/tex2rtf/src/tex2any.h
@@ -147,7 +147,7 @@ bool read_a_line(char *buf);
 bool TexLoadFile(char *filename);
 int ParseArg(TexChunk *thisArg, wxList& children, char *buffer, int pos,
            char *environment = NULL, bool parseArgToBrace = TRUE, TexChunk *customMacroArgs = NULL);
 bool TexLoadFile(char *filename);
 int ParseArg(TexChunk *thisArg, wxList& children, char *buffer, int pos,
            char *environment = NULL, bool parseArgToBrace = TRUE, TexChunk *customMacroArgs = NULL);

-int ParseMacroBody(char *macro_name, TexChunk *parent, int no_args,
+int ParseMacroBody(const char *macro_name, TexChunk *parent, int no_args,

            char *buffer, int pos, char *environment = NULL, bool parseArgToBrace = TRUE, TexChunk *customMacroArgs = NULL);
 void TraverseDocument(void);
 void TraverseFromChunk(TexChunk *chunk, wxNode *thisNode = NULL, bool childrenOnly = FALSE);
            char *buffer, int pos, char *environment = NULL, bool parseArgToBrace = TRUE, TexChunk *customMacroArgs = NULL);
 void TraverseDocument(void);
 void TraverseFromChunk(TexChunk *chunk, wxNode *thisNode = NULL, bool childrenOnly = FALSE);


@@ -248,6 +248,8 @@ extern char *linkColourString; // HTML link colour
 extern char *followedLinkColourString; // HTML followed link colour
 extern bool combineSubSections; // Stop splitting files below section
 extern bool htmlWorkshopFiles;  // generate HTML Help Workshop project files
 extern char *followedLinkColourString; // HTML followed link colour
 extern bool combineSubSections; // Stop splitting files below section
 extern bool htmlWorkshopFiles;  // generate HTML Help Workshop project files

+extern bool ignoreBadRefs;      // Don't insert (REF NOT FOUND)
+extern char *htmlFaceName;      // HTML face name

 
 // Names to help with internationalisation
 extern char *ContentsNameString;
 
 // Names to help with internationalisation
 extern char *ContentsNameString;


@@ -367,7 +369,7 @@ void Tex2RTFYield(bool force = FALSE);
 // make up a topic name otherwise.
 char *FindTopicName(TexChunk *chunk);
 // Force the current topic to be this (e.g. force 'references' label).
 // make up a topic name otherwise.
 char *FindTopicName(TexChunk *chunk);
 // Force the current topic to be this (e.g. force 'references' label).

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

 void ResetTopicCounter(void);
 
 // Parse unit eg. 14, 12pt, 34cm and return value in points.
 void ResetTopicCounter(void);
 
 // Parse unit eg. 14, 12pt, 34cm and return value in points.


@@ -396,7 +398,7 @@ class TexRef: public wxObject
   char *refFile;       // Reference filename (can be NULL)
   char *sectionNumber; // Section or figure number (as a string)
   char *sectionName; // name e.g. 'section'
   char *refFile;       // Reference filename (can be NULL)
   char *sectionNumber; // Section or figure number (as a string)
   char *sectionName; // name e.g. 'section'

-  TexRef(char *label, char *file, char *section, char *sectionN = NULL);
+  TexRef(const char *label, const char *file, const char *section, const char *sectionN = NULL);

   ~TexRef(void);
 };
 
   ~TexRef(void);
 };
 


@@ -530,12 +532,12 @@ class ColourTableEntry: public wxObject
   unsigned int green;
   unsigned int blue;
 
   unsigned int green;
   unsigned int blue;
 

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

   ~ColourTableEntry(void);
 };
 
 extern wxList ColourTable;
   ~ColourTableEntry(void);
 };
 
 extern wxList ColourTable;

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

 extern int FindColourPosition(char *theName);
 // Converts e.g. "red" -> "#FF0000"
 extern bool FindColourHTMLString(char *theName, char *buf);
 extern int FindColourPosition(char *theName);
 // Converts e.g. "red" -> "#FF0000"
 extern bool FindColourHTMLString(char *theName, char *buf);