Small fixes for Tex2RTF but alas, we still get memory problems.

Added wxUSE_MFC setting (doesn't include windows.h, removes own memory
tracing); added include <ctype.h> in case where PCH isn't used;
wxExit now exits :-)


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

utils/tex2rtf/src/tex2rtf.cpp

@@ -241,6 +241,7 @@ bool MyApp::OnInit()
         else
         {
           OnError("Incorrect argument for -charset");
+          return FALSE;
         }
       }
     }
@@ -254,6 +255,7 @@ bool MyApp::OnInit()
       ShowOptions();
       exit(1);
 #endif
+      return FALSE;
     }
   }
 
@@ -854,7 +856,7 @@ void OnError(char *msg)
   cerr << "Error: " << msg << "\n";
   cerr.flush();
 #else
-  if (isInteractive)
+  if (isInteractive && frame)
     (*frame->textWindow) << "Error: " << msg << "\n";
   else
 #ifdef __UNIX__
@@ -876,7 +878,7 @@ void OnInform(char *msg)
   cout << msg << "\n";
   cout.flush();
 #else
-  if (isInteractive)
+  if (isInteractive && frame)
     (*frame->textWindow) << msg << "\n";
   else
 #ifdef __WXMSW__

utils/tex2rtf/src/tex2rtf.ini

@@ -1,17 +1,22 @@
+; Tex2RTF initialisation file
 runTwice = yes
 titleFontSize = 12
 authorFontSize = 10
 chapterFontSize = 12
 sectionFontSize = 12
 subsectionFontSize = 12
-; RTF only
 headerRule = yes
 footerRule = yes
 useHeadingStyles = yes
+contentsDepth = 2
 listItemIndent=40
-truncateFilenames = FALSE
 winHelpContents = yes
-winHelpVersion = 4 ; 3 for Windows 3.x, 4 for Windows 95
-generateHPJ = true
-\overview [2] { \image{}{books.bmp}\helpref{#1}{#2}}
-; Some stuff
+winHelpVersion = 3 ; 3 for Windows 3.x, 4 for Windows 95
+generateHPJ = no
+htmlBrowseButtons = bitmap
+winHelpTitle = "Help Demo Document"
+truncateFilenames = yes
+combineSubSections = yes
+htmlIndex = yes
+htmlFrameContents = no
+htmlWorkshopFiles = yes

utils/tex2rtf/src/texutils.cpp

@@ -1569,7 +1569,8 @@ void Tex2RTFYield(bool force)
     yieldCount = 0;
   if (yieldCount == 0)
   {
-    wxYield();
+    if (wxTheApp)
+        wxYield();
     yieldCount = 10;
   }
   yieldCount --;