From 4538b3f1b0a3f36d5fe91559afa86c1a1063f751 Mon Sep 17 00:00:00 2001 From: Gilles Depeyrot Date: Fri, 2 Nov 2001 07:13:17 +0000 Subject: [PATCH] added missing const git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@12260 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- utils/tex2rtf/src/tex2any.cpp | 4 ++-- utils/tex2rtf/src/tex2any.h | 8 ++++---- utils/tex2rtf/src/tex2rtf.cpp | 8 ++++---- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/utils/tex2rtf/src/tex2any.cpp b/utils/tex2rtf/src/tex2any.cpp index 8ce3299079..3add6ea1b9 100644 --- a/utils/tex2rtf/src/tex2any.cpp +++ b/utils/tex2rtf/src/tex2any.cpp @@ -1686,7 +1686,7 @@ bool TexLoadFile(char *filename) 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; @@ -1961,7 +1961,7 @@ void SetCurrentOutputs(FILE *fd1, FILE *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)); } diff --git a/utils/tex2rtf/src/tex2any.h b/utils/tex2rtf/src/tex2any.h index 1660cb3575..259b1d5882 100644 --- a/utils/tex2rtf/src/tex2any.h +++ b/utils/tex2rtf/src/tex2any.h @@ -50,7 +50,7 @@ class TexMacroDef: public wxObject 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); }; @@ -156,7 +156,7 @@ void SetCurrentOutput(FILE *fd); 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); @@ -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 -void OnError(char *msg); +void OnError(const char *msg); // Called for information -void OnInform(char *msg); +void OnInform(const char *msg); // Special yield wrapper void Tex2RTFYield(bool force = FALSE); diff --git a/utils/tex2rtf/src/tex2rtf.cpp b/utils/tex2rtf/src/tex2rtf.cpp index 0730851bf7..163bac5cec 100644 --- a/utils/tex2rtf/src/tex2rtf.cpp +++ b/utils/tex2rtf/src/tex2rtf.cpp @@ -25,8 +25,8 @@ #endif #ifndef NO_GUI -#include -#include +#include "wx/help.h" +#include "wx/timer.h" #endif #if defined(NO_GUI) || defined(__UNIX__) @@ -1075,7 +1075,7 @@ bool Go(void) return FALSE; } -void OnError(char *msg) +void OnError(const char *msg) { errorCount++; @@ -1100,7 +1100,7 @@ void OnError(char *msg) #endif // NO_GUI } -void OnInform(char *msg) +void OnInform(const char *msg) { #ifdef NO_GUI cout << msg << "\n"; -- 2.45.2