projects
/
ctsim.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
r635: no message
[ctsim.git]
/
src
/
ctsim.cpp
diff --git
a/src/ctsim.cpp
b/src/ctsim.cpp
index 7beb6e3a397ddfcc3405fbcfd6ca833290e7d6ff..d42bab2ac9bb2a315a574ed3ca5e9e58abe69a94 100644
(file)
--- a/
src/ctsim.cpp
+++ b/
src/ctsim.cpp
@@
-9,7
+9,7
@@
** This is part of the CTSim program
** Copyright (c) 1983-2001 Kevin Rosenberg
**
** This is part of the CTSim program
** Copyright (c) 1983-2001 Kevin Rosenberg
**
-** $Id: ctsim.cpp,v 1.9
5 2001/03/05 15:16:25
kevin Exp $
+** $Id: ctsim.cpp,v 1.9
8 2001/03/07 16:34:47
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
**
** 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
@@
-48,6
+48,7
@@
#include "ct.h"
#include "ct.h"
+#include "ctndicom.h"
#include "ctsim.h"
#include "docs.h"
#include "views.h"
#include "ctsim.h"
#include "docs.h"
#include "views.h"
@@
-69,7
+70,7
@@
#endif
#endif
#endif
#endif
-static const char* rcsindent = "$Id: ctsim.cpp,v 1.9
5 2001/03/05 15:16:25
kevin Exp $";
+static const char* rcsindent = "$Id: ctsim.cpp,v 1.9
8 2001/03/07 16:34:47
kevin Exp $";
struct option CTSimApp::ctsimOptions[] =
{
struct option CTSimApp::ctsimOptions[] =
{
@@
-229,7
+230,10
@@
CTSimApp::OnInit()
if (getStartupTips())
ShowTips();
if (getStartupTips())
ShowTips();
+#ifdef HAVE_WXTHREADS
m_pBackgroundMgr = new BackgroundManager;
m_pBackgroundMgr = new BackgroundManager;
+#endif
+
return true;
}
return true;
}
@@
-453,7
+457,7
@@
MainFrame::MainFrame(wxDocManager *manager, wxFrame *frame, wxWindowID id, const
m_dDefaultFilterBandwidth = 1.;
m_dDefaultFilterInputScale = 1.;
m_dDefaultFilterOutputScale = 1.;
m_dDefaultFilterBandwidth = 1.;
m_dDefaultFilterInputScale = 1.;
m_dDefaultFilterOutputScale = 1.;
- m_iDefaultImportFormat = ImageFile::IMPORT_FORMAT_P
PM
;
+ m_iDefaultImportFormat = ImageFile::IMPORT_FORMAT_P
NG
;
wxAcceleratorEntry accelEntries[15];
accelEntries[0].Set (wxACCEL_CTRL, static_cast<int>('O'), wxID_OPEN);
wxAcceleratorEntry accelEntries[15];
accelEntries[0].Set (wxACCEL_CTRL, static_cast<int>('O'), wxID_OPEN);