X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=src%2Fctsim.cpp;h=95894c15a0b1f1eac2634e1e8068036a50c3a4d3;hb=dc034c9d0b7d9c3874a324a4c2c189a02945adc8;hp=cdb4cafb6e945a419749ddcf97a52e7876bb38a6;hpb=98f894fe74f1a532f5e6d69cca0404d9a58893e7;p=ctsim.git

diff --git a/src/ctsim.cpp b/src/ctsim.cpp
index cdb4caf..95894c1 100644
--- a/src/ctsim.cpp
+++ b/src/ctsim.cpp
@@ -9,7 +9,7 @@
 **  This is part of the CTSim program
 **  Copyright (C) 1983-2000 Kevin Rosenberg
 **
-**  $Id: ctsim.cpp,v 1.12 2000/09/07 01:28:33 kevin Exp $
+**  $Id: ctsim.cpp,v 1.16 2000/12/16 06:12: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
@@ -24,36 +24,44 @@
 **  along with this program; if not, write to the Free Software
 **  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 ******************************************************************************/
-
-// For compilers that support precompilation, includes "wx/wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-#pragma hdrstop
-#endif
-
-#ifndef WX_PRECOMP
-#include "wx/wx.h"
-#endif
-
-#if !wxUSE_DOC_VIEW_ARCHITECTURE
-#error You must set wxUSE_DOC_VIEW_ARCHITECTURE to 1 in setup.h!
-#endif
-
-#include "wx/docview.h"
+
+
+// For compilers that support precompilation, includes "wx/wx.h".
+#include "wx/wxprec.h"
+
+#ifdef __BORLANDC__
+#pragma hdrstop
+#endif
+
+#ifndef WX_PRECOMP
+#include "wx/wx.h"
+#endif
+
+#if !wxUSE_DOC_VIEW_ARCHITECTURE
+#error You must set wxUSE_DOC_VIEW_ARCHITECTURE to 1 in setup.h!
+#endif
+
+#include "ct.h"
 #include "ctsim.h"
 #include "docs.h"
 #include "views.h"
 #include "dialogs.h"
-#include "ctsupport.h"
+
 #if defined(HAVE_CONFIG_H)
 #include "config.h"
-#endif
+#endif
+
 #if defined(HAVE_GETOPT_H) || defined(HAVE_GETOPT_LONG)
-#include <getopt.h>
+#ifdef MSVC
+#define __STDC__ 1
+#endif
+#include "getopt.h"
+#ifdef MSVC
+#undef __STDC__
 #endif
-
-static const char* rcsindent = "$Id: ctsim.cpp,v 1.12 2000/09/07 01:28:33 kevin Exp $";
+#endif
+
+static const char* rcsindent = "$Id: ctsim.cpp,v 1.16 2000/12/16 06:12:47 kevin Exp $";
 
 class CTSimApp* theApp = NULL;
 
@@ -95,7 +103,7 @@ CTSimApp::OnInit()
 
       switch (c) {
       case O_VERSION:
-	  cout << rcsindent << endl;
+		  std::cout << rcsindent << std::endl;
 	  exit(0);
       case O_HELP:
       case '?':
@@ -134,11 +142,11 @@ CTSimApp::OnInit()
 void
 CTSimApp::usage(const char* program)
 {
-    cout << "usage: " << fileBasename(program) << " [files-to-open...] [OPTIONS]\n";
-    cout << "Computed Tomography Simulator (Graphical Shell)\n";
-    cout << "\n";
-    cout << "  --version Display version\n";
-    cout << "  --help    Display this help message\n";
+	std::cout << "usage: " << fileBasename(program) << " [files-to-open...] [OPTIONS]\n";
+	std::cout << "Computed Tomography Simulator (Graphical Shell)\n";
+	std::cout << "\n";
+	std::cout << "  --version Display version\n";
+	std::cout << "  --help    Display this help message\n";
 }
 
 int
@@ -281,7 +289,7 @@ MainFrame::OnUpdateUI (wxUpdateUIEvent& rEvent)
   while (iPos < MAX_WINDOW_MENUITEMS && pNode != NULL) {
     wxDocument* pDoc = static_cast<wxDocument*>(pNode->GetData());
     wxString strFilename = pDoc->GetFilename();
-    m_apWindowMenuItems[iPos]->SetName (strFilename);
+    static_cast<wxMenuItemBase*>(m_apWindowMenuItems[iPos])->SetName (strFilename);
     m_apWindowMenuData[iPos] = pDoc;
     m_pWindowMenu->Enable (MAINMENU_WINDOW_BASE+iPos, true);
     iPos++;
@@ -289,7 +297,7 @@ MainFrame::OnUpdateUI (wxUpdateUIEvent& rEvent)
   }
   for (int i = iPos; i < MAX_WINDOW_MENUITEMS; i++) {
     m_pWindowMenu->Enable (MAINMENU_WINDOW_BASE+i, false);
-    m_apWindowMenuItems[i]->SetName (wxString("<Empty>"));
+    static_cast<wxMenuItemBase*>(m_apWindowMenuItems[i])->SetName (wxString("<Empty>"));
     m_apWindowMenuData[i] = NULL;
   }