From 87748a0c3854cd5b2660baad217cf7071cb24be2 Mon Sep 17 00:00:00 2001 From: "Kevin M. Rosenberg" Date: Thu, 24 Oct 2002 20:09:55 +0000 Subject: [PATCH] r3161: update to 3.6.0 --- src/backgroundsupr.cpp | 4 ++-- src/backgroundsupr.h | 6 +++--- src/graph3dview.cpp | 5 +++-- tools/Makefile.am | 4 ++-- tools/ctsimtext.cpp | 17 ++--------------- 5 files changed, 12 insertions(+), 24 deletions(-) diff --git a/src/backgroundsupr.cpp b/src/backgroundsupr.cpp index 8107a9e..98f81e6 100644 --- a/src/backgroundsupr.cpp +++ b/src/backgroundsupr.cpp @@ -9,7 +9,7 @@ ** This is part of the CTSim program ** Copyright (C) 1983-2001 Kevin Rosenberg ** -** $Id: backgroundsupr.cpp,v 1.19 2001/03/11 06:34:37 kevin Exp $ +** $Id: backgroundsupr.cpp,v 1.20 2002/10/24 20:09:55 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 @@ -54,7 +54,7 @@ END_EVENT_TABLE() -BackgroundSupervisor::BackgroundSupervisor (SupervisorThread* pMyThread, wxFrame* pParentFrame, BackgroundProcessingDocument* pDocument, const char* const pszProcessTitle, int iTotalUnits) +BackgroundSupervisor::BackgroundSupervisor (SupervisorThread* pMyThread, wxWindow* pParentFrame, BackgroundProcessingDocument* pDocument, const char* const pszProcessTitle, int iTotalUnits) : wxEvtHandler(), m_pMyThread(pMyThread), m_pParentFrame(pParentFrame), m_pDocument(pDocument), m_strProcessTitle(pszProcessTitle), m_iTotalUnits(iTotalUnits), m_iNumThreads(0), m_bDone(false), m_bFail(false), m_bCancelled(false), m_iRunning(0), m_pTimer(NULL), m_bWorkersDeleted(false), m_bBackgroundManagerAdded(false) diff --git a/src/backgroundsupr.h b/src/backgroundsupr.h index d4daa3e..e362e40 100644 --- a/src/backgroundsupr.h +++ b/src/backgroundsupr.h @@ -9,7 +9,7 @@ ** This is part of the CTSim program ** Copyright (C) 1983-2001 Kevin Rosenberg ** -** $Id: backgroundsupr.h,v 1.11 2001/03/09 21:31:51 kevin Exp $ +** $Id: backgroundsupr.h,v 1.12 2002/10/24 20:09:55 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 @@ -55,7 +55,7 @@ private: DECLARE_DYNAMIC_CLASS(BackgroundSupervisor) SupervisorThread* m_pMyThread; - wxFrame* m_pParentFrame; + wxWindow* m_pParentFrame; BackgroundProcessingDocument* m_pDocument; const std::string m_strProcessTitle; @@ -88,7 +88,7 @@ public: MSG_WORKER_THREAD_FAIL = 7507, // sent by workers when they fail }; - BackgroundSupervisor (SupervisorThread* pMyThread, wxFrame* pParentFrame, BackgroundProcessingDocument* pDocument, const char* const pszProcessTitle, + BackgroundSupervisor (SupervisorThread* pMyThread, wxWindow* pParentFrame, BackgroundProcessingDocument* pDocument, const char* const pszProcessTitle, int iTotalUnits); BackgroundSupervisor () diff --git a/src/graph3dview.cpp b/src/graph3dview.cpp index 7d08275..39d54c4 100644 --- a/src/graph3dview.cpp +++ b/src/graph3dview.cpp @@ -9,7 +9,7 @@ ** This is part of the CTSim program ** Copyright (c) 1983-2001 Kevin Rosenberg ** -** $Id: graph3dview.cpp,v 1.29 2002/06/27 03:19:23 kevin Exp $ +** $Id: graph3dview.cpp,v 1.30 2002/10/24 20:09:55 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 @@ -806,9 +806,10 @@ Graph3dFileView::CreateChildFrame (wxDocument *doc, wxView *view) +// EVT_PAINT(Graph3dFileCanvas::OnPaint) + BEGIN_EVENT_TABLE(Graph3dFileCanvas, wxGLCanvas) EVT_SIZE(Graph3dFileCanvas::OnSize) -EVT_PAINT(Graph3dFileCanvas::OnPaint) EVT_CHAR(Graph3dFileCanvas::OnChar) EVT_MOUSE_EVENTS(Graph3dFileCanvas::OnMouseEvent) EVT_ERASE_BACKGROUND(Graph3dFileCanvas::OnEraseBackground) diff --git a/tools/Makefile.am b/tools/Makefile.am index 1e4cc29..963d8f3 100644 --- a/tools/Makefile.am +++ b/tools/Makefile.am @@ -21,14 +21,14 @@ install-exec-hook: ln -sf ctsimtext $(bindir)/pjrec ln -sf ctsimtext $(bindir)/pjHinterp -ctsimtext_SOURCES = ctsimtext.cpp +ctsimtext_SOURCES = ctsimtext.cpp if1.cpp if2.cpp ifinfo.cpp ifexport.cpp phm2if.cpp phm2pj.cpp pj2if.cpp pjinfo.cpp pjrec.cpp nographics.cpp phm2helix.cpp pjHinterp.cpp ctsimtext_LDADD=@ctlibs@ ctsimtext_DEPENDENCIES=$(SOURCE_DEPEND) realclean: rm -f *.pgm *.if *~ *.pj -ctsimtext_lam_SOURCES = ctsimtext.cpp +ctsimtext_lam_SOURCES = ctsimtext.cpp if1.cpp if2.cpp ifinfo.cpp ifexport.cpp phm2if.cpp phm2pj.cpp pj2if.cpp pjinfo.cpp pjrec.cpp nographics.cpp mpiworld.cpp phm2helix.cpp pjHinterp.cpp ctsimtext_lam_LDADD=@ctlamlibs@ if USE_LAM diff --git a/tools/ctsimtext.cpp b/tools/ctsimtext.cpp index 2df7915..0b2b6a4 100644 --- a/tools/ctsimtext.cpp +++ b/tools/ctsimtext.cpp @@ -9,7 +9,7 @@ ** This is part of the CTSim program ** Copyright (C) 1983-2000 Kevin Rosenberg ** -** $Id: ctsimtext.cpp,v 1.22 2002/09/09 22:45:20 kevin Exp $ +** $Id: ctsimtext.cpp,v 1.23 2002/10/24 20:09:55 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 @@ -45,7 +45,7 @@ extern "C" { // If linked to ctsimtext, but executed as another name, eg pjrec, then program will use that // linked name as name of function. -static const char* const g_szIdStr = "$Id: ctsimtext.cpp,v 1.22 2002/09/09 22:45:20 kevin Exp $"; +static const char* const g_szIdStr = "$Id: ctsimtext.cpp,v 1.23 2002/10/24 20:09:55 kevin Exp $"; static const char* const s_szProgramName = "ctsimtext"; static const char* const s_szProgramName2 = "ctsimtext.exe"; static const char* const s_szProgramName3 = "ctsimtext-lam"; @@ -293,16 +293,3 @@ main (int argc, char* argv[]) return retval; } - -#include "nographics.cpp" -#include "if1.cpp" -#include "if2.cpp" -#include "ifinfo.cpp" -#include "ifexport.cpp" -#include "phm2if.cpp" -#include "phm2pj.cpp" -#include "pj2if.cpp" -#include "pjinfo.cpp" -#include "pjrec.cpp" -#include "phm2helix.cpp" -#include "pjHinterp.cpp" -- 2.34.1