added missing const

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@12260 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/utils/tex2rtf/src/tex2any.cpp b/utils/tex2rtf/src/tex2any.cpp
index 8ce32990790ff15ccdaad95ede92656d7d543c62..3add6ea1b91eb0f0ef67c99bc6632284d12b0aa5 100644 (file)
--- a/utils/tex2rtf/src/tex2any.cpp
+++ b/utils/tex2rtf/src/tex2any.cpp
@@ -1686,7 +1686,7 @@ bool TexLoadFile(char *filename)
   return FALSE;
 }
 
   return FALSE;
 }
 

-TexMacroDef::TexMacroDef(int the_id, char *the_name, int n, bool ig, bool forbidLevel)
+TexMacroDef::TexMacroDef(int the_id, const char *the_name, int n, bool ig, bool forbidLevel)

 {
   name = copystring(the_name);
   no_args = n;
 {
   name = copystring(the_name);
   no_args = n;


@@ -1961,7 +1961,7 @@ void SetCurrentOutputs(FILE *fd1, FILE *fd2)
   CurrentOutput2 = fd2;
 }
 
   CurrentOutput2 = fd2;
 }
 

-void AddMacroDef(int the_id, char *name, int n, bool ignore, bool forbid)
+void AddMacroDef(int the_id, const char *name, int n, bool ignore, bool forbid)

 {
   MacroDefs.Put(name, new TexMacroDef(the_id, name, n, ignore, forbid));
 }
 {
   MacroDefs.Put(name, new TexMacroDef(the_id, name, n, ignore, forbid));
 }

diff --git a/utils/tex2rtf/src/tex2any.h b/utils/tex2rtf/src/tex2any.h
index 1660cb35759fda752fd05becde07ed6665000bc1..259b1d58826962890da9eeb6063e4e947561b244 100644 (file)
--- a/utils/tex2rtf/src/tex2any.h
+++ b/utils/tex2rtf/src/tex2any.h
@@ -50,7 +50,7 @@ class TexMacroDef: public wxObject
   int forbidden;
   int macroId;
 
   int forbidden;
   int macroId;
 

-  TexMacroDef(int the_id, char *the_name, int n, bool ig, bool forbidLevel = FORBID_OK);
+  TexMacroDef(int the_id, const char *the_name, int n, bool ig, bool forbidLevel = FORBID_OK);

   ~TexMacroDef(void);
 };
 
   ~TexMacroDef(void);
 };
 


@@ -156,7 +156,7 @@ void SetCurrentOutput(FILE *fd);
 void SetCurrentOutputs(FILE *fd1, FILE *fd2);
 extern FILE *CurrentOutput1;
 extern FILE *CurrentOutput2;
 void SetCurrentOutputs(FILE *fd1, FILE *fd2);
 extern FILE *CurrentOutput1;
 extern FILE *CurrentOutput2;

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

 void TexInitialize(int bufSize);
 void TexCleanUp(void);
 void TexOutput(char *s, bool ordinaryText = FALSE);
 void TexInitialize(int bufSize);
 void TexCleanUp(void);
 void TexOutput(char *s, bool ordinaryText = FALSE);


@@ -350,10 +350,10 @@ void DefaultOnMacro(int macroId, int no_args, bool start);
 bool DefaultOnArgument(int macroId, int arg_no, bool start);
 
 // Called on error
 bool DefaultOnArgument(int macroId, int arg_no, bool start);
 
 // Called on error

-void OnError(char *msg);
+void OnError(const char *msg);

 
 // Called for information
 
 // Called for information

-void OnInform(char *msg);
+void OnInform(const char *msg);

 
 // Special yield wrapper
 void Tex2RTFYield(bool force = FALSE);
 
 // Special yield wrapper
 void Tex2RTFYield(bool force = FALSE);

diff --git a/utils/tex2rtf/src/tex2rtf.cpp b/utils/tex2rtf/src/tex2rtf.cpp
index 0730851bf7b1a1f3e46d1b06906ae69c988d1efc..163bac5ceca2d28816688e7203fc4fff79bb31fe 100644 (file)
--- a/utils/tex2rtf/src/tex2rtf.cpp
+++ b/utils/tex2rtf/src/tex2rtf.cpp
@@ -25,8 +25,8 @@
 #endif
 
 #ifndef NO_GUI
 #endif
 
 #ifndef NO_GUI

-#include <wx/help.h>
-#include <wx/timer.h>
+#include "wx/help.h"
+#include "wx/timer.h"

 #endif
 
 #if defined(NO_GUI) || defined(__UNIX__)
 #endif
 
 #if defined(NO_GUI) || defined(__UNIX__)


@@ -1075,7 +1075,7 @@ bool Go(void)
   return FALSE;
 }
 
   return FALSE;
 }
 

-void OnError(char *msg)
+void OnError(const char *msg)

 {
   errorCount++;
 
 {
   errorCount++;
 


@@ -1100,7 +1100,7 @@ void OnError(char *msg)
 #endif // NO_GUI
 }
 
 #endif // NO_GUI
 }
 

-void OnInform(char *msg)
+void OnInform(const char *msg)

 {
 #ifdef NO_GUI
   cout << msg << "\n";
 {
 #ifdef NO_GUI
   cout << msg << "\n";