From 5e6c61b9ab5a05fff344b1aacf70e5ff61b81060 Mon Sep 17 00:00:00 2001 From: "Kevin M. Rosenberg" Date: Sun, 28 Jan 2001 04:24:03 +0000 Subject: [PATCH] r459: no message --- msvc/ctsim/ctsim.plg | 12 ++++++------ src/ctsim.cpp | 10 ++++++---- src/views.cpp | 22 +--------------------- 3 files changed, 13 insertions(+), 31 deletions(-) diff --git a/msvc/ctsim/ctsim.plg b/msvc/ctsim/ctsim.plg index 8756f70..52c7dd0 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\RSP2E7.tmp" with contents +Creating temporary file "C:\DOCUME~1\kevin\LOCALS~1\Temp\RSP142A.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\views.cpp" +"D:\ctsim\src\ctsim.cpp" ] -Creating command line "cl.exe @C:\DOCUME~1\kevin\LOCALS~1\Temp\RSP2E7.tmp" -Creating temporary file "C:\DOCUME~1\kevin\LOCALS~1\Temp\RSP2E8.tmp" with contents +Creating command line "cl.exe @C:\DOCUME~1\kevin\LOCALS~1\Temp\RSP142A.tmp" +Creating temporary file "C:\DOCUME~1\kevin\LOCALS~1\Temp\RSP142B.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\RSP2E8.tmp" +Creating command line "link.exe @C:\DOCUME~1\kevin\LOCALS~1\Temp\RSP142B.tmp"

Output Window

Compiling... -views.cpp +ctsim.cpp Linking... diff --git a/src/ctsim.cpp b/src/ctsim.cpp index c2c952e..7a8d505 100644 --- 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.52 2001/01/28 03:48:55 kevin Exp $ +** $Id: ctsim.cpp,v 1.53 2001/01/28 04:24:03 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.52 2001/01/28 03:48:55 kevin Exp $"; +static const char* rcsindent = "$Id: ctsim.cpp,v 1.53 2001/01/28 04:24:03 kevin Exp $"; struct option CTSimApp::ctsimOptions[] = { @@ -189,7 +189,7 @@ CTSimApp::OnInit() *m_pLog << "Cannot initialize the Windows Help system\n"; #endif if (! m_pFrame->getHtmlHelpController().Initialize(::wxGetCwd() + "/ctsim")) - *m_pLog << "Cannot initialize the HTML Help system"; + *m_pLog << "Cannot initialize the HTML Help system\n"; return true; } @@ -442,7 +442,7 @@ MainFrame::OnCreateFilter (wxCommandEvent& WXUNUSED(event)) << ", inputScale=" << m_dDefaultFilterInputScale << ", outputScale=" << m_dDefaultFilterOutputScale; *theApp->getLog() << os.str().c_str() << "\n"; wxString filename = "untitled.if"; - ImageFileDocument* pFilterDoc = dynamic_cast(theApp->getDocManager()->CreateDocument ("untitled.if", wxDOC_SILENT)); + ImageFileDocument* pFilterDoc = theApp->newImageDoc(); if (! pFilterDoc) { sys_error (ERR_SEVERE, "Unable to create filter image"); return; @@ -455,6 +455,8 @@ MainFrame::OnCreateFilter (wxCommandEvent& WXUNUSED(event)) pFilterDoc->Modify (true); pFilterDoc->UpdateAllViews(); pFilterDoc->GetFirstView()->OnUpdate (NULL, NULL); + pFilterDoc->getView()->getFrame()->SetClientSize(m_iDefaultFilterXSize, m_iDefaultFilterYSize); + pFilterDoc->getView()->getFrame()->Show(true); } } diff --git a/src/views.cpp b/src/views.cpp index 315474d..8b28fef 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.82 2001/01/28 03:48:55 kevin Exp $ +** $Id: views.cpp,v 1.83 2001/01/28 04:24:03 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 @@ -1000,8 +1000,6 @@ ImageFileView::OnClose (bool deleteWindow) return false; if (m_pCanvas) { -// m_pCanvas->Show(false); -// m_pCanvas->Clear(); m_pCanvas->setView(NULL); m_pCanvas = NULL; } @@ -1014,9 +1012,7 @@ ImageFileView::OnClose (bool deleteWindow) if (deleteWindow) { m_pFrame->Show(false); - //m_pFrame->Close(true); m_pFrame->Destroy(); - // delete m_pFrame; m_pFrame = NULL; } return true; @@ -2047,8 +2043,6 @@ PhantomFileView::OnClose (bool deleteWindow) return false; if (m_pCanvas) { - //m_pCanvas->Show(false); - //m_pCanvas->Clear(); m_pCanvas->setView(NULL); m_pCanvas = NULL; } @@ -2062,8 +2056,6 @@ PhantomFileView::OnClose (bool deleteWindow) if (deleteWindow) { m_pFrame->Show(false); m_pFrame->Destroy(); - //GetDocumentManager()->ActivateView(this, FALSE, TRUE); - // delete m_pFrame; m_pFrame = NULL; } @@ -2525,8 +2517,6 @@ ProjectionFileView::OnClose (bool deleteWindow) return false; if (m_pCanvas) { - //m_pCanvas->Show(false); - //m_pCanvas->Clear(); m_pCanvas->setView(NULL); m_pCanvas = NULL; } @@ -2540,8 +2530,6 @@ ProjectionFileView::OnClose (bool deleteWindow) if (deleteWindow) { m_pFrame->Show(false); m_pFrame->Destroy(); - // delete m_pFrame; - //m_pFrame->Close(true); m_pFrame = NULL; } return true; @@ -2856,8 +2844,6 @@ PlotFileView::OnClose (bool deleteWindow) return false; if (m_pCanvas) { -// m_pCanvas->Show(false); -// m_pCanvas->Clear(); m_pCanvas->setView (NULL); m_pCanvas = NULL; } @@ -2872,9 +2858,6 @@ PlotFileView::OnClose (bool deleteWindow) if (deleteWindow) { m_pFrame->Show(false); m_pFrame->Destroy(); - //m_pFrame->Close(true); - //GetDocumentManager()->ActivateView(this, FALSE, TRUE); - // delete m_pFrame; m_pFrame = NULL; } return true; @@ -2942,9 +2925,6 @@ TextFileView::OnClose (bool deleteWindow) if (deleteWindow) { m_pFrame->Show(false); m_pFrame->Destroy(); - //m_pFrame->Close(true); - //GetDocumentManager()->ActivateView(this, FALSE, TRUE); - // delete m_pFrame; m_pFrame = NULL; } -- 2.34.1