projects
/
ctsim.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
r1939: *** empty log message ***
[ctsim.git]
/
src
/
ctsim.cpp
diff --git
a/src/ctsim.cpp
b/src/ctsim.cpp
index d8b073725c9ccf1f2fae66a7ede2901ff4cfb22e..40a1ff452aef7ec76aa2971b81e61ddab64e8894 100644
(file)
--- 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
**
** This is part of the CTSim program
** Copyright (c) 1983-2001 Kevin Rosenberg
**
-** $Id: ctsim.cpp,v 1.10
5 2002/05/03 00:40:30
kevin Exp $
+** $Id: ctsim.cpp,v 1.10
8 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
**
** 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
#endif
#endif
-static const char* rcsindent = "$Id: ctsim.cpp,v 1.10
5 2002/05/03 00:40:30
kevin Exp $";
+static const char* rcsindent = "$Id: ctsim.cpp,v 1.10
8 2002/05/05 08:09:34
kevin Exp $";
struct option CTSimApp::ctsimOptions[] =
{
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->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/local/
man/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"))
*m_pLog << "Cannot initialize the HTML Help system" << "\n";
else {
if (::wxDirExists ("/tmp"))
@@
-624,12
+624,6
@@
MainFrame::OnNewImageFile (wxCommandEvent& event)
return;
}
pImageDoc->setImageFile (pImageFile);
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);
}
if (theApp->getAskDeleteNewDocs())
pImageDoc->Modify (true);
}
@@
-644,13
+638,6
@@
MainFrame::OnNewProjectionFile (wxCommandEvent& event)
return;
}
pProjDoc->setProjections (pProjections);
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);
}
if (theApp->getAskDeleteNewDocs())
pProjDoc->Modify (true);
}
@@
-683,7
+670,7
@@
MainFrame::OnHelpButton (wxCommandEvent& event)
void
MainFrame::OnHelpSecondary (wxCommandEvent& event)
{
void
MainFrame::OnHelpSecondary (wxCommandEvent& event)
{
- m_htmlHelp.Display
Contents(
);
+ m_htmlHelp.Display
("Contents"
);
}
#endif
}
#endif
@@
-696,7
+683,7
@@
MainFrame::showHelp (int commandID)
#ifdef CTSIM_WINHELP
m_winHelp.DisplayContents ();
#else
#ifdef CTSIM_WINHELP
m_winHelp.DisplayContents ();
#else
- m_htmlHelp.Display
Contents (
);
+ m_htmlHelp.Display
("Contents"
);
#endif
break;
#endif
break;
@@
-1071,16
+1058,6
@@
CTSimApp::newProjectionDoc()
{
ProjectionFileDocument* newDoc = dynamic_cast<ProjectionFileDocument*>(m_pDocTemplProjection->CreateDocument (""));
if (newDoc) {
{
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();
newDoc->SetDocumentName (m_pDocTemplProjection->GetDocumentName());
newDoc->SetDocumentTemplate (m_pDocTemplProjection);
newDoc->OnNewDocument();