fixed passing wxCharBuffer to a vararg function (part of bug 1001166)

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

diff --git a/utils/tex2rtf/src/tex2any.h b/utils/tex2rtf/src/tex2any.h
index cd29772fc4de57e6ff2c0da700434c0b4949e61b..107bbd0c1d753970b0fef27c7ae99604ca93c474 100644 (file)
--- a/utils/tex2rtf/src/tex2any.h
+++ b/utils/tex2rtf/src/tex2any.h
@@ -147,20 +147,20 @@ extern wxStringList IgnorableInputFiles; // Ignorable \input files, e.g. psbox.t
 bool read_a_line(wxChar *buf);
 bool TexLoadFile(wxChar *filename);
 int ParseArg(TexChunk *thisArg, wxList& children, wxChar *buffer, int pos,
 bool read_a_line(wxChar *buf);
 bool TexLoadFile(wxChar *filename);
 int ParseArg(TexChunk *thisArg, wxList& children, wxChar *buffer, int pos,

-           wxChar *environment = NULL, bool parseArgToBrace = TRUE, TexChunk *customMacroArgs = NULL);
+           wxChar *environment = NULL, bool parseArgToBrace = true, TexChunk *customMacroArgs = NULL);

 int ParseMacroBody(const wxChar *macro_name, TexChunk *parent, int no_args,
 int ParseMacroBody(const wxChar *macro_name, TexChunk *parent, int no_args,

-           wxChar *buffer, int pos, wxChar *environment = NULL, bool parseArgToBrace = TRUE, TexChunk *customMacroArgs = NULL);
+           wxChar *buffer, int pos, wxChar *environment = NULL, bool parseArgToBrace = true, TexChunk *customMacroArgs = NULL);

 void TraverseDocument(void);
 void TraverseDocument(void);

-void TraverseFromChunk(TexChunk *chunk, wxNode *thisNode = NULL, bool childrenOnly = FALSE);
-#define TraverseChildrenFromChunk(arg) TraverseFromChunk(arg, NULL, TRUE)
+void TraverseFromChunk(TexChunk *chunk, wxNode *thisNode = NULL, bool childrenOnly = false);
+#define TraverseChildrenFromChunk(arg) TraverseFromChunk(arg, NULL, true)

 void SetCurrentOutput(FILE *fd);
 void SetCurrentOutputs(FILE *fd1, FILE *fd2);
 extern FILE *CurrentOutput1;
 extern FILE *CurrentOutput2;
 void SetCurrentOutput(FILE *fd);
 void SetCurrentOutputs(FILE *fd1, FILE *fd2);
 extern FILE *CurrentOutput1;
 extern FILE *CurrentOutput2;

-void AddMacroDef(int the_id, const wxChar *name, int n, bool ignore = FALSE, bool forbidden = FALSE);
+void AddMacroDef(int the_id, const wxChar *name, int n, bool ignore = false, bool forbidden = false);

 void TexInitialize(int bufSize);
 void TexCleanUp(void);
 void TexInitialize(int bufSize);
 void TexCleanUp(void);

-void TexOutput(const wxChar *s, bool ordinaryText = FALSE);
+void TexOutput(const wxChar *s, bool ordinaryText = false);

 wxChar *GetArgData(TexChunk *chunk);
 wxChar *GetArgData(void);             // Get the string for the current argument
 int GetNoArgs(void);                // Get the number of arguments for the current macro
 wxChar *GetArgData(TexChunk *chunk);
 wxChar *GetArgData(void);             // Get the string for the current argument
 int GetNoArgs(void);                // Get the number of arguments for the current macro


@@ -174,11 +174,11 @@ wxChar *ConvertCase(wxChar *s);         // Convert case, according to upperCaseN
 extern wxPathList TexPathList;      // Path list, can be used for file searching.
 
 #if !WXWIN_COMPATIBILITY_2
 extern wxPathList TexPathList;      // Path list, can be used for file searching.
 
 #if !WXWIN_COMPATIBILITY_2

-extern bool StringMatch(const wxChar *one, const wxChar *two, bool subString = TRUE, bool exact = FALSE);
+extern bool StringMatch(const wxChar *one, const wxChar *two, bool subString = true, bool exact = false);

 #endif
 
 // Define a variable value from the .ini file
 #endif
 
 // Define a variable value from the .ini file

-wxChar *RegisterSetting(wxChar *settingName, wxChar *settingValue, bool interactive = TRUE);
+wxChar *RegisterSetting(wxChar *settingName, wxChar *settingValue, bool interactive = true);

 
 // Major document styles
 #define LATEX_REPORT    1
 
 // Major document styles
 #define LATEX_REPORT    1


@@ -217,7 +217,7 @@ extern int sectionFont;
 extern int subsectionFont;
 extern int titleFont;
 extern int authorFont;
 extern int subsectionFont;
 extern int titleFont;
 extern int authorFont;

-extern bool winHelp;  // Output in Windows Help format if TRUE, linear otherwise
+extern bool winHelp;  // Output in Windows Help format if true, linear otherwise

 extern bool isInteractive;
 extern bool runTwice;
 extern int convertMode;
 extern bool isInteractive;
 extern bool runTwice;
 extern int convertMode;


@@ -324,7 +324,7 @@ extern void OutputCurrentSectionToString(wxChar *buf);
 extern void OutputChunkToString(TexChunk *chunk, wxChar *buf);
 
 // Called by Tex2Any to simulate a section
 extern void OutputChunkToString(TexChunk *chunk, wxChar *buf);
 
 // Called by Tex2Any to simulate a section

-extern void FakeCurrentSection(wxChar *fakeSection, bool addToContents = TRUE);
+extern void FakeCurrentSection(wxChar *fakeSection, bool addToContents = true);

 
 /*
  * Local to Tex2Any library
 
 /*
  * Local to Tex2Any library


@@ -332,7 +332,7 @@ extern void FakeCurrentSection(wxChar *fakeSection, bool addToContents = TRUE);
  */
  
 extern wxChar *currentArgData;
  */
  
 extern wxChar *currentArgData;

-extern bool haveArgData; // If TRUE, we're simulating the data.
+extern bool haveArgData; // If true, we're simulating the data.

 void StartSimulateArgument(wxChar *data);
 void EndSimulateArgument(void);
 
 void StartSimulateArgument(wxChar *data);
 void EndSimulateArgument(void);
 


@@ -345,7 +345,7 @@ void EndSimulateArgument(void);
 void OnMacro(int macroId, int no_args, bool start);
 
 // Called on start/end of argument examination.
 void OnMacro(int macroId, int no_args, bool start);
 
 // Called on start/end of argument examination.

-// Return TRUE at the start of an argument to traverse
+// Return true at the start of an argument to traverse

 // (output) the argument.
 bool OnArgument(int macroId, int arg_no, bool start);
 
 // (output) the argument.
 bool OnArgument(int macroId, int arg_no, bool start);
 


@@ -362,7 +362,7 @@ void OnError(const wxChar *msg);
 void OnInform(const wxChar *msg);
 
 // Special yield wrapper
 void OnInform(const wxChar *msg);
 
 // Special yield wrapper

-void Tex2RTFYield(bool force = FALSE);
+void Tex2RTFYield(bool force = false);

 
 /*
  * Useful utilities
 
 /*
  * Useful utilities