r446: no message

[ctsim.git] / src / ctsim.cpp

diff --git a/src/ctsim.cpp b/src/ctsim.cpp
index dd41076c0519642b6a5702d03fdabfc48cd1c252..95994085a691a756fea75d36ec380eb6534e2f18 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.43 2001/01/26 09:54:31 kevin Exp $
+**  $Id: ctsim.cpp,v 1.49 2001/01/27 03:08:16 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.43 2001/01/26 09:54:31 kevin Exp $";
+static const char* rcsindent = "$Id: ctsim.cpp,v 1.49 2001/01/27 03:08:16 kevin Exp $";
 
 struct option CTSimApp::ctsimOptions[] = 
 {
@@ -150,7 +150,8 @@ CTSimApp::OnInit()
   // Create the main frame window
   int xDisplay, yDisplay;
   ::wxDisplaySize (&xDisplay, &yDisplay);
-  m_pFrame = new MainFrame(m_docManager, (wxFrame *) NULL, -1, "CTSim", wxPoint(0, 0), wxSize(xDisplay * .75, yDisplay * .755), wxDEFAULT_FRAME_STYLE);
+  m_pFrame = new MainFrame(m_docManager, (wxFrame *) NULL, -1, "CTSim", wxPoint(0, 0), 
+    wxSize(nearest<int>(xDisplay * .75), nearest<int>(yDisplay * .755)), wxDEFAULT_FRAME_STYLE);
   
   setIconForFrame (m_pFrame);
   m_pFrame->Centre(wxBOTH);
@@ -216,11 +217,6 @@ CTSimApp::usage(const char* program)
 int
 CTSimApp::OnExit()
 {
-    if (theApp->getConfig())
-      theApp->getDocManager()->FileHistorySave (*theApp->getConfig());
-    delete theApp->getDocManager();
-  m_docManager = NULL;
-
 #ifdef HAVE_DMALLOC
   dmalloc_shutdown();
 #endif
@@ -334,7 +330,8 @@ MainFrame::MainFrame(wxDocManager *manager, wxFrame *frame, wxWindowID id, const
   SetMenuBar(menu_bar);
   
 #ifndef CTSIM_MDI
-  for (int i = 0; i < MAX_WINDOW_MENUITEMS; i++) {
+  int i;
+  for (i = 0; i < MAX_WINDOW_MENUITEMS; i++) {
     m_apWindowMenuItems[i] = new wxMenuItem (m_pWindowMenu, MAINMENU_WINDOW_BASE+i, wxString("[EMPTY]"));
     m_pWindowMenu->Append (m_apWindowMenuItems[i]);
     m_pWindowMenu->Enable (MAINMENU_WINDOW_BASE+i, false);
@@ -370,12 +367,21 @@ MainFrame::MainFrame(wxDocManager *manager, wxFrame *frame, wxWindowID id, const
 
 MainFrame::~MainFrame()
 {
+    if (theApp->getConfig())
+      theApp->getDocManager()->FileHistorySave (*theApp->getConfig());
+    delete theApp->getDocManager();
 }
 
 void
 MainFrame::OnSize (wxSizeEvent& event)
 {
+#ifdef CTSIM_MDI
+  int xSize, ySize;
+  wxMDIParentFrame::GetClientSize(&xSize, &ySize);
+  wxSize sizeClient (xSize, ySize);
+#else
   wxSize sizeClient = GetClientSize();
+#endif
   wxSize sizeLog = sizeClient;
   if (sizeClient.y < 100) {
     sizeLog.y = 0;
@@ -770,11 +776,12 @@ CTSimApp::newProjectionDoc()
     ProjectionFileView* pView = newDoc->getView();
     if (pView) {
       wxFrame* pFrame = pView->getFrame();
-      if (pFrame)
+      if (pFrame) {
         pFrame->SetSize(0,0);
+        pFrame->Show (false);
+      }
     }
     newDoc->OnNewDocument();
-//    newDoc->SetFilename(strFilename, true);
   }
 
   return newDoc;
@@ -791,8 +798,10 @@ CTSimApp::newImageDoc()
     ImageFileView* pView = newDoc->getView();
     if (pView) {
       wxFrame* pFrame = pView->getFrame();
-      if (pFrame)
+      if (pFrame) {
         pFrame->SetSize(0,0);
+        pFrame->Show (false);
+      }
     }
     newDoc->OnNewDocument();
 //    newDoc->SetFilename(strFilename, true);