r5231: Auto commit for Debian build

[ctsim.git] / src / ctsim.cpp

diff --git a/src/ctsim.cpp b/src/ctsim.cpp
index eea9e604afc462a078fa334cf802bb9d3f218e29..d8c1a079b753ab20b33b262cf8eeb74b773561a8 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.118 2002/06/20 11:55:44 kevin Exp $
+**  $Id: ctsim.cpp,v 1.121 2003/01/24 05:24:18 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
@@ -69,7 +69,7 @@
 #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: ctsim.cpp,v 1.121 2003/01/24 05:24:18 kevin Exp $";
 
 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;
     
@@ -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();
     }
   }
 }
@@ -1019,11 +1023,8 @@ MainFrame::OnImport (wxCommandEvent& WXUNUSED(event) )
 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__;
@@ -1034,9 +1035,9 @@ MainFrame::OnAbout(wxCommandEvent& WXUNUSED(event) )
   *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";