Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Missing wxUSE_... flags and source cleaning.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35305 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Włodzimierz Skiba
2005-08-24 17:56:29 +00:00
parent 71307412f5
commit 5c66e5b2b2
7 changed files with 438 additions and 437 deletions
Download Patch File Download Diff File Expand all files Collapse all files

278
utils/tex2rtf/src/tex2rtf.cpp
View File

@@ -49,6 +49,8 @@
#endif
#endif // !NO_GUI
#include "wx/utils.h"
#if wxUSE_IOSTREAMH
#include <iostream.h>
#include <fstream.h>
@@ -114,8 +116,8 @@ FILE *Subsubsections = NULL;
FILE *Popups = NULL;
FILE *WinHelpContentsFile = NULL;
wxChar *InputFile = NULL;
wxChar *OutputFile = NULL;
wxString InputFile;
wxString OutputFile;
wxChar *MacroFile = copystring(_T("tex2rtf.ini"));
wxChar *FileRoot = NULL;
@@ -168,37 +170,37 @@ bool MyApp::OnInit()
// Read input/output files
if (argc > 1)
{
if (argv[1][0] != '-')
{
InputFile = argv[1];
n ++;
if (argc > 2)
if (argv[1][0] != _T('-'))
{
if (argv[2][0] != '-')
{
OutputFile = argv[2];
InputFile = argv[1];
n ++;
}
if (argc > 2)
{
if (argv[2][0] != _T('-'))
{
OutputFile = argv[2];
n ++;
}
}
}
}
}
#ifdef NO_GUI
if (!InputFile || !OutputFile)
if (InputFile.empty() || OutputFile.empty())
{
wxSTD cout << "Tex2RTF: input or output file is missing.\n";
ShowOptions();
exit(1);
wxSTD cout << "Tex2RTF: input or output file is missing.\n";
ShowOptions();
exit(1);
}
#endif
if (InputFile)
if (!InputFile.empty())
{
TexPathList.EnsureFileAccessible(InputFile);
TexPathList.EnsureFileAccessible(InputFile);
}
if (!InputFile || !OutputFile)
isInteractive = true;
if (InputFile.empty() || OutputFile.empty())
isInteractive = true;
int i;
for (i = n; i < argc;)
@@ -333,10 +335,10 @@ bool MyApp::OnInit()
// TODO: uncomment this when we have tex2rtf.xpm
frame->SetIcon(wxICON(tex2rtf));
if (InputFile)
if (!InputFile.empty())
{
wxSnprintf(buf, sizeof(buf), _T("Tex2RTF [%s]"), wxFileNameFromPath(InputFile));
frame->SetTitle(buf);
wxSnprintf(buf, sizeof(buf), _T("Tex2RTF [%s]"), wxFileNameFromPath(InputFile));
frame->SetTitle(buf);
}
// Make a menubar
@@ -384,7 +386,7 @@ bool MyApp::OnInit()
menuBar->Append(help_menu, _T("&Help"));
frame->SetMenuBar(menuBar);
frame->textWindow = new wxTextCtrl(frame, wxID_ANY, _T(""), wxDefaultPosition, wxDefaultSize, wxTE_READONLY|wxTE_MULTILINE);
frame->textWindow = new wxTextCtrl(frame, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_READONLY|wxTE_MULTILINE);
(*frame->textWindow) << _T("Welcome to Tex2RTF.\n");
// ShowOptions();
@@ -393,7 +395,7 @@ bool MyApp::OnInit()
#if wxUSE_MS_HTML_HELP && !defined(__WXUNIVERSAL__)
HelpInstance = new wxCHMHelpController;
#else
HelpInstance = new wxHtmlHelpController;
HelpInstance = new wxHelpController;
#endif
HelpInstance->Initialize(_T("tex2rtf"));
#endif // wxUSE_HELP
@@ -707,103 +709,107 @@ void MyFrame::OnSetOutput(wxCommandEvent& WXUNUSED(event))
void MyFrame::OnSaveFile(wxCommandEvent& WXUNUSED(event))
{
wxString s = wxFileSelector(_T("Save text to file"), _T(""), _T(""), _T("txt"), _T("*.txt"));
if (s != _T(""))
{
#if wxUSE_FILEDLG
wxString s = wxFileSelector(_T("Save text to file"), wxEmptyString, wxEmptyString, _T("txt"), _T("*.txt"));
if (!s.empty())
{
textWindow->SaveFile(s);
#if wxUSE_STATUSBAR
wxChar buf[350];
wxSnprintf(buf, sizeof(buf), _T("Saved text to %s"), (const wxChar*) s.c_str());
frame->SetStatusText(buf, 0);
#endif // wxUSE_STATUSBAR
}
}
#endif // wxUSE_FILEDLG
}
void MyFrame::OnViewOutput(wxCommandEvent& WXUNUSED(event))
{
ChooseOutputFile();
if (OutputFile && wxFileExists(OutputFile))
{
ChooseOutputFile();
if (!OutputFile.empty() && wxFileExists(OutputFile))
{
textWindow->LoadFile(OutputFile);
wxChar buf[300];
wxString str(wxFileNameFromPath(OutputFile));
wxSnprintf(buf, sizeof(buf), _T("Tex2RTF [%s]"), (const wxChar*) str.c_str());
frame->SetTitle(buf);
}
}
}
void MyFrame::OnViewLatex(wxCommandEvent& WXUNUSED(event))
{
ChooseInputFile();
if (InputFile && wxFileExists(InputFile))
{
ChooseInputFile();
if (!InputFile.empty() && wxFileExists(InputFile))
{
textWindow->LoadFile(InputFile);
wxChar buf[300];
wxString str(wxFileNameFromPath(OutputFile));
wxSnprintf(buf, sizeof(buf), _T("Tex2RTF [%s]"), (const wxChar*) str.c_str());
frame->SetTitle(buf);
}
}
}
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.empty() && wxFileExists(s))
{
textWindow->Clear();
#if wxUSE_FILEDLG
wxString s = wxFileSelector(_T("Choose custom macro file"), wxPathOnly(MacroFile), wxFileNameFromPath(MacroFile), _T("ini"), _T("*.ini"));
if (!s.empty() && wxFileExists(s))
{
MacroFile = copystring(s);
ReadCustomMacros((wxChar *)s.c_str());
ShowCustomMacros();
}
}
#endif // wxUSE_FILEDLG
}
void MyFrame::OnShowMacros(wxCommandEvent& WXUNUSED(event))
{
textWindow->Clear();
Tex2RTFYield(true);
ShowCustomMacros();
textWindow->Clear();
Tex2RTFYield(true);
ShowCustomMacros();
}
void MyFrame::OnModeRTF(wxCommandEvent& WXUNUSED(event))
{
convertMode = TEX_RTF;
winHelp = false;
InputFile = NULL;
OutputFile = NULL;
convertMode = TEX_RTF;
winHelp = false;
InputFile = wxEmptyString;
OutputFile = wxEmptyString;
#if wxUSE_STATUSBAR
SetStatusText(_T("In linear RTF mode."), 1);
SetStatusText(_T("In linear RTF mode."), 1);
#endif // wxUSE_STATUSBAR
}
void MyFrame::OnModeWinHelp(wxCommandEvent& WXUNUSED(event))
{
convertMode = TEX_RTF;
winHelp = true;
InputFile = NULL;
OutputFile = NULL;
convertMode = TEX_RTF;
winHelp = true;
InputFile = wxEmptyString;
OutputFile = wxEmptyString;
#if wxUSE_STATUSBAR
SetStatusText(_T("In WinHelp RTF mode."), 1);
SetStatusText(_T("In WinHelp RTF mode."), 1);
#endif // wxUSE_STATUSBAR
}
void MyFrame::OnModeHTML(wxCommandEvent& WXUNUSED(event))
{
convertMode = TEX_HTML;
winHelp = false;
InputFile = NULL;
OutputFile = NULL;
convertMode = TEX_HTML;
winHelp = false;
InputFile = wxEmptyString;
OutputFile = wxEmptyString;
#if wxUSE_STATUSBAR
SetStatusText(_T("In HTML mode."), 1);
SetStatusText(_T("In HTML mode."), 1);
#endif // wxUSE_STATUSBAR
}
void MyFrame::OnModeXLP(wxCommandEvent& WXUNUSED(event))
{
convertMode = TEX_XLP;
InputFile = NULL;
OutputFile = NULL;
convertMode = TEX_XLP;
InputFile = wxEmptyString;
OutputFile = wxEmptyString;
#if wxUSE_STATUSBAR
SetStatusText(_T("In XLP mode."), 1);
SetStatusText(_T("In XLP mode."), 1);
#endif // wxUSE_STATUSBAR
}
@@ -850,81 +856,81 @@ void MyFrame::OnHelp(wxCommandEvent& WXUNUSED(event))
void MyFrame::OnAbout(wxCommandEvent& WXUNUSED(event))
{
wxChar buf[300];
#ifdef __WIN32__
wxChar *platform = _T(" (32-bit)");
#else
#ifdef __WXMSW__
wxChar *platform = _T(" (16-bit)");
#else
wxChar *platform = _T("");
#endif
#endif
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);
wxString platform = wxGetOsDescription();
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-2005"), versionNo, platform.c_str());
wxMessageBox(buf, _T("About Tex2RTF"));
}
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.empty())
#if wxUSE_FILEDLG
if (force || InputFile.empty())
{
// Different file, so clear index entries.
ClearKeyWordTable();
ResetContentsLevels(0);
passNumber = 1;
errorCount = 0;
wxString s = wxFileSelector(_T("Choose LaTeX input file"), wxPathOnly(InputFile), wxFileNameFromPath(InputFile), _T("tex"), _T("*.tex"));
if (!s.empty())
{
// Different file, so clear index entries.
ClearKeyWordTable();
ResetContentsLevels(0);
passNumber = 1;
errorCount = 0;
InputFile = copystring(s);
wxString str = wxFileNameFromPath(InputFile);
wxString buf;
buf.Printf(_T("Tex2RTF [%s]"), str.c_str());
frame->SetTitle((wxChar *)buf.c_str());
OutputFile = NULL;
InputFile = s;
wxString str = wxFileNameFromPath(InputFile);
wxString buf;
buf.Printf(_T("Tex2RTF [%s]"), str.c_str());
frame->SetTitle((wxChar *)buf.c_str());
OutputFile = wxEmptyString;
}
}
}
#else
wxUnusedVar(force);
#endif // wxUSE_FILEDLG
}
void ChooseOutputFile(bool force)
{
wxChar extensionBuf[10];
wxChar wildBuf[10];
wxStrcpy(wildBuf, _T("*."));
wxString path;
if (OutputFile)
path = wxPathOnly(OutputFile);
else if (InputFile)
path = wxPathOnly(InputFile);
wxChar extensionBuf[10];
wxChar wildBuf[10];
wxStrcpy(wildBuf, _T("*."));
wxString path;
if (!OutputFile.empty())
path = wxPathOnly(OutputFile);
else if (!InputFile.empty())
path = wxPathOnly(InputFile);
switch (convertMode)
{
case TEX_RTF:
switch (convertMode)
{
wxStrcpy(extensionBuf, _T("rtf"));
wxStrcat(wildBuf, _T("rtf"));
break;
case TEX_RTF:
{
wxStrcpy(extensionBuf, _T("rtf"));
wxStrcat(wildBuf, _T("rtf"));
break;
}
case TEX_XLP:
{
wxStrcpy(extensionBuf, _T("xlp"));
wxStrcat(wildBuf, _T("xlp"));
break;
}
case TEX_HTML:
{
wxStrcpy(extensionBuf, _T("html"));
wxStrcat(wildBuf, _T("html"));
break;
}
}
case TEX_XLP:
#if wxUSE_FILEDLG
if (force || OutputFile.empty())
{
wxStrcpy(extensionBuf, _T("xlp"));
wxStrcat(wildBuf, _T("xlp"));
break;
wxString s = wxFileSelector(_T("Choose output file"), path, wxFileNameFromPath(OutputFile),
extensionBuf, wildBuf);
if (!s.empty())
OutputFile = s;
}
case TEX_HTML:
{
wxStrcpy(extensionBuf, _T("html"));
wxStrcat(wildBuf, _T("html"));
break;
}
}
if (force || !OutputFile)
{
wxString s = wxFileSelector(_T("Choose output file"), path, wxFileNameFromPath(OutputFile),
extensionBuf, wildBuf);
if (!s.empty())
OutputFile = copystring(s);
}
#else
wxUnusedVar(force);
#endif // wxUSE_FILEDLG
}
#endif
@@ -935,7 +941,7 @@ bool Go(void)
ChooseOutputFile();
#endif
if (!InputFile || !OutputFile || stopRunning)
if (InputFile.empty() || OutputFile.empty() || stopRunning)
return false;
#ifndef NO_GUI
@@ -952,7 +958,7 @@ bool Go(void)
#endif
// Find extension-less filename
wxStrcpy(FileRoot, OutputFile);
wxStrcpy(FileRoot, OutputFile.c_str());
StripExtension(FileRoot);
if (truncateFilenames && convertMode == TEX_HTML)
@@ -989,7 +995,7 @@ bool Go(void)
bool success = false;
if (InputFile && OutputFile)
if (!InputFile.empty() && !OutputFile.empty())
{
if (!wxFileExists(InputFile))
{
@@ -1269,20 +1275,18 @@ bool Tex2RTFConnection::OnExecute(const wxString& WXUNUSED(topic), wxChar *data,
bool hasArg = (wxStrlen(secondArg) > 0);
if (wxStrcmp(firstArg, _T("INPUT")) == 0 && hasArg)
{
if (InputFile) delete[] InputFile;
InputFile = copystring(secondArg);
if (frame)
{
wxChar buf[100];
wxString str = wxFileNameFromPath(InputFile);
wxSnprintf(buf, sizeof(buf), _T("Tex2RTF [%s]"), (const wxChar*) str);
frame->SetTitle(buf);
}
InputFile = secondArg;
if (frame)
{
wxChar buf[100];
wxString str = wxFileNameFromPath(InputFile);
wxSnprintf(buf, sizeof(buf), _T("Tex2RTF [%s]"), (const wxChar*) str);
frame->SetTitle(buf);
}
}
else if (wxStrcmp(firstArg, _T("OUTPUT")) == 0 && hasArg)
{
if (OutputFile) delete[] OutputFile;
OutputFile = copystring(secondArg);
OutputFile = secondArg;
}
else if (wxStrcmp(firstArg, _T("GO")) == 0)
{