r7061: initial property settings

[ctsim.git] / src / ctsim.cpp

diff --git a/src/ctsim.cpp b/src/ctsim.cpp
index 6f6d6b1632e0194143e056a90f7844e4e97628b2..b3ce9e2d745c53d42af262b9233746f5eba1a8e5 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
 **
-**  $Id: ctsim.cpp,v 1.119 2002/06/27 03:19:23 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
@@ -69,7 +69,7 @@
 #endif
 #endif
 
-static const char* rcsindent = "$Id: ctsim.cpp,v 1.119 2002/06/27 03:19:23 kevin Exp $";
+static const char* rcsindent = "$Id$";
 
 struct option CTSimApp::ctsimOptions[] = 
 {
@@ -110,7 +110,11 @@ CTSimApp::OnInit()
   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;
     
@@ -118,8 +122,8 @@ CTSimApp::OnInit()
     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);
@@ -195,20 +199,20 @@ CTSimApp::OnInit()
   
   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"))
@@ -745,9 +749,9 @@ MainFrame::DoWindowMenu (int iMenuPosition, wxCommandEvent& event)
     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();
     }
   }
 }
@@ -1045,8 +1049,8 @@ MainFrame::OnAbout(wxCommandEvent& WXUNUSED(event) )
     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]";
     
@@ -1055,8 +1059,8 @@ MainFrame::OnAbout(wxCommandEvent& WXUNUSED(event) )
   }
 }
 
-\r
-// Create new documents\r
+
+// Create new documents
 
 ProjectionFileDocument*
 CTSimApp::newProjectionDoc()