added the makefile for tex2rtf compilation using configure, fixed compilation

for wxUSE_HELP == 0


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@4102 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
1999-10-21 13:40:47 +00:00
parent d54598dd85
commit ffaaaacbca
2 changed files with 42 additions and 11 deletions

View File

@@ -0,0 +1,21 @@
#
# File: makefile.unx
# Author: Julian Smart
# Created: 1998
# Updated:
# Copyright: (c) 1998 Julian Smart
#
# "%W% %G%"
#
# Makefile for Tex2RTF (Unix)
top_srcdir = @top_srcdir@
top_builddir = ../../..
program_dir = utils/tex2rtf/src
PROGRAM=tex2rtf
OBJECTS = tex2rtf.o tex2any.o texutils.o rtfutils.o xlputils.o htmlutil.o readshg.o table.o
include ../../../src/makeprog.env

View File

@@ -29,7 +29,7 @@
#include <wx/timer.h> #include <wx/timer.h>
#endif #endif
#ifdef NO_GUI #if defined(NO_GUI) || defined(__UNIX__)
#if wxUSE_IOSTREAMH #if wxUSE_IOSTREAMH
#include <iostream.h> #include <iostream.h>
#include <fstream.h> #include <fstream.h>
@@ -59,7 +59,10 @@ bool OkToClose = TRUE;
int passNumber = 1; int passNumber = 1;
#ifndef NO_GUI #ifndef NO_GUI
#if wxUSE_HELP
wxHelpController *HelpInstance = NULL; wxHelpController *HelpInstance = NULL;
#endif // wxUSE_HELP
#ifdef __WXMSW__ #ifdef __WXMSW__
static char *ipc_buffer = NULL; static char *ipc_buffer = NULL;
@@ -128,7 +131,7 @@ bool MyApp::OnInit()
RefName = new char[300]; RefName = new char[300];
int n = 1; int n = 1;
// Read input/output files // Read input/output files
if (argc > 1) if (argc > 1)
{ {
@@ -328,16 +331,18 @@ bool MyApp::OnInit()
frame->textWindow = new wxTextCtrl(frame, -1, "", wxPoint(-1, -1), wxSize(-1, -1), wxTE_READONLY|wxTE_MULTILINE); frame->textWindow = new wxTextCtrl(frame, -1, "", wxPoint(-1, -1), wxSize(-1, -1), wxTE_READONLY|wxTE_MULTILINE);
(*frame->textWindow) << "Welcome to Julian Smart's LaTeX to RTF converter.\n"; (*frame->textWindow) << "Welcome to Julian Smart's LaTeX to RTF converter.\n";
// ShowOptions(); // ShowOptions();
#if wxUSE_HELP
HelpInstance = new wxHelpController(); HelpInstance = new wxHelpController();
HelpInstance->Initialize("tex2rtf"); HelpInstance->Initialize("tex2rtf");
#endif // wxUSE_HELP
/* /*
* Read macro/initialisation file * Read macro/initialisation file
* *
*/ */
wxString path; wxString path;
if ((path = TexPathList.FindValidPath(MacroFile)) != "") if ((path = TexPathList.FindValidPath(MacroFile)) != "")
ReadCustomMacros((char*) (const char*) path); ReadCustomMacros((char*) (const char*) path);
@@ -352,7 +357,7 @@ bool MyApp::OnInit()
else if (convertMode == TEX_XLP) strcat(buf, "XLP"); else if (convertMode == TEX_XLP) strcat(buf, "XLP");
strcat(buf, " mode."); strcat(buf, " mode.");
frame->SetStatusText(buf, 1); frame->SetStatusText(buf, 1);
frame->Show(TRUE); frame->Show(TRUE);
return TRUE; return TRUE;
} }
@@ -363,7 +368,7 @@ bool MyApp::OnInit()
* Read macro/initialisation file * Read macro/initialisation file
* *
*/ */
wxString path; wxString path;
if ((path = TexPathList.FindValidPath(MacroFile)) != "") if ((path = TexPathList.FindValidPath(MacroFile)) != "")
ReadCustomMacros((char*) (const char*) path); ReadCustomMacros((char*) (const char*) path);
@@ -410,7 +415,10 @@ int MyApp::OnExit()
delete TheTex2RTFServer; delete TheTex2RTFServer;
wxDDECleanUp(); wxDDECleanUp();
#endif #endif
#if wxUSE_HELP
delete HelpInstance; delete HelpInstance;
#endif // wxUSE_HELP
// TODO: this simulates zero-memory leaks! // TODO: this simulates zero-memory leaks!
// Otherwise there are just too many... // Otherwise there are just too many...
@@ -610,8 +618,10 @@ void MyFrame::OnModeXLP(wxCommandEvent& event)
void MyFrame::OnHelp(wxCommandEvent& event) void MyFrame::OnHelp(wxCommandEvent& event)
{ {
#if wxUSE_HELP
HelpInstance->LoadFile(); HelpInstance->LoadFile();
HelpInstance->DisplayContents(); HelpInstance->DisplayContents();
#endif // wxUSE_HELP
} }
void MyFrame::OnAbout(wxCommandEvent& event) void MyFrame::OnAbout(wxCommandEvent& event)
@@ -661,7 +671,7 @@ void ChooseOutputFile(bool force)
path = wxPathOnly(OutputFile); path = wxPathOnly(OutputFile);
else if (InputFile) else if (InputFile)
path = wxPathOnly(InputFile); path = wxPathOnly(InputFile);
switch (convertMode) switch (convertMode)
{ {
case TEX_RTF: case TEX_RTF:
@@ -736,7 +746,7 @@ bool Go(void)
if(strlen( sName) > 5) if(strlen( sName) > 5)
sName[5] = '\0'; // that should do! sName[5] = '\0'; // that should do!
} }
sprintf(ContentsName, "%s.con", FileRoot); sprintf(ContentsName, "%s.con", FileRoot);
sprintf(TmpContentsName, "%s.cn1", FileRoot); sprintf(TmpContentsName, "%s.cn1", FileRoot);
sprintf(TmpFrameContentsName, "%s.frc", FileRoot); sprintf(TmpFrameContentsName, "%s.frc", FileRoot);
@@ -756,7 +766,7 @@ bool Go(void)
if (wxFileExists(RefName)) if (wxFileExists(RefName))
ReadTexReferences(RefName); ReadTexReferences(RefName);
bool success = FALSE; bool success = FALSE;
if (InputFile && OutputFile) if (InputFile && OutputFile)
@@ -945,7 +955,7 @@ wxConnectionBase *Tex2RTFServer::OnAcceptConnection(const wxString& topic)
{ {
if (!ipc_buffer) if (!ipc_buffer)
ipc_buffer = new char[1000]; ipc_buffer = new char[1000];
return new Tex2RTFConnection(ipc_buffer, 4000); return new Tex2RTFConnection(ipc_buffer, 4000);
} }
else else
@@ -955,7 +965,7 @@ wxConnectionBase *Tex2RTFServer::OnAcceptConnection(const wxString& topic)
/* /*
* Connection * Connection
*/ */
Tex2RTFConnection::Tex2RTFConnection(char *buf, int size):wxDDEConnection(buf, size) Tex2RTFConnection::Tex2RTFConnection(char *buf, int size):wxDDEConnection(buf, size)
{ {
} }