X-Git-Url: http://git.kpe.io/?p=ctsim.git;a=blobdiff_plain;f=src%2Fctsim.cpp;h=40a1ff452aef7ec76aa2971b81e61ddab64e8894;hp=7f5193b520dfb931e643a4832a3895a21d24b9b9;hb=83158c3c680f32c698a3be9d1dbf6d37b53d6bc8;hpb=92446cc445611619e1c796d269b559f89377dfe5 diff --git a/src/ctsim.cpp b/src/ctsim.cpp index 7f5193b..40a1ff4 100644 --- a/src/ctsim.cpp +++ b/src/ctsim.cpp @@ -9,7 +9,7 @@ ** This is part of the CTSim program ** Copyright (c) 1983-2001 Kevin Rosenberg ** -** $Id: ctsim.cpp,v 1.107 2002/05/03 09:57:41 kevin Exp $ +** $Id: ctsim.cpp,v 1.108 2002/05/05 08:09:34 kevin Exp $ ** ** This program is free software; you can redistribute it and/or modify ** it under the terms of the GNU General Public License (version 2) as @@ -70,7 +70,7 @@ #endif #endif -static const char* rcsindent = "$Id: ctsim.cpp,v 1.107 2002/05/03 09:57:41 kevin Exp $"; +static const char* rcsindent = "$Id: ctsim.cpp,v 1.108 2002/05/05 08:09:34 kevin Exp $"; struct option CTSimApp::ctsimOptions[] = { @@ -201,8 +201,8 @@ CTSimApp::OnInit() if (! m_pFrame->getWinHelpController().Initialize(helpDir + "/ctsim")) *m_pLog << "Cannot initialize the Windows Help system" << "\n"; #else - if (! m_pFrame->getHtmlHelpController().Initialize("/usr/share/ctsim/ctsim") && - ! m_pFrame->getHtmlHelpController().Initialize("/usr/local/share/ctsim/ctsim")) + if (! m_pFrame->getHtmlHelpController().AddBook("/usr/share/ctsim/ctsim.htb") && + ! m_pFrame->getHtmlHelpController().Initialize("/usr/local/share/ctsim/ctsim.htb")) *m_pLog << "Cannot initialize the HTML Help system" << "\n"; else { if (::wxDirExists ("/tmp")) @@ -670,7 +670,7 @@ MainFrame::OnHelpButton (wxCommandEvent& event) void MainFrame::OnHelpSecondary (wxCommandEvent& event) { - m_htmlHelp.DisplayContents(); + m_htmlHelp.Display ("Contents"); } #endif @@ -683,7 +683,7 @@ MainFrame::showHelp (int commandID) #ifdef CTSIM_WINHELP m_winHelp.DisplayContents (); #else - m_htmlHelp.DisplayContents (); + m_htmlHelp.Display ("Contents"); #endif break; @@ -1058,7 +1058,6 @@ CTSimApp::newProjectionDoc() { ProjectionFileDocument* newDoc = dynamic_cast(m_pDocTemplProjection->CreateDocument ("")); if (newDoc) { - ProjectionFileView* pView = newDoc->getView(); newDoc->SetDocumentName (m_pDocTemplProjection->GetDocumentName()); newDoc->SetDocumentTemplate (m_pDocTemplProjection); newDoc->OnNewDocument();