remove @ingroup; use @category instead

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

diff --git a/utils/tex2rtf/src/tex2rtf.cpp b/utils/tex2rtf/src/tex2rtf.cpp
index 68d06b7d221e81ab2f598e16a1904904e725e15c..f903d159023ea59e5ced0677dd2de7d5af1f61db 100644 (file)
--- a/utils/tex2rtf/src/tex2rtf.cpp
+++ b/utils/tex2rtf/src/tex2rtf.cpp
@@ -47,6 +47,7 @@
 
 #include "wx/utils.h"
 
 
 #include "wx/utils.h"
 

+#include "wx/beforestd.h"

 #if wxUSE_IOSTREAMH
 #include <iostream.h>
 #include <fstream.h>
 #if wxUSE_IOSTREAMH
 #include <iostream.h>
 #include <fstream.h>


@@ -54,6 +55,7 @@
 #include <iostream>
 #include <fstream>
 #endif
 #include <iostream>
 #include <fstream>
 #endif

+#include "wx/afterstd.h"

 
 #include <ctype.h>
 #include <stdlib.h>
 
 #include <ctype.h>
 #include <stdlib.h>


@@ -66,10 +68,8 @@
 #include "tex2rtf.xpm"
 #endif
 
 #include "tex2rtf.xpm"
 #endif
 

-#if !WXWIN_COMPATIBILITY_2_4

 static inline wxChar* copystring(const wxChar* s)
     { return wxStrcpy(new wxChar[wxStrlen(s) + 1], s); }
 static inline wxChar* copystring(const wxChar* s)
     { return wxStrcpy(new wxChar[wxStrlen(s) + 1], s); }

-#endif

 
 const float versionNo = float(TEX2RTF_VERSION_NUMBER);
 
 
 const float versionNo = float(TEX2RTF_VERSION_NUMBER);
 


@@ -185,22 +185,6 @@ bool MyApp::OnInit()
 
   TexPathList.Add(::wxGetCwd());
 
 
   TexPathList.Add(::wxGetCwd());
 

-#ifdef NO_GUI
-  if (InputFile.empty() || OutputFile.empty())
-  {
-      wxSTD cout << "Tex2RTF: input or output file is missing.\n";
-      ShowOptions();
-      exit(1);
-  }
-#endif
-
-  if (!InputFile.empty())
-  {
-      TexPathList.EnsureFileAccessible(InputFile);
-  }
-  if (InputFile.empty() || OutputFile.empty())
-      isInteractive = true;
-

   int i;
   for (i = n; i < argc;)
   {
   int i;
   for (i = n; i < argc;)
   {


@@ -265,7 +249,7 @@ bool MyApp::OnInit()
       i ++;
       if (i < argc)
       {
       i ++;
       if (i < argc)
       {

-        wxChar *s = argv[i];
+        const wxChar *s = argv[i];

         i ++;
         if (wxStrcmp(s, _T("ansi")) == 0 || wxStrcmp(s, _T("pc")) == 0 || wxStrcmp(s, _T("mac")) == 0 ||
             wxStrcmp(s, _T("pca")) == 0)
         i ++;
         if (wxStrcmp(s, _T("ansi")) == 0 || wxStrcmp(s, _T("pc")) == 0 || wxStrcmp(s, _T("mac")) == 0 ||
             wxStrcmp(s, _T("pca")) == 0)


@@ -299,7 +283,6 @@ bool MyApp::OnInit()
       i ++;
       ShowVersion();
 #ifdef NO_GUI
       i ++;
       ShowVersion();
 #ifdef NO_GUI

-      ShowOptions();

       exit(1);
 #else
       return false;
       exit(1);
 #else
       return false;


@@ -309,7 +292,7 @@ bool MyApp::OnInit()
     {
       wxString buf;
       buf.Printf(_T("Invalid switch %s.\n"), argv[i]);
     {
       wxString buf;
       buf.Printf(_T("Invalid switch %s.\n"), argv[i]);

-      OnError((wxChar *)buf.c_str());
+      OnError(buf);

 #ifdef NO_GUI
       ShowOptions();
       exit(1);
 #ifdef NO_GUI
       ShowOptions();
       exit(1);


@@ -319,6 +302,22 @@ bool MyApp::OnInit()
     }
   }
 
     }
   }
 

+#ifdef NO_GUI
+  if (InputFile.empty() || OutputFile.empty())
+  {
+      wxSTD cout << "Tex2RTF: input or output file is missing.\n";
+      ShowOptions();
+      exit(1);
+  }
+#endif
+
+  if (!InputFile.empty())
+  {
+      TexPathList.EnsureFileAccessible(InputFile);
+  }
+  if (InputFile.empty() || OutputFile.empty())
+      isInteractive = true;
+

 #if defined(__WXMSW__) && !defined(NO_GUI)
   wxDDEInitialize();
   Tex2RTFLastStatus[0] = 0; // DDE connection return value
 #if defined(__WXMSW__) && !defined(NO_GUI)
   wxDDEInitialize();
   Tex2RTFLastStatus[0] = 0; // DDE connection return value


@@ -704,7 +703,7 @@ void MyFrame::OnGo(wxCommandEvent& WXUNUSED(event))
 #endif // wxUSE_STATUSBAR
         wxString errBuf;
         errBuf.Printf(_T("\nErrors encountered during this pass: %lu\n"), errorCount);
 #endif // wxUSE_STATUSBAR
         wxString errBuf;
         errBuf.Printf(_T("\nErrors encountered during this pass: %lu\n"), errorCount);

-        OnInform((wxChar *)errBuf.c_str());
+        OnInform(errBuf);

       }
 
 
       }
 
 


@@ -901,7 +900,7 @@ void ChooseInputFile(bool force)
             wxString str = wxFileNameFromPath(InputFile);
             wxString buf;
             buf.Printf(_T("Tex2RTF [%s]"), str.c_str());
             wxString str = wxFileNameFromPath(InputFile);
             wxString buf;
             buf.Printf(_T("Tex2RTF [%s]"), str.c_str());

-            frame->SetTitle((wxChar *)buf.c_str());
+            frame->SetTitle(buf);

             OutputFile = wxEmptyString;
         }
     }
             OutputFile = wxEmptyString;
         }
     }


@@ -1030,7 +1029,7 @@ bool Go(void)
     {
       wxString buf;
       buf.Printf(_T("Working, pass %d...Click CLOSE to abort"), passNumber);
     {
       wxString buf;
       buf.Printf(_T("Working, pass %d...Click CLOSE to abort"), passNumber);

-      frame->SetStatusText((wxChar *)buf.c_str());
+      frame->SetStatusText(buf);

     }
 #endif
     OkToClose = false;
     }
 #endif
     OkToClose = false;


@@ -1080,28 +1079,28 @@ bool Go(void)
 #ifndef NO_GUI
     wxLongLong elapsed = wxGetLocalTimeMillis() - localTime;
     buf.Printf(_T("Finished PASS #%d in %ld seconds.\n"), passNumber, (long)(elapsed.GetLo()/1000.0));
 #ifndef NO_GUI
     wxLongLong elapsed = wxGetLocalTimeMillis() - localTime;
     buf.Printf(_T("Finished PASS #%d in %ld seconds.\n"), passNumber, (long)(elapsed.GetLo()/1000.0));

-    OnInform((wxChar *)buf.c_str());
+    OnInform(buf);

 
     if (errorCount)
     {
         buf.Printf(_T("Errors encountered during this pass: %lu\n"), errorCount);
 
     if (errorCount)
     {
         buf.Printf(_T("Errors encountered during this pass: %lu\n"), errorCount);

-        OnInform((wxChar *)buf.c_str());
+        OnInform(buf);

     }
 
 #if wxUSE_STATUSBAR
     if (isInteractive)
     {
       buf.Printf(_T("Done, %d %s."), passNumber, (passNumber > 1) ? _T("passes") : _T("pass"));
     }
 
 #if wxUSE_STATUSBAR
     if (isInteractive)
     {
       buf.Printf(_T("Done, %d %s."), passNumber, (passNumber > 1) ? _T("passes") : _T("pass"));

-      frame->SetStatusText((wxChar *)buf.c_str());
+      frame->SetStatusText(buf);

     }
 #endif // wxUSE_STATUSBAR
 #else
     buf.Printf(_T("Done, %d %s."), passNumber, (passNumber > 1) ? _T("passes") : _T("pass"));
     }
 #endif // wxUSE_STATUSBAR
 #else
     buf.Printf(_T("Done, %d %s."), passNumber, (passNumber > 1) ? _T("passes") : _T("pass"));

-    OnInform((wxChar *)buf.c_str());
+    OnInform(buf);

     if (errorCount)
     {
         buf.Printf(_T("Errors encountered during this pass: %lu\n"), errorCount);
     if (errorCount)
     {
         buf.Printf(_T("Errors encountered during this pass: %lu\n"), errorCount);

-        OnInform((wxChar *)buf.c_str());
+        OnInform(buf.c_str());

     }
 #endif
     passNumber ++;
     }
 #endif
     passNumber ++;


@@ -1122,13 +1121,12 @@ bool Go(void)
   return false;
 }
 
   return false;
 }
 

-void OnError(const wxChar *msg)
+void OnError(const wxString& msg)

 {
 {

-    wxString msg_string = msg;

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

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

     wxSTD cerr.flush();
 #else
     if (isInteractive && frame)
     wxSTD cerr.flush();
 #else
     if (isInteractive && frame)


@@ -1138,7 +1136,7 @@ void OnError(const wxChar *msg)
     else
     {
 #if defined(__UNIX__)
     else
     {
 #if defined(__UNIX__)

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

         wxSTD cerr.flush();
 #elif defined(__WXMSW__)
         wxLogError(msg);
         wxSTD cerr.flush();
 #elif defined(__WXMSW__)
         wxLogError(msg);


@@ -1149,11 +1147,10 @@ void OnError(const wxChar *msg)
 #endif // NO_GUI
 }
 
 #endif // NO_GUI
 }
 

-void OnInform(const wxChar *msg)
+void OnInform(const wxString& msg)

 {
 {

-    wxString msg_string = msg;

 #ifdef NO_GUI
 #ifdef NO_GUI

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

     wxSTD cout.flush();
 #else
     if (isInteractive && frame)
     wxSTD cout.flush();
 #else
     if (isInteractive && frame)


@@ -1163,7 +1160,7 @@ void OnInform(const wxChar *msg)
     else
     {
 #if defined(__UNIX__)
     else
     {
 #if defined(__UNIX__)

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

         wxSTD cout.flush();
 #elif defined(__WXMSW__)
         wxLogInfo(msg);
         wxSTD cout.flush();
 #elif defined(__WXMSW__)
         wxLogInfo(msg);