From: Kevin M. Rosenberg Date: Fri, 26 Jan 2001 21:33:06 +0000 (+0000) Subject: r441: no message X-Git-Tag: debian-4.5.3-3~576 X-Git-Url: http://git.kpe.io/?p=ctsim.git;a=commitdiff_plain;h=91fb88e205c5bc7b771faf601db8489a9278c1ab r441: no message --- diff --git a/msvc/ctsim/ctsim.plg b/msvc/ctsim/ctsim.plg index 607ff22..d82753f 100644 --- a/msvc/ctsim/ctsim.plg +++ b/msvc/ctsim/ctsim.plg @@ -6,13 +6,16 @@ --------------------Configuration: ctsim - Win32 Debug--------------------

Command Lines

-Creating temporary file "C:\DOCUME~1\kevin\LOCALS~1\Temp\RSPAB4.tmp" with contents +Creating temporary file "C:\DOCUME~1\kevin\LOCALS~1\Temp\RSPABE.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" +"D:\ctsim\src\dialogs.cpp" +"D:\ctsim\src\docs.cpp" +"D:\ctsim\src\views.cpp" ] -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 +Creating command line "cl.exe @C:\DOCUME~1\kevin\LOCALS~1\Temp\RSPABE.tmp" +Creating temporary file "C:\DOCUME~1\kevin\LOCALS~1\Temp\RSPABF.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 +31,14 @@ 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\RSPAB5.tmp" +Creating command line "link.exe @C:\DOCUME~1\kevin\LOCALS~1\Temp\RSPABF.tmp"

Output Window

Compiling... ctsim.cpp +views.cpp +Skipping... (no relevant changes detected) +dialogs.cpp +docs.cpp Linking... diff --git a/src/views.cpp b/src/views.cpp index 1ed0408..4e970c1 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.73 2001/01/26 21:22:37 kevin Exp $ +** $Id: views.cpp,v 1.74 2001/01/26 21:33:06 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 @@ -231,15 +231,15 @@ EVT_MENU(IFMENU_PLOT_FFT_COL, ImageFileView::OnPlotFFTCol) EVT_MENU(IFMENU_PLOT_HISTOGRAM, ImageFileView::OnPlotHistogram) END_EVENT_TABLE() -ImageFileView::ImageFileView(void) +ImageFileView::ImageFileView() : wxView(), m_canvas(NULL), m_frame(NULL), m_bMinSpecified(false), m_bMaxSpecified(false), m_pFileMenu(0) { m_iDefaultExportFormatID = ImageFile::FORMAT_PNG; } -ImageFileView::~ImageFileView(void) +ImageFileView::~ImageFileView() { - wxView::~wxView(); + } void @@ -1733,7 +1733,7 @@ EVT_MENU(PHMMENU_PROCESS_RASTERIZE, PhantomFileView::OnRasterize) EVT_MENU(PHMMENU_PROCESS_PROJECTIONS, PhantomFileView::OnProjections) END_EVENT_TABLE() -PhantomFileView::PhantomFileView(void) +PhantomFileView::PhantomFileView() : wxView(), m_canvas(NULL), m_frame(NULL), m_pFileMenu(0) { m_iDefaultNDet = 367; @@ -1752,7 +1752,7 @@ PhantomFileView::PhantomFileView(void) PhantomFileView::~PhantomFileView() { - wxView::~wxView(); + } void @@ -2108,7 +2108,7 @@ EVT_MENU(PJMENU_CONVERT_POLAR, ProjectionFileView::OnConvertPolar) EVT_MENU(PJMENU_CONVERT_FFT_POLAR, ProjectionFileView::OnConvertFFTPolar) END_EVENT_TABLE() -ProjectionFileView::ProjectionFileView(void) +ProjectionFileView::ProjectionFileView() : wxView(), m_canvas(NULL), m_frame(NULL), m_pFileMenu(0) { m_iDefaultNX = 256; @@ -2134,9 +2134,9 @@ ProjectionFileView::ProjectionFileView(void) m_iDefaultPolarZeropad = 1; } -ProjectionFileView::~ProjectionFileView(void) +ProjectionFileView::~ProjectionFileView() { - wxView::~wxView(); + } void @@ -2548,19 +2548,19 @@ EVT_MENU(PLOTMENU_VIEW_SCALE_AUTO, PlotFileView::OnScaleAuto) EVT_MENU(PLOTMENU_VIEW_SCALE_FULL, PlotFileView::OnScaleFull) END_EVENT_TABLE() -PlotFileView::PlotFileView(void) +PlotFileView::PlotFileView() : wxView(), m_canvas(NULL), m_frame(NULL), m_pEZPlot(NULL), m_pFileMenu(0) { m_bMinSpecified = false; m_bMaxSpecified = false; } -PlotFileView::~PlotFileView(void) +PlotFileView::~PlotFileView() { if (m_pEZPlot) delete m_pEZPlot; - wxView::~wxView(); + } void @@ -2848,7 +2848,7 @@ IMPLEMENT_DYNAMIC_CLASS(TextFileView, wxView) TextFileView::~TextFileView() { - wxView::~wxView(); + } bool TextFileView::OnCreate(wxDocument *doc, long WXUNUSED(flags) ) @@ -2887,7 +2887,7 @@ void TextFileView::OnUpdate(wxView *WXUNUSED(sender), wxObject *WXUNUSED(hint) ) bool TextFileView::OnClose (bool deleteWindow) { - if (m_pFrame->GetTitle() == "Log") + if (m_pFrame && m_pFrame->GetTitle() == "Log") return false; if (! GetDocument() || ! GetDocument()->Close()) @@ -2898,7 +2898,8 @@ TextFileView::OnClose (bool deleteWindow) if (deleteWindow) { delete m_pFrame; - return TRUE; + m_pFrame = NULL; + } return TRUE; } diff --git a/src/views.h b/src/views.h index 6cab7ab..f395c94 100644 --- a/src/views.h +++ b/src/views.h @@ -9,7 +9,7 @@ ** This is part of the CTSim program ** Copyright (C) 1983-2000 Kevin Rosenberg ** -** $Id: views.h,v 1.30 2001/01/26 05:37:24 kevin Exp $ +** $Id: views.h,v 1.31 2001/01/26 21:33:06 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 @@ -67,8 +67,8 @@ private: #endif public: - ImageFileView(void); - virtual ~ImageFileView(void); + ImageFileView(); + virtual ~ImageFileView(); void canvasClosed() { m_canvas = NULL; m_frame = NULL; } @@ -128,7 +128,7 @@ public: wxFrame* getFrame() { return m_frame; } - ImageFileDocument* GetDocument(void) + ImageFileDocument* GetDocument() { return dynamic_cast(wxView::GetDocument()); } DECLARE_EVENT_TABLE() @@ -201,8 +201,8 @@ private: #endif public: - ProjectionFileView(void); - virtual ~ProjectionFileView(void); + ProjectionFileView(); + virtual ~ProjectionFileView(); void canvasClosed() { m_canvas = NULL; m_frame = NULL; } @@ -220,7 +220,7 @@ public: wxMenu* getFileMenu() { return m_pFileMenu; } - ProjectionFileDocument* GetDocument(void) + ProjectionFileDocument* GetDocument() { return dynamic_cast(wxView::GetDocument()); } DECLARE_EVENT_TABLE() }; @@ -276,8 +276,8 @@ private: #endif public: - PhantomFileView(void); - virtual ~PhantomFileView(void); + PhantomFileView(); + virtual ~PhantomFileView(); void canvasClosed() { m_canvas = NULL; m_frame = NULL; } @@ -289,7 +289,7 @@ public: void OnRasterize (wxCommandEvent& event); void OnProjections (wxCommandEvent& event); - PhantomFileDocument* GetDocument(void) + PhantomFileDocument* GetDocument() { return dynamic_cast(wxView::GetDocument()); } wxMenu* getFileMenu() { return m_pFileMenu; } @@ -338,8 +338,8 @@ private: #endif public: - PlotFileView(void); - virtual ~PlotFileView(void); + PlotFileView(); + virtual ~PlotFileView(); void canvasClosed() { m_canvas = NULL; m_frame = NULL; } @@ -357,7 +357,7 @@ public: { return m_frame; } wxMenu* getFileMenu() { return m_pFileMenu; } - PlotFileDocument* GetDocument(void) + PlotFileDocument* GetDocument() { return dynamic_cast(wxView::GetDocument()); } DECLARE_EVENT_TABLE()