r468: Fixed shutdown error (i hope!)

[ctsim.git] / src / ctsim.cpp

diff --git a/src/ctsim.cpp b/src/ctsim.cpp
index 87aec7e458349597b9163cf9bfde661f10f280f9..a55ba8e3d0e38cc953e05f906a3cb5ba81a23a1e 100644 (file)
--- a/src/ctsim.cpp
+++ b/src/ctsim.cpp
@@ -9,7 +9,7 @@
 **  This is part of the CTSim program
 **  Copyright (C) 1983-2000 Kevin Rosenberg
 **
-**  $Id: ctsim.cpp,v 1.57 2001/01/29 00:42:26 kevin Exp $
+**  $Id: ctsim.cpp,v 1.58 2001/01/29 23:11:32 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.57 2001/01/29 00:42:26 kevin Exp $";
+static const char* rcsindent = "$Id: ctsim.cpp,v 1.58 2001/01/29 23:11:32 kevin Exp $";
 
 struct option CTSimApp::ctsimOptions[] = 
 {
@@ -445,8 +445,7 @@ MainFrame::OnCreateFilter (wxCommandEvent& WXUNUSED(event))
                rIF.setArraySize (m_iDefaultFilterXSize, m_iDefaultFilterYSize);
                rIF.filterResponse (strDomain.c_str(), m_dDefaultFilterBandwidth, strFilter.c_str(), m_dDefaultFilterParam, m_dDefaultFilterInputScale, m_dDefaultFilterOutputScale);
                rIF.labelAdd (os.str().c_str());
-               if (theApp->getSetModifyNewDocs())
-                       pFilterDoc->Modify (true);
+    pFilterDoc->Modify (true);
                pFilterDoc->UpdateAllViews();
                pFilterDoc->GetFirstView()->OnUpdate (NULL, NULL);
                pFilterDoc->getView()->getFrame()->SetClientSize(m_iDefaultFilterXSize, m_iDefaultFilterYSize);
@@ -534,6 +533,7 @@ MainFrame::OnExit (wxCommandEvent& WXUNUSED(event) )
 void
 MainFrame::OnUpdateUI (wxUpdateUIEvent& rEvent)
 {
+#ifndef CTSIM_MDI
        int iPos = 0;
        wxList& rListDocs = theApp->getDocManager()->GetDocuments();
        wxNode* pNode = rListDocs.GetFirst();
@@ -555,7 +555,7 @@ MainFrame::OnUpdateUI (wxUpdateUIEvent& rEvent)
                static_cast<wxMenuItemBase*>(m_apWindowMenuItems[i])->SetName (wxString("[EMPTY]"));
                m_apWindowMenuData[i] = NULL;
        }
-       
+#endif 
 }
 
 #ifdef CTSIM_CUSTOM_MRU
@@ -776,7 +776,7 @@ CTSimApp::newProjectionDoc()
                                pFrame->Show (false);
                        }
                }
-               newDoc->OnNewDocument();
+//             newDoc->OnNewDocument();
        }
        
        return newDoc;
@@ -795,7 +795,7 @@ CTSimApp::newImageDoc()
                                pFrame->Show (false);
                        }
                }
-               newDoc->OnNewDocument();
+//             newDoc->OnNewDocument();
        }
        
        return newDoc;
@@ -816,7 +816,7 @@ CTSimApp::newPlotDoc()
                                pFrame->Show (false);
                        }
                }
-               newDoc->OnNewDocument();
+//             newDoc->OnNewDocument();
        }
        
        return newDoc;
@@ -841,7 +841,7 @@ CTSimApp::newTextDoc()
                                pFrame->Show (false);
                        }
                }
-               newDoc->OnNewDocument();
+//             newDoc->OnNewDocument();
        }
        
        return newDoc;
@@ -859,7 +859,7 @@ CTSimApp::newPhantomDoc()
                        if (pFrame)
                                pFrame->SetSize (0,0);
                }
-               newDoc->OnNewDocument();
+//             newDoc->OnNewDocument();
        }
        
        return newDoc;