** This is part of the CTSim program
** Copyright (c) 1983-2001 Kevin Rosenberg
**
-** $Id: ctsim.cpp,v 1.118 2002/06/20 11:55:44 kevin Exp $
+** $Id$
**
** 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
#endif
#endif
-static const char* rcsindent = "$Id: ctsim.cpp,v 1.118 2002/06/20 11:55:44 kevin Exp $";
+static const char* rcsindent = "$Id$";
struct option CTSimApp::ctsimOptions[] =
{
bool bPrintFiles = false;
// process options
while (1) {
+#ifdef __WXMAC__
+ int c = -1;
+#else
int c = getopt_long (argc, argv, "", ctsimOptions, NULL);
+#endif
if (c == -1)
break;
case O_VERSION:
std::cout << rcsindent << std::endl;
#ifdef VERSION
- std::cout << "Version: " << VERSION << std::endl;\r
-#elif defined(CTSIMVERSION)\r
+ std::cout << "Version: " << VERSION << std::endl;
+#elif defined(CTSIMVERSION)
std::cout << "Version: " << CTSIMVERSION << std::endl;
#endif
exit(0);
wxString helpDir;
if (! m_pConfig->Read("HelpDir", &helpDir))
- helpDir = ::wxGetCwd();\r
+ helpDir = ::wxGetCwd();
#ifdef CTSIM_WINHELP
if (! m_pFrame->getWinHelpController().Initialize(helpDir + "/ctsim"))
*m_pLog << "Cannot initialize the Windows Help system" << "\n";
-#else\r
+#else
#ifdef DATADIR
- wxString docDir (DATADIR);\r
-#else\r
- wxString docDir (::wxGetCwd());\r
+ wxString docDir (DATADIR);
+#else
+ wxString docDir (::wxGetCwd());
#endif
wxString docFile = docDir + "ctsim.htb";
if (! m_pFrame->getHtmlHelpController().AddBook(docFile) &&
! m_pFrame->getHtmlHelpController().AddBook("/usr/share/ctsim/ctsim.htb") &&
- ! m_pFrame->getHtmlHelpController().AddBook("/tmp/ctsim.htb"))\r
+ ! m_pFrame->getHtmlHelpController().AddBook("/tmp/ctsim.htb"))
*m_pLog << "Cannot initialize the HTML Help system" << "\n";
else {
if (::wxDirExists ("/tmp"))
wxString strFilename = pDoc->GetFilename();
const wxView* pView = pDoc->GetFirstView();
if (pView) {
- wxFrame* pFrame = pView->GetFrame();
- pFrame->SetFocus();
- pFrame->Raise();
+ wxWindow* pWindow = pView->GetFrame();
+ pWindow->SetFocus();
+ pWindow->Raise();
}
}
}
void
MainFrame::OnAbout(wxCommandEvent& WXUNUSED(event) )
{
- long lFreeMem = ::wxGetFreeMemory() / (1024L * 1024L);
wxString strOSDesc = ::wxGetOsDescription();
*theApp->getLog() << "Operating System: " << strOSDesc;
- if (lFreeMem > 0)
- *theApp->getLog() << ", Free Memory: " << lFreeMem << " MB";
*theApp->getLog() << ", wxWindows: " << wxVERSION_STRING;
#ifdef __TIMESTAMP__
*theApp->getLog() << ", Build Date: " << __TIMESTAMP__;
*theApp->getLog() << ", Release version";
#endif
#ifdef VERSION
- *theApp->getLog() << " " << VERSION;\r
-#elif defined(CTSIMVERSION)\r
- *theApp->getLog() << " " << CTSIMVERSION;\r
+ *theApp->getLog() << " " << VERSION;
+#elif defined(CTSIMVERSION)
+ *theApp->getLog() << " " << CTSIMVERSION;
#endif
*theApp->getLog() << "\n";
wxString msg = "CTSim\nThe Open Source Computed Tomography Simulator\n";
#ifdef VERSION
msg << "Version: " << VERSION << "\n\n";
-#elif defined(CTSIMVERSION)\r
- msg << "Version: " << CTSIMVERSION << "\n\n";\r
+#elif defined(CTSIMVERSION)
+ msg << "Version: " << CTSIMVERSION << "\n\n";
#endif
msg += "Author: Kevin Rosenberg <kevin@rosenberg.net>\nUsage: ctsim [files-to-open..] [--help]";
}
}
-\r
-// Create new documents\r
+
+// Create new documents
ProjectionFileDocument*
CTSimApp::newProjectionDoc()