styles, toolbar, and other visual tweaks

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

diff --git a/utils/tex2rtf/src/tex2any.h b/utils/tex2rtf/src/tex2any.h
index 97c6d0d123dab44e60c3f44799f70229de914644..9b78d397c9c3e283106ad8032b21686b1a3994f5 100644 (file)
--- a/utils/tex2rtf/src/tex2any.h
+++ b/utils/tex2rtf/src/tex2any.h
@@ -14,13 +14,15 @@
 #include "wx/list.h"
 #include "wx/hash.h"
 #include "wx/tokenzr.h"
 #include "wx/list.h"
 #include "wx/hash.h"
 #include "wx/tokenzr.h"

+#include "wx/wfstream.h"
+#include "wx/txtstrm.h"

 #include "wxhlpblk.h"
 
 /*
  * Conversion modes
  *
  */
 #include "wxhlpblk.h"
 
 /*
  * Conversion modes
  *
  */

- 
+

 #define TEX_RTF  1
 #define TEX_XLP  2
 #define TEX_HTML 3
 #define TEX_RTF  1
 #define TEX_XLP  2
 #define TEX_HTML 3


@@ -51,7 +53,7 @@ class TexMacroDef: public wxObject
   int macroId;
 
   TexMacroDef(int the_id, const wxChar *the_name, int n, bool ig, bool forbidLevel = FORBID_OK);
   int macroId;
 
   TexMacroDef(int the_id, const wxChar *the_name, int n, bool ig, bool forbidLevel = FORBID_OK);

-  ~TexMacroDef(void);
+  virtual ~TexMacroDef(void);

 };
 
 #define CHUNK_TYPE_MACRO    1
 };
 
 #define CHUNK_TYPE_MACRO    1


@@ -133,7 +135,7 @@ class TexTopic: public wxObject
   wxChar *filename;
   wxStringList *keywords;
   TexTopic(wxChar *f = NULL);
   wxChar *filename;
   wxStringList *keywords;
   TexTopic(wxChar *f = NULL);

-  ~TexTopic(void);
+  virtual ~TexTopic(void);

 };
 extern wxHashTable TopicTable;
 void AddKeyWordForTopic(wxChar *topic, wxChar *entry, wxChar *filename = NULL);
 };
 extern wxHashTable TopicTable;
 void AddKeyWordForTopic(wxChar *topic, wxChar *entry, wxChar *filename = NULL);


@@ -145,7 +147,7 @@ extern wxHashTable  MacroDefs;
 extern wxStringList IgnorableInputFiles; // Ignorable \input files, e.g. psbox.tex
 
 bool read_a_line(wxChar *buf);
 extern wxStringList IgnorableInputFiles; // Ignorable \input files, e.g. psbox.tex
 
 bool read_a_line(wxChar *buf);

-bool TexLoadFile(wxChar *filename);
+bool TexLoadFile(const wxString& filename);

 int ParseArg(TexChunk *thisArg, wxList& children, wxChar *buffer, int pos,
            wxChar *environment = NULL, bool parseArgToBrace = true, TexChunk *customMacroArgs = NULL);
 int ParseMacroBody(const wxChar *macro_name, TexChunk *parent, int no_args,
 int ParseArg(TexChunk *thisArg, wxList& children, wxChar *buffer, int pos,
            wxChar *environment = NULL, bool parseArgToBrace = true, TexChunk *customMacroArgs = NULL);
 int ParseMacroBody(const wxChar *macro_name, TexChunk *parent, int no_args,


@@ -173,12 +175,10 @@ int GetCurrentColumn(void);         // number of characters on current line
 wxChar *ConvertCase(wxChar *s);         // Convert case, according to upperCaseNames setting.
 extern wxPathList TexPathList;      // Path list, can be used for file searching.
 
 wxChar *ConvertCase(wxChar *s);         // Convert case, according to upperCaseNames setting.
 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
 
 // Define a variable value from the .ini file

-wxChar *RegisterSetting(wxChar *settingName, wxChar *settingValue, bool interactive = true);
+wxChar *RegisterSetting(const wxString& settingName, const wxString& settingValue, bool interactive = true);

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


@@ -217,11 +217,11 @@ 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;

-extern bool checkCurleyBraces;
+extern bool checkCurlyBraces;

 extern bool checkSyntax;
 extern bool stopRunning;
 extern int  mirrorMargins;
 extern bool checkSyntax;
 extern bool stopRunning;
 extern int  mirrorMargins;


@@ -330,9 +330,9 @@ extern void FakeCurrentSection(wxChar *fakeSection, bool addToContents = true);
  * Local to Tex2Any library
  *
  */
  * Local to Tex2Any library
  *
  */

- 
+

 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);
 


@@ -387,7 +387,7 @@ void SetFontSizes(int pointSize);
  * IF one exists. Inserts zero into buffer.
  *
  */
  * IF one exists. Inserts zero into buffer.
  *
  */

- 
+

 void StripExtension(wxChar *buffer);
 
 /*
 void StripExtension(wxChar *buffer);
 
 /*


@@ -403,14 +403,14 @@ class TexRef: public wxObject
   wxChar *sectionNumber; // Section or figure number (as a string)
   wxChar *sectionName; // name e.g. 'section'
   TexRef(const wxChar *label, const wxChar *file, const wxChar *section, const wxChar *sectionN = NULL);
   wxChar *sectionNumber; // Section or figure number (as a string)
   wxChar *sectionName; // name e.g. 'section'
   TexRef(const wxChar *label, const wxChar *file, const wxChar *section, const wxChar *sectionN = NULL);

-  ~TexRef(void);
+  virtual ~TexRef(void);

 };
 
 /*
  * Add a reference
  *
  */
 };
 
 /*
  * Add a reference
  *
  */

- 
+

 void AddTexRef(wxChar *name, wxChar *file = NULL, wxChar *sectionName = NULL,
          int chapter = 0, int section = 0, int subsection = 0, int subsubsection = 0);
 
 void AddTexRef(wxChar *name, wxChar *file = NULL, wxChar *sectionName = NULL,
          int chapter = 0, int section = 0, int subsection = 0, int subsubsection = 0);
 


@@ -502,23 +502,23 @@ extern wxList CustomMacroList;
 
 class CustomMacro: public wxObject
 {
 
 class CustomMacro: public wxObject
 {

- public:
-  wxChar *macroName;
-  wxChar *macroBody;
-  int noArgs;
-  inline CustomMacro(wxChar *name, int args, wxChar *body)
-  {
-    noArgs = args;
-    macroName = wxStrcpy(new wxChar[wxStrlen(name) + 1], name);
-    if (body)
-      macroBody = wxStrcpy(new wxChar[wxStrlen(body) + 1], body);
-    else
-      macroBody = NULL;
-  }
-  ~CustomMacro();
+public:
+    wxChar *macroName;
+    wxChar *macroBody;
+    int noArgs;
+    inline CustomMacro(const wxChar *name, int args, wxChar *body)
+    {
+        noArgs = args;
+        macroName = wxStrcpy(new wxChar[wxStrlen(name) + 1], name);
+        if (body)
+            macroBody = wxStrcpy(new wxChar[wxStrlen(body) + 1], body);
+        else
+            macroBody = NULL;
+    }
+    virtual ~CustomMacro();

 };
 
 };
 

-bool ReadCustomMacros(wxChar *filename);
+bool ReadCustomMacros(const wxString& filename);

 void ShowCustomMacros(void);
 CustomMacro *FindCustomMacro(wxChar *name);
 wxChar *ParseMultifieldString(wxChar *s, int *pos);
 void ShowCustomMacros(void);
 CustomMacro *FindCustomMacro(wxChar *name);
 wxChar *ParseMultifieldString(wxChar *s, int *pos);


@@ -537,7 +537,7 @@ class ColourTableEntry: public wxObject
   unsigned int blue;
 
   ColourTableEntry(const wxChar *theName, unsigned int r,  unsigned int g,  unsigned int b);
   unsigned int blue;
 
   ColourTableEntry(const wxChar *theName, unsigned int r,  unsigned int g,  unsigned int b);

-  ~ColourTableEntry(void);
+  virtual ~ColourTableEntry(void);

 };
 
 extern wxList ColourTable;
 };
 
 extern wxList ColourTable;


@@ -830,7 +830,7 @@ extern void InitialiseColourTable(void);
 #define ltURLREF            551
 #define ltUPPERCASE         552
 #define ltUSEPACKAGE        553
 #define ltURLREF            551
 #define ltUPPERCASE         552
 #define ltUSEPACKAGE        553

-  
+

 #define ltVDOTS             570
 #define ltVERBATIMINPUT     571
 #define ltVERBATIM          572
 #define ltVDOTS             570
 #define ltVERBATIMINPUT     571
 #define ltVERBATIM          572


@@ -1068,6 +1068,3 @@ extern void InitialiseColourTable(void);
 #define ltTOPLEVEL          15000
 #define ltCUSTOM_MACRO      15001
 #define ltSOLO_BLOCK        15002
 #define ltTOPLEVEL          15000
 #define ltCUSTOM_MACRO      15001
 #define ltSOLO_BLOCK        15002

-
-
-