r440: no message

diff --git a/msvc/ctsim/ctsim.plg b/msvc/ctsim/ctsim.plg
index bff53a17023bd031611a880be28efcefc68a470e..607ff220d34555b90e1fdd82e839c7c387913a7b 100644 (file)
--- a/msvc/ctsim/ctsim.plg
+++ b/msvc/ctsim/ctsim.plg
@@ -6,13 +6,13 @@
 --------------------Configuration: ctsim - Win32 Debug--------------------
 </h3>
 <h3>Command Lines</h3>
-Creating temporary file "C:\DOCUME~1\kevin\LOCALS~1\Temp\RSP160.tmp" with contents
+Creating temporary file "C:\DOCUME~1\kevin\LOCALS~1\Temp\RSPAB4.tmp" with contents
 [
 /nologo /G6 /MTd /W3 /Gm /GR /GX /Zi /Od /I "\wx2\include" /I "." /I "..\..\include" /I "..\..\getopt" /I "..\..\..\lpng108" /I "..\..\..\zlib" /I "..\..\..\fftw-2.1.3\fftw" /I "..\..\..\fftw-2.1.3\rfftw" /D VERSION=\"2.5.0\" /D "_DEBUG" /D "__WXMSW__" /D "HAVE_SGP" /D "HAVE_PNG" /D "HAVE_WXWINDOWS" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "HAVE_STRING_H" /D "HAVE_FFTW" /D "HAVE_RFFTW" /D "HAVE_GETOPT_H" /D "MSVC" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /D CTSIMVERSION=\"3.0.0alpha5\" /FR"Debug/" /Fp"Debug/ctsim.pch" /YX /Fo"Debug/" /Fd"Debug/" /FD /GZ /c 
-"C:\ctsim\src\ctsim.cpp"
+"D:\ctsim\src\ctsim.cpp"
 ]
-Creating command line "cl.exe @C:\DOCUME~1\kevin\LOCALS~1\Temp\RSP160.tmp" 
-Creating temporary file "C:\DOCUME~1\kevin\LOCALS~1\Temp\RSP161.tmp" with contents
+Creating command line "cl.exe @C:\DOCUME~1\kevin\LOCALS~1\Temp\RSPAB4.tmp" 
+Creating temporary file "C:\DOCUME~1\kevin\LOCALS~1\Temp\RSPAB5.tmp" with contents
 [
 comctl32.lib winmm.lib rpcrt4.lib ws2_32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib ../libctsim/Debug/libctsim.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib ..\..\..\lpng108\msvc\win32\libpng\lib_dbg\libpng.lib ..\..\..\lpng108\msvc\win32\zlib\lib_dbg\zlib.lib libcmtd.lib ..\..\..\fftw-2.1.3\Win32\FFTW2st\Debug\FFTW2st.lib ..\..\..\fftw-2.1.3\Win32\RFFTW2st\Debug\RFFTW2st.lib ../../../wx2/lib/wxd.lib xpmd.lib /nologo /subsystem:windows /incremental:yes /pdb:"Debug/ctsim.pdb" /debug /machine:I386 /out:"Debug/ctsim.exe" /pdbtype:sept /libpath:"..\..\..\lpng108\msvc\win32\libpng\lib" /libpath:"..\..\..\lpng108\msvc\win32\zlib\lib" /libpath:"..\..\..\wx2\lib" 
 .\Debug\ctsim.obj
@@ -28,7 +28,7 @@ comctl32.lib winmm.lib rpcrt4.lib ws2_32.lib kernel32.lib user32.lib gdi32.lib w
 \wx2\lib\wxd.lib
 \wx2\lib\xpmd.lib
 ]
-Creating command line "link.exe @C:\DOCUME~1\kevin\LOCALS~1\Temp\RSP161.tmp"
+Creating command line "link.exe @C:\DOCUME~1\kevin\LOCALS~1\Temp\RSPAB5.tmp"
 <h3>Output Window</h3>
 Compiling...
 ctsim.cpp

diff --git a/src/ctsim.cpp b/src/ctsim.cpp
index dd41076c0519642b6a5702d03fdabfc48cd1c252..5c25369d1a012edcd470ceeb57414c23aaf13224 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.44 2001/01/26 21:22:37 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.44 2001/01/26 21:22:37 kevin Exp $";
 
 struct option CTSimApp::ctsimOptions[] = 
 {
@@ -219,7 +219,7 @@ CTSimApp::OnExit()
     if (theApp->getConfig())
       theApp->getDocManager()->FileHistorySave (*theApp->getConfig());
     delete theApp->getDocManager();
-  m_docManager = NULL;
+//  m_docManager = NULL;
 
 #ifdef HAVE_DMALLOC
   dmalloc_shutdown();
@@ -334,7 +334,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);

diff --git a/src/views.cpp b/src/views.cpp
index 9d0314ac8b66e143b5fe169bd7f064a636aaedab..1ed04087d2f2fd291e00892f40e6721d14c79382 100644 (file)
--- a/src/views.cpp
+++ b/src/views.cpp
@@ -9,7 +9,7 @@
 **  This is part of the CTSim program
 **  Copyright (C) 1983-2000 Kevin Rosenberg
 **
-**  $Id: views.cpp,v 1.72 2001/01/26 09:54:31 kevin Exp $
+**  $Id: views.cpp,v 1.73 2001/01/26 21:22:37 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
@@ -239,6 +239,7 @@ ImageFileView::ImageFileView(void)
 
 ImageFileView::~ImageFileView(void)
 {
+       wxView::~wxView();
 }
 
 void
@@ -993,7 +994,7 @@ ImageFileView::OnUpdate (wxView *WXUNUSED(sender), wxObject *WXUNUSED(hint) )
 bool 
 ImageFileView::OnClose (bool deleteWindow)
 {
-  if (!GetDocument()->Close())
+  if (! GetDocument() || ! GetDocument()->Close())
     return false;
   
   if (m_canvas) {
@@ -1751,6 +1752,7 @@ PhantomFileView::PhantomFileView(void)
 
 PhantomFileView::~PhantomFileView()
 {
+       wxView::~wxView();
 }
 
 void
@@ -2022,7 +2024,7 @@ PhantomFileView::OnUpdate(wxView *WXUNUSED(sender), wxObject *WXUNUSED(hint) )
 bool 
 PhantomFileView::OnClose (bool deleteWindow)
 {
-  if (!GetDocument()->Close())
+  if (! GetDocument() || ! GetDocument()->Close())
     return false;
   
   if (m_canvas) {
@@ -2134,6 +2136,7 @@ ProjectionFileView::ProjectionFileView(void)
 
 ProjectionFileView::~ProjectionFileView(void)
 {
+       wxView::~wxView();
 }
 
 void
@@ -2485,7 +2488,7 @@ ProjectionFileView::OnUpdate(wxView *WXUNUSED(sender), wxObject *WXUNUSED(hint)
 bool 
 ProjectionFileView::OnClose (bool deleteWindow)
 {
-  if (!GetDocument()->Close())
+  if (! GetDocument() || ! GetDocument()->Close())
     return false;
   
   if (m_canvas) {
@@ -2556,6 +2559,8 @@ PlotFileView::~PlotFileView(void)
 {
   if (m_pEZPlot)
     delete m_pEZPlot;
+
+  wxView::~wxView();
 }
 
 void
@@ -2813,7 +2818,7 @@ PlotFileView::OnUpdate (wxView *WXUNUSED(sender), wxObject *WXUNUSED(hint) )
 bool 
 PlotFileView::OnClose (bool deleteWindow)
 {
-  if (!GetDocument()->Close())
+  if (! GetDocument() || ! GetDocument()->Close())
     return false;
   
   if (m_canvas) {
@@ -2843,6 +2848,7 @@ IMPLEMENT_DYNAMIC_CLASS(TextFileView, wxView)
 
 TextFileView::~TextFileView() 
 {
+       wxView::~wxView();
 }
 
 bool TextFileView::OnCreate(wxDocument *doc, long WXUNUSED(flags) )
@@ -2881,9 +2887,10 @@ void TextFileView::OnUpdate(wxView *WXUNUSED(sender), wxObject *WXUNUSED(hint) )
 bool 
 TextFileView::OnClose (bool deleteWindow)
 {
-  return false;
+       if (m_pFrame->GetTitle() == "Log")
+       return false;
   
-  if (!GetDocument()->Close())
+  if (! GetDocument() || ! GetDocument()->Close())
     return false;
   
   Activate(false);