fixed bug with the caret positioning after SetValue() introduced by the last commit

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

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


@@ -45,7 +45,7 @@
 #include "tex2rtf.h"
 #include "rtfutils.h"
 
 #include "tex2rtf.h"
 #include "rtfutils.h"
 

-#if (defined(__WXGTK__) || defined(__WXMOTIF__)) && !defined(NO_GUI)
+#if (defined(__WXGTK__) || defined(__WXMOTIF__) || defined(__WXMAC__)) && !defined(NO_GUI)

 #include "tex2rtf.xpm"
 #endif
 
 #include "tex2rtf.xpm"
 #endif
 


@@ -119,7 +119,7 @@ char *ContentsName = NULL;    // Contents page from last time around
 char *TmpContentsName = NULL; // Current contents page
 char *TmpFrameContentsName = NULL; // Current frame contents page
 char *WinHelpContentsFileName = NULL; // WinHelp .cnt file
 char *TmpContentsName = NULL; // Current contents page
 char *TmpFrameContentsName = NULL; // Current frame contents page
 char *WinHelpContentsFileName = NULL; // WinHelp .cnt file

-char *RefName = NULL;         // Reference file name
+char *RefFileName = NULL;         // Reference file name

 
 char *RTFCharset = copystring("ansi");
 
 
 char *RTFCharset = copystring("ansi");
 


@@ -161,7 +161,7 @@ bool MyApp::OnInit()
   TmpContentsName = new char[300];
   TmpFrameContentsName = new char[300];
   WinHelpContentsFileName = new char[300];
   TmpContentsName = new char[300];
   TmpFrameContentsName = new char[300];
   WinHelpContentsFileName = new char[300];

-  RefName = new char[300];
+  RefFileName = new char[300];

 
   ColourTable.DeleteContents(TRUE);
 
 
   ColourTable.DeleteContents(TRUE);
 


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


@@ -530,10 +530,10 @@ int MyApp::OnExit()
       delete WinHelpContentsFileName;
       WinHelpContentsFileName = NULL;
     }
       delete WinHelpContentsFileName;
       WinHelpContentsFileName = NULL;
     }

-    if (RefName)
+    if (RefFileName)

     {
     {

-      delete RefName;
-      RefName = NULL;
+      delete RefFileName;
+      RefFileName = NULL;

     }
     if (TopLevel)
     {
     }
     if (TopLevel)
     {


@@ -591,7 +591,9 @@ void ShowOptions(void)
     OnInform(buf);
     OnInform("Usage: tex2rtf [input] [output] [switches]\n");
     OnInform("where valid switches are");
     OnInform(buf);
     OnInform("Usage: tex2rtf [input] [output] [switches]\n");
     OnInform("where valid switches are");

+#ifndef NO_GUI

     OnInform("    -interactive");
     OnInform("    -interactive");

+#endif

     OnInform("    -bufsize <size in K>");
     OnInform("    -charset <pc | pca | ansi | mac> (default ansi)");
     OnInform("    -twice");
     OnInform("    -bufsize <size in K>");
     OnInform("    -charset <pc | pca | ansi | mac> (default ansi)");
     OnInform("    -twice");


@@ -665,7 +667,16 @@ void MyFrame::OnGo(wxCommandEvent& event)
       Tex2RTFYield(TRUE);
       Go();
 
       Tex2RTFYield(TRUE);
       Go();
 

-      if (runTwice)
+      if (stopRunning)
+      {
+        SetStatusText("Build aborted!");
+        wxString errBuf;
+        errBuf.Printf("\nErrors encountered during this pass: %lu\n", errorCount);
+        OnInform((char *)errBuf.c_str());
+      }
+
+
+      if (runTwice && !stopRunning)

       {
         Tex2RTFYield(TRUE);
         Go();
       {
         Tex2RTFYield(TRUE);
         Go();


@@ -907,7 +918,7 @@ bool Go(void)
   ChooseOutputFile();
 #endif
 
   ChooseOutputFile();
 #endif
 

-  if (!InputFile || !OutputFile)
+  if (!InputFile || !OutputFile || stopRunning)

     return FALSE;
 
 #ifndef NO_GUI
     return FALSE;
 
 #ifndef NO_GUI


@@ -943,7 +954,7 @@ bool Go(void)
   sprintf(TmpContentsName, "%s.cn1", FileRoot);
   sprintf(TmpFrameContentsName, "%s.frc", FileRoot);
   sprintf(WinHelpContentsFileName, "%s.cnt", FileRoot);
   sprintf(TmpContentsName, "%s.cn1", FileRoot);
   sprintf(TmpFrameContentsName, "%s.frc", FileRoot);
   sprintf(WinHelpContentsFileName, "%s.cnt", FileRoot);

-  sprintf(RefName, "%s.ref", FileRoot);
+  sprintf(RefFileName, "%s.ref", FileRoot);

 
   TexPathList.EnsureFileAccessible(InputFile);
   if (!bulletFile)
 
   TexPathList.EnsureFileAccessible(InputFile);
   if (!bulletFile)


@@ -956,8 +967,8 @@ bool Go(void)
     }
   }
 
     }
   }
 

-  if (wxFileExists(RefName))
-    ReadTexReferences(RefName);
+  if (wxFileExists(RefFileName))
+    ReadTexReferences(RefFileName);

 
   bool success = FALSE;
 
 
   bool success = FALSE;
 


@@ -981,6 +992,12 @@ bool Go(void)
     OnInform("Reading LaTeX file...");
     TexLoadFile(InputFile);
 
     OnInform("Reading LaTeX file...");
     TexLoadFile(InputFile);
 

+    if (stopRunning)
+    {
+        OkToClose = TRUE;
+        return FALSE;
+    }
+

     switch (convertMode)
     {
       case TEX_RTF:
     switch (convertMode)
     {
       case TEX_RTF:


@@ -1005,11 +1022,12 @@ bool Go(void)
     OnInform("*** Aborted by user.");
     success = FALSE;
     stopRunning = FALSE;
     OnInform("*** Aborted by user.");
     success = FALSE;
     stopRunning = FALSE;

+    OkToClose = TRUE;

   }
 
   if (success)
   {
   }
 
   if (success)
   {

-    WriteTexReferences(RefName);
+    WriteTexReferences(RefFileName);

     TexCleanUp();
     startedSections = FALSE;
 
     TexCleanUp();
     startedSections = FALSE;
 


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


@@ -1082,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";


@@ -1098,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__