compilation fix

[wxWidgets.git] / utils / tex2rtf / src / tex2rtf.cpp

diff --git a/utils/tex2rtf/src/tex2rtf.cpp b/utils/tex2rtf/src/tex2rtf.cpp
index 0730851bf7b1a1f3e46d1b06906ae69c988d1efc..50b4466234068be1b5006e7c6c58d20fffa6aedf 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__)


@@ -192,7 +192,7 @@ bool MyApp::OnInit()
 
   if (!InputFile || !OutputFile)
   {
 
   if (!InputFile || !OutputFile)
   {

-    cout << "Tex2RTF: input or output file is missing.\n";
+    wxSTD cout << "Tex2RTF: input or output file is missing.\n";

     ShowOptions();
     exit(1);
   }
     ShowOptions();
     exit(1);
   }


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

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

 {
   errorCount++;
 
 #ifdef NO_GUI
 {
   errorCount++;
 
 #ifdef NO_GUI

-  cerr << "Error: " << msg << "\n";
-  cerr.flush();
+  wxSTD cerr << "Error: " << msg << "\n";
+  wxSTD cerr.flush();

 #else
   if (isInteractive && frame)
     (*frame->textWindow) << "Error: " << msg << "\n";
   else
 #ifdef __UNIX__
   {
 #else
   if (isInteractive && frame)
     (*frame->textWindow) << "Error: " << msg << "\n";
   else
 #ifdef __UNIX__
   {

-    cerr << "Error: " << msg << "\n";
-    cerr.flush();
+    wxSTD cerr << "Error: " << msg << "\n";
+    wxSTD cerr.flush();

   }
 #endif
 
   }
 #endif
 


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

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

 {
 #ifdef NO_GUI
 {
 #ifdef NO_GUI

-  cout << msg << "\n";
-  cout.flush();
+  wxSTD cout << msg << "\n";
+  wxSTD cout.flush();

 #else
   if (isInteractive && frame)
     (*frame->textWindow) << msg << "\n";
 #else
   if (isInteractive && frame)
     (*frame->textWindow) << msg << "\n";


@@ -1116,8 +1116,8 @@ void OnInform(char *msg)
   else
 #ifdef __WXMSW__
   {
   else
 #ifdef __WXMSW__
   {

-    cout << msg << "\n";
-    cout.flush();
+    wxSTD cout << msg << "\n";
+    wxSTD cout.flush();

   }
 #endif
 #ifdef __WXMSW__
   }
 #endif
 #ifdef __WXMSW__