X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/6c155d33875eb3641bf845fbac186c1b5470708e..e18c3e02072753d45643316005bfd022a9d3d7cd:/utils/tex2rtf/src/tex2rtf.cpp diff --git a/utils/tex2rtf/src/tex2rtf.cpp b/utils/tex2rtf/src/tex2rtf.cpp index f3f655fb19..83b624cab4 100644 --- a/utils/tex2rtf/src/tex2rtf.cpp +++ b/utils/tex2rtf/src/tex2rtf.cpp @@ -2,7 +2,8 @@ // Name: tex2rtf.cpp // Purpose: Converts Latex to linear/WinHelp RTF, HTML, wxHelp. // Author: Julian Smart -// Modified by: +// Modified by: Wlodzimiez ABX Skiba 2003/2004 Unicode support +// Ron Lee // Created: 7.9.93 // RCS-ID: $Id$ // Copyright: (c) Julian Smart @@ -26,15 +27,22 @@ #include "wx/textctrl.h" #include "wx/filedlg.h" #include "wx/msgdlg.h" + #include "wx/icon.h" #endif #endif #ifndef NO_GUI -#include "wx/help.h" -#include "wx/timer.h" -#endif + #include "wx/timer.h" + #include "wx/help.h" + #include "wx/cshelp.h" + #include "wx/helphtml.h" + #ifdef __WXMSW__ + #include "wx/msw/helpchm.h" + #else + #include "wx/html/helpctrl.h" + #endif +#endif // !NO_GUI -#if defined(NO_GUI) || defined(__UNIX__) #if wxUSE_IOSTREAMH #include #include @@ -42,7 +50,6 @@ #include #include #endif -#endif #include #include @@ -60,13 +67,13 @@ static inline wxChar* copystring(const wxChar* s) { return wxStrcpy(new wxChar[wxStrlen(s) + 1], s); } #endif -const float versionNo = TEX2RTF_VERSION_NUMBER; +const float versionNo = float(TEX2RTF_VERSION_NUMBER); TexChunk *currentMember = NULL; -bool startedSections = FALSE; +bool startedSections = false; wxChar *contentsString = NULL; -bool suppressNameDecoration = FALSE; -bool OkToClose = TRUE; +bool suppressNameDecoration = false; +bool OkToClose = true; int passNumber = 1; unsigned long errorCount = 0; @@ -79,18 +86,17 @@ extern wxChar *TexTmpBibName; // Temporary bibliography output file name extern wxList ColourTable; extern TexChunk *TopLevel; - - #if wxUSE_HELP -wxHelpController *HelpInstance = NULL; +wxHelpControllerBase *HelpInstance = NULL; #endif // wxUSE_HELP #ifdef __WXMSW__ static wxChar *ipc_buffer = NULL; static wxChar Tex2RTFLastStatus[100]; Tex2RTFServer *TheTex2RTFServer = NULL; -#endif -#endif +#endif // __WXMSW__ + +#endif // !NO_GUI wxChar *bulletFile = NULL; @@ -127,18 +133,16 @@ void ShowOptions(void); wxChar wxTex2RTFBuffer[1500]; #ifdef NO_GUI - -int main(int argc, char **argv) + IMPLEMENT_APP_CONSOLE(MyApp) #else -wxMenuBar *menuBar = NULL; -MyFrame *frame = NULL; - -// DECLARE_APP(MyApp) -IMPLEMENT_APP(MyApp) + wxMenuBar *menuBar = NULL; + MyFrame *frame = NULL; + // DECLARE_APP(MyApp) + IMPLEMENT_APP(MyApp) +#endif // `Main program' equivalent, creating windows and returning main app frame bool MyApp::OnInit() -#endif { // Use default list of macros defined in tex2any.cc DefineDefaultMacros(); @@ -151,7 +155,7 @@ bool MyApp::OnInit() WinHelpContentsFileName = new wxChar[300]; RefFileName = new wxChar[300]; - ColourTable.DeleteContents(TRUE); + WX_CLEAR_LIST(wxList,ColourTable); int n = 1; @@ -181,14 +185,14 @@ bool MyApp::OnInit() ShowOptions(); exit(1); } - #endif + if (InputFile) { TexPathList.EnsureFileAccessible(InputFile); } if (!InputFile || !OutputFile) - isInteractive = TRUE; + isInteractive = true; int i; for (i = n; i < argc;) @@ -197,19 +201,19 @@ bool MyApp::OnInit() { i ++; convertMode = TEX_RTF; - winHelp = TRUE; + winHelp = true; } #ifndef NO_GUI else if (wxStrcmp(argv[i], _T("-interactive")) == 0) { i ++; - isInteractive = TRUE; + isInteractive = true; } #endif else if (wxStrcmp(argv[i], _T("-sync")) == 0) // Don't yield { i ++; - isSync = TRUE; + isSync = true; } else if (wxStrcmp(argv[i], _T("-rtf")) == 0) { @@ -229,7 +233,7 @@ bool MyApp::OnInit() else if (wxStrcmp(argv[i], _T("-twice")) == 0) { i ++; - runTwice = TRUE; + runTwice = true; } else if (wxStrcmp(argv[i], _T("-macros")) == 0) { @@ -262,19 +266,26 @@ bool MyApp::OnInit() else { OnError(_T("Incorrect argument for -charset")); - return FALSE; + return false; } } } + else if (wxStrcmp(argv[i], _T("-checkcurlybraces")) == 0) + { + i ++; + checkCurlyBraces = true; + } else if (wxStrcmp(argv[i], _T("-checkcurleybraces")) == 0) { + // Support the old, incorrectly spelled version of -checkcurlybraces + // so that old scripts which run tex2rtf -checkcurleybraces still work. i ++; - checkCurleyBraces = TRUE; + checkCurlyBraces = true; } else if (wxStrcmp(argv[i], _T("-checksyntax")) == 0) { i ++; - checkSyntax = TRUE; + checkSyntax = true; } else { @@ -284,8 +295,9 @@ bool MyApp::OnInit() #ifdef NO_GUI ShowOptions(); exit(1); +#else + return false; #endif - return FALSE; } } @@ -296,11 +308,6 @@ bool MyApp::OnInit() TheTex2RTFServer->Create(_T("TEX2RTF")); #endif -#if defined(__WXMSW__) && defined(__WIN16__) - // Limit to max Windows array size - if (BufSize > 64) BufSize = 64; -#endif - TexInitialize(BufSize); ResetContentsLevels(0); @@ -311,8 +318,10 @@ bool MyApp::OnInit() wxChar buf[100]; // Create the main frame window - frame = new MyFrame(NULL, -1, _T("Tex2RTF"), wxPoint(-1, -1), wxSize(400, 300)); + frame = new MyFrame(NULL, wxID_ANY, _T("Tex2RTF"), wxDefaultPosition, wxSize(400, 300)); +#if wxUSE_STATUSBAR frame->CreateStatusBar(2); +#endif // wxUSE_STATUSBAR // Give it an icon // TODO: uncomment this when we have tex2rtf.xpm @@ -320,7 +329,7 @@ bool MyApp::OnInit() if (InputFile) { - wxSprintf(buf, _T("Tex2RTF [%s]"), wxFileNameFromPath(InputFile)); + wxSnprintf(buf, sizeof(buf), _T("Tex2RTF [%s]"), wxFileNameFromPath(InputFile)); frame->SetTitle(buf); } @@ -350,10 +359,10 @@ bool MyApp::OnInit() wxMenu *options_menu = new wxMenu; - options_menu->Append(TEX_OPTIONS_CURELY_BRACE, _T("Curley brace matching"), _T("Checks for mismatched curley braces"),TRUE); - options_menu->Append(TEX_OPTIONS_SYNTAX_CHECKING, _T("Syntax checking"), _T("Syntax checking for common errors"),TRUE); + options_menu->Append(TEX_OPTIONS_CURLY_BRACE, _T("Curly brace matching"), _T("Checks for mismatched curly braces"),true); + options_menu->Append(TEX_OPTIONS_SYNTAX_CHECKING, _T("Syntax checking"), _T("Syntax checking for common errors"),true); - options_menu->Check(TEX_OPTIONS_CURELY_BRACE, checkCurleyBraces); + options_menu->Check(TEX_OPTIONS_CURLY_BRACE, checkCurlyBraces); options_menu->Check(TEX_OPTIONS_SYNTAX_CHECKING, checkSyntax); wxMenu *help_menu = new wxMenu; @@ -369,13 +378,17 @@ bool MyApp::OnInit() menuBar->Append(help_menu, _T("&Help")); frame->SetMenuBar(menuBar); - frame->textWindow = new wxTextCtrl(frame, -1, _T(""), wxPoint(-1, -1), wxSize(-1, -1), wxTE_READONLY|wxTE_MULTILINE); + frame->textWindow = new wxTextCtrl(frame, wxID_ANY, _T(""), wxDefaultPosition, wxDefaultSize, wxTE_READONLY|wxTE_MULTILINE); (*frame->textWindow) << _T("Welcome to Tex2RTF.\n"); // ShowOptions(); #if wxUSE_HELP - HelpInstance = new wxHelpController(); +#if wxUSE_MS_HTML_HELP && !defined(__WXUNIVERSAL__) + HelpInstance = new wxCHMHelpController; +#else + HelpInstance = new wxHtmlHelpController; +#endif HelpInstance->Initialize(_T("tex2rtf")); #endif // wxUSE_HELP @@ -385,22 +398,32 @@ bool MyApp::OnInit() */ wxString path = TexPathList.FindValidPath(MacroFile); - if (path != _T("")) + if (!path.empty()) ReadCustomMacros((wxChar *)path.c_str()); +#if wxUSE_STATUSBAR wxStrcpy(buf, _T("In ")); - - if (winHelp && (convertMode == TEX_RTF)) - wxStrcat(buf, _T("WinHelp RTF")); - else if (!winHelp && (convertMode == TEX_RTF)) - wxStrcat(buf, _T("linear RTF")); - else if (convertMode == TEX_HTML) wxStrcat(buf, _T("HTML")); - else if (convertMode == TEX_XLP) wxStrcat(buf, _T("XLP")); - wxStrcat(buf, _T(" mode.")); + switch (convertMode) + { + case TEX_RTF: + wxStrcat(buf, (winHelp) ? _T("WinHelp RTF") : _T("linear RTF")); + break; + case TEX_HTML: + wxStrcat(buf, _T("HTML")); + break; + case TEX_XLP: + wxStrcat(buf, _T("XLP")); + break; + default: + wxStrcat(buf, _T("unknown")); + break; + } + wxStrcat(buf, _T(" mode.")); frame->SetStatusText(buf, 1); +#endif // wxUSE_STATUSBAR - frame->Show(TRUE); - return TRUE; + frame->Show(true); + return true; } else #endif // NO_GUI @@ -411,30 +434,21 @@ bool MyApp::OnInit() */ wxString path = TexPathList.FindValidPath(MacroFile); - if (path != _T("")) + if (!path.empty()) ReadCustomMacros((wxChar*)path.c_str()); Go(); - if (runTwice) + if (runTwice) { Go(); } #ifdef NO_GUI - return 0; + return true; #else - return FALSE; + OnExit(); // Do cleanup since OnExit won't be called now + return false; #endif } - -#if 0 - // it already returned something, no need to cause warning -#ifndef NO_GUI - // Return the main frame window - return TRUE; -#else - return 0; -#endif -#endif } #ifndef NO_GUI @@ -449,12 +463,12 @@ int MyApp::OnExit() node = CustomMacroList.GetFirst(); } MacroDefs.BeginFind(); - node = MacroDefs.Next(); - while (node) + wxHashTable::Node* mNode = MacroDefs.Next(); + while (mNode) { - TexMacroDef* def = (TexMacroDef*) node->GetData(); + TexMacroDef* def = (TexMacroDef*) mNode->GetData(); delete def; - node = MacroDefs.Next(); + mNode = MacroDefs.Next(); } MacroDefs.Clear(); #ifdef __WXMSW__ @@ -573,7 +587,7 @@ int MyApp::OnExit() void ShowOptions(void) { wxChar buf[100]; - wxSprintf(buf, _T("Tex2RTF version %.2f"), versionNo); + wxSnprintf(buf, sizeof(buf), _T("Tex2RTF version %.2f"), versionNo); OnInform(buf); OnInform(_T("Usage: tex2rtf [input] [output] [switches]\n")); OnInform(_T("where valid switches are")); @@ -584,7 +598,7 @@ void ShowOptions(void) OnInform(_T(" -charset (default ansi)")); OnInform(_T(" -twice")); OnInform(_T(" -sync")); - OnInform(_T(" -checkcurleybraces")); + OnInform(_T(" -checkcurlybraces")); OnInform(_T(" -checksyntax")); OnInform(_T(" -macros ")); OnInform(_T(" -winhelp")); @@ -610,7 +624,7 @@ BEGIN_EVENT_TABLE(MyFrame, wxFrame) EVT_MENU(TEX_MODE_WINHELP, MyFrame::OnModeWinHelp) EVT_MENU(TEX_MODE_HTML, MyFrame::OnModeHTML) EVT_MENU(TEX_MODE_XLP, MyFrame::OnModeXLP) - EVT_MENU(TEX_OPTIONS_CURELY_BRACE, MyFrame::OnOptionsCurleyBrace) + EVT_MENU(TEX_OPTIONS_CURLY_BRACE, MyFrame::OnOptionsCurlyBrace) EVT_MENU(TEX_OPTIONS_SYNTAX_CHECKING, MyFrame::OnOptionsSyntaxChecking) EVT_MENU(TEX_HELP, MyFrame::OnHelp) EVT_MENU(TEX_ABOUT, MyFrame::OnAbout) @@ -625,8 +639,8 @@ void MyFrame::OnCloseWindow(wxCloseEvent& WXUNUSED(event)) { if (!stopRunning && !OkToClose) { - stopRunning = TRUE; - runTwice = FALSE; + stopRunning = true; + runTwice = false; return; } else if (OkToClose) @@ -645,17 +659,19 @@ void MyFrame::OnGo(wxCommandEvent& WXUNUSED(event)) { passNumber = 1; errorCount = 0; - menuBar->EnableTop(0, FALSE); - menuBar->EnableTop(1, FALSE); - menuBar->EnableTop(2, FALSE); - menuBar->EnableTop(3, FALSE); + menuBar->EnableTop(0, false); + menuBar->EnableTop(1, false); + menuBar->EnableTop(2, false); + menuBar->EnableTop(3, false); textWindow->Clear(); - Tex2RTFYield(TRUE); + Tex2RTFYield(true); Go(); if (stopRunning) { +#if wxUSE_STATUSBAR SetStatusText(_T("Build aborted!")); +#endif // wxUSE_STATUSBAR wxString errBuf; errBuf.Printf(_T("\nErrors encountered during this pass: %lu\n"), errorCount); OnInform((wxChar *)errBuf.c_str()); @@ -664,23 +680,23 @@ void MyFrame::OnGo(wxCommandEvent& WXUNUSED(event)) if (runTwice && !stopRunning) { - Tex2RTFYield(TRUE); + Tex2RTFYield(true); Go(); } - menuBar->EnableTop(0, TRUE); - menuBar->EnableTop(1, TRUE); - menuBar->EnableTop(2, TRUE); - menuBar->EnableTop(3, TRUE); + menuBar->EnableTop(0, true); + menuBar->EnableTop(1, true); + menuBar->EnableTop(2, true); + menuBar->EnableTop(3, true); } void MyFrame::OnSetInput(wxCommandEvent& WXUNUSED(event)) { - ChooseInputFile(TRUE); + ChooseInputFile(true); } void MyFrame::OnSetOutput(wxCommandEvent& WXUNUSED(event)) { - ChooseOutputFile(TRUE); + ChooseOutputFile(true); } void MyFrame::OnSaveFile(wxCommandEvent& WXUNUSED(event)) @@ -689,9 +705,11 @@ void MyFrame::OnSaveFile(wxCommandEvent& WXUNUSED(event)) if (s != _T("")) { textWindow->SaveFile(s); +#if wxUSE_STATUSBAR wxChar buf[350]; - wxSprintf(buf, _T("Saved text to %s"), (const wxChar*) s.c_str()); + wxSnprintf(buf, sizeof(buf), _T("Saved text to %s"), (const wxChar*) s.c_str()); frame->SetStatusText(buf, 0); +#endif // wxUSE_STATUSBAR } } @@ -703,7 +721,7 @@ void MyFrame::OnViewOutput(wxCommandEvent& WXUNUSED(event)) textWindow->LoadFile(OutputFile); wxChar buf[300]; wxString str(wxFileNameFromPath(OutputFile)); - wxSprintf(buf, _T("Tex2RTF [%s]"), (const wxChar*) str.c_str()); + wxSnprintf(buf, sizeof(buf), _T("Tex2RTF [%s]"), (const wxChar*) str.c_str()); frame->SetTitle(buf); } } @@ -716,7 +734,7 @@ void MyFrame::OnViewLatex(wxCommandEvent& WXUNUSED(event)) textWindow->LoadFile(InputFile); wxChar buf[300]; wxString str(wxFileNameFromPath(OutputFile)); - wxSprintf(buf, _T("Tex2RTF [%s]"), (const wxChar*) str.c_str()); + wxSnprintf(buf, sizeof(buf), _T("Tex2RTF [%s]"), (const wxChar*) str.c_str()); frame->SetTitle(buf); } } @@ -725,7 +743,7 @@ void MyFrame::OnLoadMacros(wxCommandEvent& WXUNUSED(event)) { textWindow->Clear(); wxString s = wxFileSelector(_T("Choose custom macro file"), wxPathOnly(MacroFile), wxFileNameFromPath(MacroFile), _T("ini"), _T("*.ini")); - if (s != _T("") && wxFileExists(s)) + if (!s.empty() && wxFileExists(s)) { MacroFile = copystring(s); ReadCustomMacros((wxChar *)s.c_str()); @@ -736,35 +754,41 @@ void MyFrame::OnLoadMacros(wxCommandEvent& WXUNUSED(event)) void MyFrame::OnShowMacros(wxCommandEvent& WXUNUSED(event)) { textWindow->Clear(); - Tex2RTFYield(TRUE); + Tex2RTFYield(true); ShowCustomMacros(); } void MyFrame::OnModeRTF(wxCommandEvent& WXUNUSED(event)) { convertMode = TEX_RTF; - winHelp = FALSE; + winHelp = false; InputFile = NULL; OutputFile = NULL; +#if wxUSE_STATUSBAR SetStatusText(_T("In linear RTF mode."), 1); +#endif // wxUSE_STATUSBAR } void MyFrame::OnModeWinHelp(wxCommandEvent& WXUNUSED(event)) { convertMode = TEX_RTF; - winHelp = TRUE; + winHelp = true; InputFile = NULL; OutputFile = NULL; +#if wxUSE_STATUSBAR SetStatusText(_T("In WinHelp RTF mode."), 1); +#endif // wxUSE_STATUSBAR } void MyFrame::OnModeHTML(wxCommandEvent& WXUNUSED(event)) { convertMode = TEX_HTML; - winHelp = FALSE; + winHelp = false; InputFile = NULL; OutputFile = NULL; +#if wxUSE_STATUSBAR SetStatusText(_T("In HTML mode."), 1); +#endif // wxUSE_STATUSBAR } void MyFrame::OnModeXLP(wxCommandEvent& WXUNUSED(event)) @@ -772,26 +796,31 @@ void MyFrame::OnModeXLP(wxCommandEvent& WXUNUSED(event)) convertMode = TEX_XLP; InputFile = NULL; OutputFile = NULL; +#if wxUSE_STATUSBAR SetStatusText(_T("In XLP mode."), 1); +#endif // wxUSE_STATUSBAR } -void MyFrame::OnOptionsCurleyBrace(wxCommandEvent& WXUNUSED(event)) +void MyFrame::OnOptionsCurlyBrace(wxCommandEvent& WXUNUSED(event)) { - checkCurleyBraces = !checkCurleyBraces; - if (checkCurleyBraces) + checkCurlyBraces = !checkCurlyBraces; +#if wxUSE_STATUSBAR + if (checkCurlyBraces) { - SetStatusText(_T("Checking curley braces: YES"), 1); + SetStatusText(_T("Checking curly braces: YES"), 1); } else { - SetStatusText(_T("Checking curley braces: NO"), 1); + SetStatusText(_T("Checking curly braces: NO"), 1); } +#endif // wxUSE_STATUSBAR } void MyFrame::OnOptionsSyntaxChecking(wxCommandEvent& WXUNUSED(event)) { checkSyntax = !checkSyntax; +#if wxUSE_STATUSBAR if (checkSyntax) { SetStatusText(_T("Checking syntax: YES"), 1); @@ -800,6 +829,7 @@ void MyFrame::OnOptionsSyntaxChecking(wxCommandEvent& WXUNUSED(event)) { SetStatusText(_T("Checking syntax: NO"), 1); } +#endif // wxUSE_STATUSBAR } @@ -823,7 +853,7 @@ void MyFrame::OnAbout(wxCommandEvent& WXUNUSED(event)) wxChar *platform = _T(""); #endif #endif - wxSprintf(buf, _T("Tex2RTF Version %.2f%s\nLaTeX to RTF, WinHelp, and HTML Conversion\n\n(c) Julian Smart, George Tasker and others, 1999-2002"), versionNo, platform); + wxSnprintf(buf, sizeof(buf), _T("Tex2RTF Version %.2f%s\nLaTeX to RTF, WinHelp, and HTML Conversion\n\n(c) Julian Smart, George Tasker and others, 1999-2002"), versionNo, platform); wxMessageBox(buf, _T("About Tex2RTF")); } @@ -832,7 +862,7 @@ void ChooseInputFile(bool force) if (force || !InputFile) { wxString s = wxFileSelector(_T("Choose LaTeX input file"), wxPathOnly(InputFile), wxFileNameFromPath(InputFile), _T("tex"), _T("*.tex")); - if (s != _T("")) + if (!s.empty()) { // Different file, so clear index entries. ClearKeyWordTable(); @@ -877,13 +907,8 @@ void ChooseOutputFile(bool force) } case TEX_HTML: { -#if defined(__WXMSW__) && defined(__WIN16__) - wxStrcpy(extensionBuf, _T("htm")); - wxStrcat(wildBuf, _T("htm")); -#else wxStrcpy(extensionBuf, _T("html")); wxStrcat(wildBuf, _T("html")); -#endif break; } } @@ -891,7 +916,7 @@ void ChooseOutputFile(bool force) { wxString s = wxFileSelector(_T("Choose output file"), path, wxFileNameFromPath(OutputFile), extensionBuf, wildBuf); - if (s != _T("")) + if (!s.empty()) OutputFile = copystring(s); } } @@ -905,7 +930,7 @@ bool Go(void) #endif if (!InputFile || !OutputFile || stopRunning) - return FALSE; + return false; #ifndef NO_GUI if (isInteractive) @@ -913,7 +938,7 @@ bool Go(void) wxChar buf[300]; wxString str = wxFileNameFromPath(InputFile); - wxSprintf(buf, _T("Tex2RTF [%s]"), (const wxChar*) str); + wxSnprintf(buf, sizeof(buf), _T("Tex2RTF [%s]"), (const wxChar*) str); frame->SetTitle(buf); } @@ -936,17 +961,17 @@ bool Go(void) sName[5] = '\0'; // that should do! } - wxSprintf(ContentsName, _T("%s.con"), FileRoot); - wxSprintf(TmpContentsName, _T("%s.cn1"), FileRoot); - wxSprintf(TmpFrameContentsName, _T("%s.frc"), FileRoot); - wxSprintf(WinHelpContentsFileName, _T("%s.cnt"), FileRoot); - wxSprintf(RefFileName, _T("%s.ref"), FileRoot); + wxSnprintf(ContentsName, 300, _T("%s.con"), FileRoot); + wxSnprintf(TmpContentsName, 300, _T("%s.cn1"), FileRoot); + wxSnprintf(TmpFrameContentsName, 300, _T("%s.frc"), FileRoot); + wxSnprintf(WinHelpContentsFileName, 300, _T("%s.cnt"), FileRoot); + wxSnprintf(RefFileName, 300, _T("%s.ref"), FileRoot); TexPathList.EnsureFileAccessible(InputFile); if (!bulletFile) { wxString s = TexPathList.FindValidPath(_T("bullet.bmp")); - if (s != _T("")) + if (!s.empty()) { wxString str = wxFileNameFromPath(s); bulletFile = copystring(str); @@ -956,7 +981,7 @@ bool Go(void) if (wxFileExists(RefFileName)) ReadTexReferences(RefFileName); - bool success = FALSE; + bool success = false; if (InputFile && OutputFile) { @@ -964,9 +989,9 @@ bool Go(void) { OnError(_T("Cannot open input file!")); TexCleanUp(); - return FALSE; + return false; } -#ifndef NO_GUI +#if !defined(NO_GUI) && wxUSE_STATUSBAR if (isInteractive) { wxString buf; @@ -974,14 +999,14 @@ bool Go(void) frame->SetStatusText((wxChar *)buf.c_str()); } #endif - OkToClose = FALSE; + OkToClose = false; OnInform(_T("Reading LaTeX file...")); TexLoadFile(InputFile); if (stopRunning) { - OkToClose = TRUE; - return FALSE; + OkToClose = true; + return false; } switch (convertMode) @@ -1006,16 +1031,16 @@ bool Go(void) if (stopRunning) { OnInform(_T("*** Aborted by user.")); - success = FALSE; - stopRunning = FALSE; - OkToClose = TRUE; + success = false; + stopRunning = false; + OkToClose = true; } if (success) { WriteTexReferences(RefFileName); TexCleanUp(); - startedSections = FALSE; + startedSections = false; wxString buf; #ifndef NO_GUI @@ -1029,11 +1054,13 @@ bool Go(void) OnInform((wxChar *)buf.c_str()); } +#if wxUSE_STATUSBAR if (isInteractive) { buf.Printf(_T("Done, %d %s."), passNumber, (passNumber > 1) ? _T("passes") : _T("pass")); frame->SetStatusText((wxChar *)buf.c_str()); } +#endif // wxUSE_STATUSBAR #else buf.Printf(_T("Done, %d %s."), passNumber, (passNumber > 1) ? _T("passes") : _T("pass")); OnInform((wxChar *)buf.c_str()); @@ -1045,28 +1072,29 @@ bool Go(void) #endif passNumber ++; errorCount = 0; - OkToClose = TRUE; - return TRUE; + OkToClose = true; + return true; } TexCleanUp(); - startedSections = FALSE; + startedSections = false; -#ifndef NO_GUI +#if !defined(NO_GUI) && wxUSE_STATUSBAR frame->SetStatusText(_T("Aborted by user.")); #endif // GUI OnInform(_T("Sorry, unsuccessful.")); - OkToClose = TRUE; - return FALSE; + OkToClose = true; + return false; } void OnError(const wxChar *msg) { + wxString msg_string = msg; errorCount++; #ifdef NO_GUI - wxSTD cerr << "Error: " << msg << "\n"; + wxSTD cerr << "Error: " << msg_string.mb_str() << "\n"; wxSTD cerr.flush(); #else if (isInteractive && frame) @@ -1074,7 +1102,7 @@ void OnError(const wxChar *msg) else #ifdef __UNIX__ { - wxSTD cerr << "Error: " << msg << "\n"; + wxSTD cerr << "Error: " << msg_string.mb_str() << "\n"; wxSTD cerr.flush(); } #endif @@ -1082,27 +1110,28 @@ void OnError(const wxChar *msg) #ifdef __WXMSW__ wxLogError(msg); #endif - Tex2RTFYield(TRUE); + Tex2RTFYield(true); #endif // NO_GUI } void OnInform(const wxChar *msg) { + wxString msg_string = msg; #ifdef NO_GUI - wxSTD cout << msg << "\n"; + wxSTD cout << msg_string.mb_str() << "\n"; wxSTD cout.flush(); #else if (isInteractive && frame) (*frame->textWindow) << msg << _T("\n"); /* This whole block of code is just wrong I think. It would behave completely wrong under anything other than MSW due to the ELSE - with no statement, and the cout calls would fail under MSW, as - the code in this block is compiled if !NO_GUI This code has been - here since v1.1 of this file too. - gt + with no statement, and the cout calls would fail under MSW, as + the code in this block is compiled if !NO_GUI This code has been + here since v1.1 of this file too. - gt else #ifdef __WXMSW__ { - wxSTD cout << msg << "\n"; + wxSTD cout << msg_string.mb_str() << "\n"; wxSTD cout.flush(); } #endif @@ -1112,7 +1141,7 @@ void OnInform(const wxChar *msg) */ if (isInteractive) { - Tex2RTFYield(TRUE); + Tex2RTFYield(true); } #endif // NO_GUI } @@ -1159,7 +1188,7 @@ bool OnArgument(int macroId, int arg_no, bool start) // break; } } - return TRUE; + return true; } /* @@ -1192,21 +1221,17 @@ Tex2RTFConnection::Tex2RTFConnection(wxChar *buf, int size):wxDDEConnection(buf, { } -Tex2RTFConnection::~Tex2RTFConnection(void) -{ -} - bool SplitCommand(wxChar *data, wxChar *firstArg, wxChar *secondArg) { firstArg[0] = 0; secondArg[0] = 0; int i = 0; - bool stop = FALSE; + bool stop = false; // Find first argument (command name) while (!stop) { if (data[i] == ' ' || data[i] == 0) - stop = TRUE; + stop = true; else { firstArg[i] = data[i]; @@ -1227,7 +1252,7 @@ bool SplitCommand(wxChar *data, wxChar *firstArg, wxChar *secondArg) } secondArg[j] = 0; } - return TRUE; + return true; } bool Tex2RTFConnection::OnExecute(const wxString& WXUNUSED(topic), wxChar *data, int WXUNUSED(size), wxIPCFormat WXUNUSED(format)) @@ -1247,7 +1272,7 @@ bool Tex2RTFConnection::OnExecute(const wxString& WXUNUSED(topic), wxChar *data, { wxChar buf[100]; wxString str = wxFileNameFromPath(InputFile); - wxSprintf(buf, _T("Tex2RTF [%s]"), (const wxChar*) str); + wxSnprintf(buf, sizeof(buf), _T("Tex2RTF [%s]"), (const wxChar*) str); frame->SetTitle(buf); } } @@ -1271,21 +1296,21 @@ bool Tex2RTFConnection::OnExecute(const wxString& WXUNUSED(topic), wxChar *data, else if (wxStrcmp(firstArg, _T("MINIMIZE")) == 0 || wxStrcmp(firstArg, _T("ICONIZE")) == 0) { if (frame) - frame->Iconize(TRUE); + frame->Iconize(true); } else if (wxStrcmp(firstArg, _T("SHOW")) == 0 || wxStrcmp(firstArg, _T("RESTORE")) == 0) { if (frame) { - frame->Iconize(FALSE); - frame->Show(TRUE); + frame->Iconize(false); + frame->Show(true); } } else { // Try for a setting - wxStrcpy(Tex2RTFLastStatus, RegisterSetting(firstArg, secondArg, FALSE)); -#ifndef NO_GUI + wxStrcpy(Tex2RTFLastStatus, RegisterSetting(firstArg, secondArg, false)); +#if !defined(NO_GUI) && wxUSE_STATUSBAR if (frame && wxStrcmp(firstArg, _T("conversionMode")) == 0) { wxChar buf[100]; @@ -1303,7 +1328,7 @@ bool Tex2RTFConnection::OnExecute(const wxString& WXUNUSED(topic), wxChar *data, #endif } } - return TRUE; + return true; } wxChar *Tex2RTFConnection::OnRequest(const wxString& WXUNUSED(topic), const wxString& WXUNUSED(item), int *WXUNUSED(size), wxIPCFormat WXUNUSED(format))