From 4acfc6927c3e0ad652ed27ade40987703816aab3 Mon Sep 17 00:00:00 2001 From: "Kevin M. Rosenberg" Date: Sat, 27 Jan 2001 22:31:57 +0000 Subject: [PATCH] r456: no message --- msvc/ctsim/ctsim.plg | 12 +++---- src/views.cpp | 76 ++++++++++++++++++++++---------------------- 2 files changed, 44 insertions(+), 44 deletions(-) diff --git a/msvc/ctsim/ctsim.plg b/msvc/ctsim/ctsim.plg index ecc9d60..122254f 100644 --- a/msvc/ctsim/ctsim.plg +++ b/msvc/ctsim/ctsim.plg @@ -6,13 +6,13 @@ --------------------Configuration: ctsim - Win32 Debug--------------------

Command Lines

-Creating temporary file "C:\DOCUME~1\kevin\LOCALS~1\Temp\RSP140A.tmp" with contents +Creating temporary file "C:\DOCUME~1\kevin\LOCALS~1\Temp\RSP254.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 -"D:\ctsim\src\ctsim.cpp" +"C:\ctsim\src\views.cpp" ] -Creating command line "cl.exe @C:\DOCUME~1\kevin\LOCALS~1\Temp\RSP140A.tmp" -Creating temporary file "C:\DOCUME~1\kevin\LOCALS~1\Temp\RSP140B.tmp" with contents +Creating command line "cl.exe @C:\DOCUME~1\kevin\LOCALS~1\Temp\RSP254.tmp" +Creating temporary file "C:\DOCUME~1\kevin\LOCALS~1\Temp\RSP255.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,10 +28,10 @@ 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\RSP140B.tmp" +Creating command line "link.exe @C:\DOCUME~1\kevin\LOCALS~1\Temp\RSP255.tmp"

Output Window

Compiling... -ctsim.cpp +views.cpp Linking... diff --git a/src/views.cpp b/src/views.cpp index fe7d4ef..ec75fcc 100644 --- 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.80 2001/01/27 21:21:57 kevin Exp $ +** $Id: views.cpp,v 1.81 2001/01/27 22:31:57 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 @@ -75,7 +75,7 @@ ImageFileCanvas::ImageFileCanvas (ImageFileView* v, wxFrame *frame, const wxPoin ImageFileCanvas::~ImageFileCanvas() { - m_pView = NULL; + m_pView = NULL; } void @@ -1000,7 +1000,7 @@ ImageFileView::OnClose (bool deleteWindow) if (m_pCanvas) { m_pCanvas->Clear(); - m_pCanvas->Show(false); + m_pCanvas->Show(false); m_pCanvas->setView(NULL); m_pCanvas = NULL; } @@ -1012,9 +1012,9 @@ ImageFileView::OnClose (bool deleteWindow) Activate(false); if (deleteWindow) { - m_pFrame->Show(false); - m_pFrame->Destroy(); -// delete m_pFrame; + //m_pFrame->Show(false); + m_pFrame->Destroy(); + // delete m_pFrame; m_pFrame = NULL; } return true; @@ -1712,7 +1712,7 @@ PhantomCanvas::PhantomCanvas (PhantomFileView* v, wxFrame *frame, const wxPoint& PhantomCanvas::~PhantomCanvas () { - m_pView = NULL; + m_pView = NULL; } void @@ -1752,7 +1752,7 @@ PhantomFileView::PhantomFileView() PhantomFileView::~PhantomFileView() { - theApp->getDocManager()->FileHistoryRemoveMenu (m_pFileMenu); + theApp->getDocManager()->FileHistoryRemoveMenu (m_pFileMenu); } void @@ -1810,7 +1810,7 @@ PhantomFileView::OnProjections (wxCommandEvent& event) for (int iView = 0; iView < rProj.nView(); iView++) { ::wxYield(); if (dialogProjections.isCancelled() || ! dialogProjections.projectView (iView)) { - pProjectionDoc->getView()->getFrame()->Close(true); + pProjectionDoc->getView()->getFrame()->Close(true); return; } ::wxYield(); @@ -2035,7 +2035,7 @@ PhantomFileView::OnClose (bool deleteWindow) if (m_pCanvas) { m_pCanvas->Clear(); m_pCanvas->setView(NULL); - m_pCanvas->Show(false); + m_pCanvas->Show(false); m_pCanvas = NULL; } wxString s(wxTheApp->GetAppName()); @@ -2046,9 +2046,9 @@ PhantomFileView::OnClose (bool deleteWindow) Activate(false); if (deleteWindow) { - m_pFrame->Show(false); - m_pFrame->Destroy(); -// delete m_pFrame; + // m_pFrame->Show(false); + m_pFrame->Destroy(); + // delete m_pFrame; m_pFrame = NULL; } @@ -2077,7 +2077,7 @@ ProjectionFileCanvas::ProjectionFileCanvas (ProjectionFileView* v, wxFrame *fram ProjectionFileCanvas::~ProjectionFileCanvas () { - m_pView = NULL; + m_pView = NULL; } void @@ -2139,7 +2139,7 @@ ProjectionFileView::ProjectionFileView() ProjectionFileView::~ProjectionFileView() { - theApp->getDocManager()->FileHistoryRemoveMenu (m_pFileMenu); + theApp->getDocManager()->FileHistoryRemoveMenu (m_pFileMenu); } void @@ -2220,7 +2220,7 @@ ProjectionFileView::OnConvertFFTPolar (wxCommandEvent& event) pPolarDoc->UpdateAllViews(); pPolarDoc->getView()->OnUpdate (this, NULL); pPolarDoc->getView()->getFrame()->Show(true); -} + } } void @@ -2505,20 +2505,20 @@ ProjectionFileView::OnClose (bool deleteWindow) if (m_pCanvas) { m_pCanvas->Clear(); m_pCanvas->setView(NULL); - m_pCanvas->Show(false); + m_pCanvas->Show(false); m_pCanvas = NULL; } wxString s(wxTheApp->GetAppName()); if (m_pFrame) m_pFrame->SetTitle(s); -// SetFrame(NULL); + // SetFrame(NULL); Activate(false); if (deleteWindow) { - m_pFrame->Show(false); - m_pFrame->Destroy(); -// delete m_pFrame; + //m_pFrame->Show(false); + m_pFrame->Destroy(); + // delete m_pFrame; m_pFrame = NULL; } return true; @@ -2535,7 +2535,7 @@ PlotFileCanvas::PlotFileCanvas (PlotFileView* v, wxFrame *frame, const wxPoint& PlotFileCanvas::~PlotFileCanvas () { - m_pView = NULL; + m_pView = NULL; } void @@ -2566,7 +2566,7 @@ PlotFileView::~PlotFileView() { if (m_pEZPlot) delete m_pEZPlot; - + theApp->getDocManager()->FileHistoryRemoveMenu (m_pFileMenu); } @@ -2835,7 +2835,7 @@ PlotFileView::OnClose (bool deleteWindow) if (m_pCanvas) { m_pCanvas->Clear(); m_pCanvas->setView (NULL); - m_pCanvas->Show(false); + m_pCanvas->Show(false); m_pCanvas = NULL; } wxString s(wxTheApp->GetAppName()); @@ -2846,9 +2846,9 @@ PlotFileView::OnClose (bool deleteWindow) Activate(false); if (deleteWindow) { - m_pFrame->Show(false); - m_pFrame->Destroy(); -// delete m_pFrame; + //m_pFrame->Show(false); + m_pFrame->Destroy(); + // delete m_pFrame; m_pFrame = NULL; } return true; @@ -2862,7 +2862,7 @@ IMPLEMENT_DYNAMIC_CLASS(TextFileView, wxView) TextFileView::~TextFileView() { - theApp->getDocManager()->FileHistoryRemoveMenu (m_pFileMenu); + theApp->getDocManager()->FileHistoryRemoveMenu (m_pFileMenu); } bool TextFileView::OnCreate(wxDocument *doc, long WXUNUSED(flags) ) @@ -2901,21 +2901,21 @@ void TextFileView::OnUpdate(wxView *WXUNUSED(sender), wxObject *WXUNUSED(hint) ) bool TextFileView::OnClose (bool deleteWindow) { - if (m_pFrame && m_pFrame->GetTitle() == "Log") - return false; + if (m_pFrame && m_pFrame->GetTitle() == "Log") + return false; if (! GetDocument() || ! GetDocument()->Close()) return false; - + m_pCanvas->Show(false); Activate(false); if (deleteWindow) { - m_pFrame->Show(false); - m_pFrame->Destroy(); -// delete m_pFrame; - m_pFrame = NULL; - + //m_pFrame->Show(false); + m_pFrame->Destroy(); + // delete m_pFrame; + m_pFrame = NULL; + } return TRUE; } @@ -2982,11 +2982,11 @@ TextFileView::CreateChildFrame (wxDocument *doc, wxView *view) // Define a constructor for my text subwindow TextFileCanvas::TextFileCanvas (TextFileView* v, wxFrame* frame, const wxPoint& pos, const wxSize& size, long style) - : wxTextCtrl (frame, -1, "", pos, size, style), m_pView(v) +: wxTextCtrl (frame, -1, "", pos, size, style), m_pView(v) { } TextFileCanvas::~TextFileCanvas () { - m_pView = NULL; + m_pView = NULL; } -- 2.34.1