X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=src%2Fctsim.cpp;h=cf6b738a18f5cf72ca1cbbeed3a0e810b8f56647;hb=6562049dd76f2b8d6ded69dc75b4649e1b203743;hp=ab1271c172ca2d15d7cb0dea3dcef78191c5e26d;hpb=2d7966bd04e3d56b9c9cc9651b029a8b6196458b;p=ctsim.git

diff --git a/src/ctsim.cpp b/src/ctsim.cpp
index ab1271c..cf6b738 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.106 2002/05/03 01:01:15 kevin Exp $
+**  $Id: ctsim.cpp,v 1.110 2002/05/05 14:22:44 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.106 2002/05/03 01:01:15 kevin Exp $";
+static const char* rcsindent = "$Id: ctsim.cpp,v 1.110 2002/05/05 14:22:44 kevin Exp $";
 
 struct option CTSimApp::ctsimOptions[] = 
 {
@@ -164,7 +164,7 @@ CTSimApp::OnInit()
 #ifdef CTSIM_MDI
     wxSize(nearest<int>(xDisplay * .75), nearest<int>(yDisplay * .75)), 
 #else
-    wxSize(nearest<int>(xDisplay * .25), nearest<int>(yDisplay * .25)), 
+    wxSize(nearest<int>(xDisplay * .6), nearest<int>(yDisplay * .4)), 
 #endif
     wxDEFAULT_FRAME_STYLE);
   
@@ -201,8 +201,10 @@ CTSimApp::OnInit()
   if (! m_pFrame->getWinHelpController().Initialize(helpDir + "/ctsim"))
     *m_pLog << "Cannot initialize the Windows Help system" << "\n";
 #else
-  if (! m_pFrame->getHtmlHelpController().Initialize(helpDir + "/ctsim") &&
-    ! m_pFrame->getHtmlHelpController().Initialize("/usr/share/ctsim"))
+  wxString docDir (DATADIR);
+  wxString docFile = docDir + "ctsim.htb";
+  if (! m_pFrame->getHtmlHelpController().AddBook(docFile) &&
+    ! m_pFrame->getHtmlHelpController().Initialize("/usr/share/ctsim/ctsim.htb"))
     *m_pLog << "Cannot initialize the HTML Help system" << "\n";
   else {
     if (::wxDirExists ("/tmp"))
@@ -624,12 +626,6 @@ MainFrame::OnNewImageFile (wxCommandEvent& event)
     return;
   }  
   pImageDoc->setImageFile (pImageFile);
-  //  pImageDoc->UpdateAllViews (NULL);
-  //  if (ImageFileView* imageView = pImageDoc->getView()) {
-  //    imageView->OnUpdate (imageView, NULL);
-  //    imageView->getFrame()->SetFocus();
-  //    imageView->getFrame()->Show(true);
-  //  }
   if (theApp->getAskDeleteNewDocs())
     pImageDoc->Modify (true);
 }
@@ -644,13 +640,6 @@ MainFrame::OnNewProjectionFile (wxCommandEvent& event)
     return;
   }  
   pProjDoc->setProjections (pProjections);
-  pProjDoc->UpdateAllViews (NULL);
-  if (ProjectionFileView* projView = pProjDoc->getView()) {
-    projView->OnUpdate (projView, NULL);
-    projView->getFrame()->SetFocus();
-    projView->getFrame()->Show(true);
-  }
-
   if (theApp->getAskDeleteNewDocs())
     pProjDoc->Modify (true);
 }
@@ -683,7 +672,7 @@ MainFrame::OnHelpButton (wxCommandEvent& event)
 void
 MainFrame::OnHelpSecondary (wxCommandEvent& event)
 {
-  m_htmlHelp.DisplayContents();
+  m_htmlHelp.Display ("Contents");
 }
 #endif
 
@@ -696,7 +685,7 @@ MainFrame::showHelp (int commandID)
 #ifdef CTSIM_WINHELP
     m_winHelp.DisplayContents ();
 #else
-    m_htmlHelp.DisplayContents ();
+    m_htmlHelp.Display ("Contents");
 #endif
     break;
     
@@ -1071,16 +1060,6 @@ CTSimApp::newProjectionDoc()
 {
   ProjectionFileDocument* newDoc = dynamic_cast<ProjectionFileDocument*>(m_pDocTemplProjection->CreateDocument (""));
   if (newDoc) {
-    ProjectionFileView* pView = newDoc->getView();
-    if (pView) {
-      wxFrame* pFrame = pView->getFrame();
-      if (pFrame) {
-	//        wxSize size;
-	//        m_pFrame->GetClientSize (&size.x, &size.y);
-	//        pFrame->SetClientSize (size.x / 2, size.y / 2);
-        pFrame->Show (false);
-      }
-    }
     newDoc->SetDocumentName (m_pDocTemplProjection->GetDocumentName());
     newDoc->SetDocumentTemplate (m_pDocTemplProjection);
     newDoc->OnNewDocument();