X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;ds=sidebyside;f=src%2Fctsim.cpp;h=556f431540186e5947390ea60dd60347dce97531;hb=92a0f68cb5d5062787b0cbb2664fafe2b2c9ae37;hp=95894c15a0b1f1eac2634e1e8068036a50c3a4d3;hpb=9324f74c9b1dcbb6aae655dbb24ca05284a144df;p=ctsim.git

diff --git a/src/ctsim.cpp b/src/ctsim.cpp
index 95894c1..556f431 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.16 2000/12/16 06:12:47 kevin Exp $
+**  $Id: ctsim.cpp,v 1.17 2000/12/17 22:30:34 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
@@ -61,7 +61,7 @@
 #endif
 #endif
 
-static const char* rcsindent = "$Id: ctsim.cpp,v 1.16 2000/12/16 06:12:47 kevin Exp $";
+static const char* rcsindent = "$Id: ctsim.cpp,v 1.17 2000/12/17 22:30:34 kevin Exp $";
 
 class CTSimApp* theApp = NULL;
 
@@ -103,7 +103,12 @@ CTSimApp::OnInit()
 
       switch (c) {
       case O_VERSION:
-		  std::cout << rcsindent << std::endl;
+		  std::cout << rcsindent << std::endl;
+#ifdef CTSIMVERSION
+		  std::cout << "Version: CTSIMVERSION" << std::endl;
+#elif defined(VERSION)
+		  std::cout << "Version: VERSION" << std::endl;
+#endif
 	  exit(0);
       case O_HELP:
       case '?':
@@ -250,8 +255,18 @@ MainFrame::MainFrame(wxDocManager *manager, wxFrame *frame, wxWindowID id, const
 
 void 
 MainFrame::OnAbout(wxCommandEvent& WXUNUSED(event) )
-{
-    wxMessageBox("CTSim\nThe Open Source Computed Tomography Simulator\nAuthor: Kevin Rosenberg <kevin@rosenberg.net>\nUsage: ctsim [files-to-open..] [--help]", "About CTSim", wxOK | wxICON_INFORMATION, this);
+{
+	wxString msg = "CTSim\nThe Open Source Computed Tomography Simulator\n";
+#ifdef CTSIMVERSION
+	msg += "Version ";
+	msg += CTSIMVERSION;
+	msg += "\n\n";
+#elif defined(VERSION)
+	msg << "Version: " <<  VERSION << "\n\n";
+#endif
+	msg += "Author: Kevin Rosenberg <kevin@rosenberg.net>\nUsage: ctsim [files-to-open..] [--help]";
+
+    wxMessageBox(msg, "About CTSim", wxOK | wxICON_INFORMATION, this);
 }
 
 void