removed tests for WXWIN_COMPATIBILITY_2_4

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

diff --git a/utils/tex2rtf/src/tex2any.h b/utils/tex2rtf/src/tex2any.h
index a19b7c59f3ccc5d4cb2d6d5259c750929dc7492d..9b78d397c9c3e283106ad8032b21686b1a3994f5 100644 (file)
--- a/utils/tex2rtf/src/tex2any.h
+++ b/utils/tex2rtf/src/tex2any.h
@@ -14,6 +14,8 @@
 #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"
 
 /*
 #include "wxhlpblk.h"
 
 /*


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


@@ -176,7 +178,7 @@ extern wxPathList TexPathList;      // Path list, can be used for file searching
 extern bool StringMatch(const wxChar *one, const wxChar *two, bool subString = true, bool exact = false);
 
 // Define a variable value from the .ini file
 extern bool StringMatch(const wxChar *one, const wxChar *two, bool subString = true, bool exact = false);
 
 // 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


@@ -401,7 +403,7 @@ 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);

 };
 
 /*
 };
 
 /*


@@ -500,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);


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


@@ -1066,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

-
-
-