r3851: *** empty log message ***

diff --git a/configure b/configure
index fd93db24ec92e9b72b89a6c407280fa06d3fea77..aa8a670e3b294977193bb9adefc01519ce318037 100755 (executable)
--- a/configure
+++ b/configure
@@ -1491,7 +1491,7 @@ fi
 
 PACKAGE=ctsim
 
-VERSION=3.7.0
+VERSION=4.0.0
 
 if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then
   { { echo "$as_me:$LINENO: error: source directory already configured; run \"make distclean\" there first" >&5
@@ -6044,7 +6044,7 @@ fi
 echo "$as_me:$LINENO: result: $ac_cv_lib_wx_mac_2_4_main" >&5
 echo "${ECHO_T}$ac_cv_lib_wx_mac_2_4_main" >&6
 if test $ac_cv_lib_wx_mac_2_4_main = yes; then
-  wxwin=true; wx_gtk=true;
+  wxwin=true; wx_mac=true;
 cat >>confdefs.h <<\_ACEOF
 #define HAVE_WXWINDOWS 1
 _ACEOF
@@ -9219,9 +9219,14 @@ _ACEOF
 echo "${ECHO_T}yes" >&6
   ctlib_graphics="$ctlib_graphics $X_BASIC_LIBS $X_TOOLKIT_LIBS"
   if test "$libgl" = "true" ; then
-    ctlib_graphics="$ctlib_graphics -lglut -lGL -lGLU"
+    # Removed "-lglut" for Mac OS X compilation
+    ctlib_graphics="$ctlib_graphics -lGL -lGLU"
     if test "$wxwin" = "true" ; then
-      ctlib_graphics="$ctlib_graphics -lwx_gtk_gl-2.4"
+      if  "$wx_gtk" ; then
+        ctlib_graphics="$ctlib_graphics -lwx_gtk_gl-2.4"
+      elif  "$wx_mac" ; then
+        ctlib_graphics="$ctlib_graphics -lwx_mac_gl-2.4"
+      fi
     fi
   fi
   if test "$wxwin" = "true" ; then
@@ -9435,12 +9440,12 @@ echo "${ECHO_T}Using efence" >&6
 fi
 
 if test "$wxwin" = "true" ; then
-  if test "$wx_gtk" = "true" ; then
+  if  "$wx_gtk" = "true"  ||  "$wx_mac" == "true"  ; then
     wxcflags=`$wxconfig --cflags`
     wxlibs=`$wxconfig --libs`
   else
        wxcflags="-D__WXMSW__ -D__WIN32__ -D__GNUWIN32__"
-   wxlibs="-lwx -lglui -ljpeg -lxpm -lzlib -ltiff"
+        wxlibs="-lwx -lglui -ljpeg -lxpm -lzlib -ltiff"
   fi
   CFLAGS="$CFLAGS -I../include $wxcflags"
   ctlib_graphics="$ctlib_graphics $wxlibs"

diff --git a/include/nographics.h b/include/nographics.h
index 1ab6d6b887257c56f0d7ee7b156575444f79f699..740cb31dd5cc09894e40f37ce5cc7f93d4985ee3 100644 (file)
--- a/include/nographics.h
+++ b/include/nographics.h
@@ -9,7 +9,7 @@
 **  This is part of the CTSim program
 **  Copyright (c) 1983-2001 Kevin Rosenberg
 **
-**  $Id: nographics.h,v 1.3 2001/03/30 19:32:53 kevin Exp $
+**  $Id: nographics.h,v 1.4 2003/01/23 23:35:58 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
@@ -30,10 +30,6 @@
 
 #include <cstdio>
 
-#ifdef __GNUG__
-#pragma interface "nographics.h"
-#endif
-
 #ifdef HAVE_WXWINDOWS
 class EZPlot;
 class wxWindow;

diff --git a/src/dialogs.cpp b/src/dialogs.cpp
index 03e1f7240aa69e4dd500aaa78f41098963aee7ee..4f4706afc9f3fa211c4dfb149f2cc9d61a2712cc 100644 (file)
--- a/src/dialogs.cpp
+++ b/src/dialogs.cpp
@@ -9,7 +9,7 @@
 **  This is part of the CTSim program
 **  Copyright (c) 1983-2001 Kevin Rosenberg
 **
-**  $Id: dialogs.cpp,v 1.57 2002/05/03 09:57:41 kevin Exp $
+**  $Id: dialogs.cpp,v 1.58 2003/01/23 23:35:58 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
@@ -25,10 +25,6 @@
 **  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 ******************************************************************************/
 
-#ifdef __GNUG__
-// #pragma implementation
-#endif
-
 #include "wx/wxprec.h"
 
 #ifndef WX_PRECOMP

diff --git a/src/dlgezplot.cpp b/src/dlgezplot.cpp
index 82f566afae212f50e1297173f6094a2850f646a8..446b51d468b794cca3272ffd0f2be8cfadcf17cd 100644 (file)
--- a/src/dlgezplot.cpp
+++ b/src/dlgezplot.cpp
@@ -9,7 +9,7 @@
 **  This is part of the CTSim program
 **  Copyright (c) 1983-2001 Kevin Rosenberg
 **
-**  $Id: dlgezplot.cpp,v 1.4 2001/03/29 21:25:50 kevin Exp $
+**  $Id: dlgezplot.cpp,v 1.5 2003/01/23 23:35:58 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
@@ -31,17 +31,9 @@
 
 #ifdef HAVE_WXWINDOWS
 
-#ifdef __GNUG__
-#pragma implementation "dlgezplot.h"
-#endif
-
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
-#ifdef __BORLANDC__
-#pragma hdrstop
-#endif
-
 #ifndef WX_PRECOMP
 #include "wx/utils.h"
 #include "wx/frame.h"

diff --git a/src/dlgezplot.h b/src/dlgezplot.h
index de25e64825521eeed769de1bbed166d275326438..27308f1df7b860b579b93472aac43077299a78a9 100644 (file)
--- a/src/dlgezplot.h
+++ b/src/dlgezplot.h
@@ -9,7 +9,7 @@
 **  This is part of the CTSim program
 **  Copyright (c) 1983-2001 Kevin Rosenberg
 **
-**  $Id: dlgezplot.h,v 1.4 2001/03/29 21:25:50 kevin Exp $
+**  $Id: dlgezplot.h,v 1.5 2003/01/23 23:35:58 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
@@ -28,10 +28,6 @@
 #ifndef __DLGEZPLOT_H_
 #define __DLGEZPLOT_H_
 
-#ifdef __GNUG__
-#pragma interface "dlgezplot.h"
-#endif
-
 #include "wx/setup.h"
 #include "wx/dialog.h"
 #include "wx/dcmemory.h"

diff --git a/src/dlgprojections.cpp b/src/dlgprojections.cpp
index d8f5deb9d2d58246aa57e91e9ed353933a3461c7..f630b62d5beb1ce5e26d7c69d8fa1b6c8b3ec620 100644 (file)
--- a/src/dlgprojections.cpp
+++ b/src/dlgprojections.cpp
@@ -9,7 +9,7 @@
  **  This is part of the CTSim program
  **  Copyright (c) 1983-2001 Kevin Rosenberg
  **
- **  $Id: dlgprojections.cpp,v 1.26 2002/05/30 06:27:46 kevin Exp $
+ **  $Id: dlgprojections.cpp,v 1.27 2003/01/23 23:35:58 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
@@ -25,10 +25,6 @@
  **  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  ******************************************************************************/
 
-#ifdef __GNUG__
-#pragma implementation "dlgprojections.h"
-#endif
-
 #include "wx/wxprec.h"
 
 #ifndef WX_PRECOMP

diff --git a/src/dlgprojections.h b/src/dlgprojections.h
index 89e75238a38581093a84c8328098a72bc994e494..468c4d9bd9d090024b953d9de2b567b3047b3a43 100644 (file)
--- a/src/dlgprojections.h
+++ b/src/dlgprojections.h
@@ -9,7 +9,7 @@
 **  This is part of the CTSim program
 **  Copyright (c) 1983-2001 Kevin Rosenberg
 **
-**  $Id: dlgprojections.h,v 1.7 2001/01/28 19:10:18 kevin Exp $
+**  $Id: dlgprojections.h,v 1.8 2003/01/23 23:35:58 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
@@ -28,10 +28,6 @@
 #ifndef __DLGPROJECTIONS_H_
 #define __DLGPROJECTIONS_H_
 
-#ifdef __GNUG__
-#pragma interface "dlgprojections.h"
-#endif
-
 #include "wx/setup.h"
 #include "wx/dialog.h"
 #include "wx/dcmemory.h"

diff --git a/src/dlgreconstruct.cpp b/src/dlgreconstruct.cpp
index ee420c457cdba5c7cb15a0ce7fc56002c52e1f99..7fad7fc85c5d270e93ab8195902649cbe4c459bb 100644 (file)
--- a/src/dlgreconstruct.cpp
+++ b/src/dlgreconstruct.cpp
@@ -9,7 +9,7 @@
 **  This is part of the CTSim program
 **  Copyright (c) 1983-2001 Kevin Rosenberg
 **
-**  $Id: dlgreconstruct.cpp,v 1.19 2002/05/30 06:27:46 kevin Exp $
+**  $Id: dlgreconstruct.cpp,v 1.20 2003/01/23 23:35:58 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
@@ -25,10 +25,6 @@
 **  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 ******************************************************************************/
 
-#ifdef __GNUG__
-#pragma implementation "dlgreconstruct.h"
-#endif
-
 #include "wx/wxprec.h"
 
 #include "wx/utils.h"

diff --git a/src/dlgreconstruct.h b/src/dlgreconstruct.h
index 6cf6ba3f3aabcb03d64dc2188941807c06188134..a57cfbd1194483cf56fc3da203666a6d22ca292b 100644 (file)
--- a/src/dlgreconstruct.h
+++ b/src/dlgreconstruct.h
@@ -9,7 +9,7 @@
 **  This is part of the CTSim program
 **  Copyright (c) 1983-2001 Kevin Rosenberg
 **
-**  $Id: dlgreconstruct.h,v 1.8 2001/01/28 19:10:18 kevin Exp $
+**  $Id: dlgreconstruct.h,v 1.9 2003/01/23 23:35:58 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
@@ -28,10 +28,6 @@
 #ifndef __DLGRECONSTRUCT_H_
 #define __DLGRECONSTRUCT_H_
 
-#ifdef __GNUG__
-#pragma interface "dlgreconstruct.h"
-#endif
-
 #include "wx/setup.h"
 #include "wx/dialog.h"
 #include "wx/dcmemory.h"

diff --git a/src/docs.cpp b/src/docs.cpp
index 0d838215f46d5730d00e647269db3fc3db46245c..672124dfd7a5b2237ce8212944c2fc800ef75773 100644 (file)
--- a/src/docs.cpp
+++ b/src/docs.cpp
@@ -9,7 +9,7 @@
 **  This is part of the CTSim program
 **  Copyright (c) 1983-2001 Kevin Rosenberg
 **
-**  $Id: docs.cpp,v 1.44 2003/01/23 08:03:42 kevin Exp $
+**  $Id: docs.cpp,v 1.45 2003/01/23 23:35:58 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
@@ -25,10 +25,6 @@
 **  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 ******************************************************************************/
 
-#ifdef __GNUG__
-// #pragma implementation
-#endif
-
 #include "wx/wxprec.h"
 
 #ifndef WX_PRECOMP

diff --git a/src/docs.h b/src/docs.h
index a3f49cf59913ca41568c87ece177a1af36571d7f..0b48f700857db25c773d7628b5b7cf47a8917cf6 100644 (file)
--- a/src/docs.h
+++ b/src/docs.h
@@ -9,7 +9,7 @@
 **  This is part of the CTSim program
 **  Copyright (c) 1983-2001 Kevin Rosenberg
 **
-**  $Id: docs.h,v 1.33 2002/06/06 22:50:24 kevin Exp $
+**  $Id: docs.h,v 1.34 2003/01/23 23:35:58 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
@@ -25,10 +25,6 @@
 **  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 ******************************************************************************/
 
-#ifdef __GNUG__
-// #pragma interface
-#endif
-
 #ifndef __DOCSH__
 #define __DOCSH__
 

diff --git a/src/graph3dview.cpp b/src/graph3dview.cpp
index 9c9b8fa699411e71228a3d6ad68c90d40d69a2dd..01e17bb843c966c5e02ed14932ff575d2e4e7d6c 100644 (file)
--- a/src/graph3dview.cpp
+++ b/src/graph3dview.cpp
@@ -9,7 +9,7 @@
 **  This is part of the CTSim program
 **  Copyright (c) 1983-2001 Kevin Rosenberg
 **
-**  $Id: graph3dview.cpp,v 1.31 2002/10/24 21:05:28 kevin Exp $
+**  $Id: graph3dview.cpp,v 1.32 2003/01/23 23:35:58 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
@@ -25,11 +25,6 @@
 **  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 ******************************************************************************/
 
-#ifdef __GNUG__
-#pragma implementation
-#pragma interface
-#endif
-
 #include "wx/wxprec.h"
 
 #ifndef WX_PRECOMP

diff --git a/src/views.h b/src/views.h
index 0fb0bd7d44d48a919fb24efd42a6e7adfac596c3..2ec4c878ced13250cc2cacc82f2255022f2dd7e7 100644 (file)
--- a/src/views.h
+++ b/src/views.h
@@ -9,7 +9,7 @@
 **  This is part of the CTSim program
 **  Copyright (c) 1983-2001 Kevin Rosenberg
 **
-**  $Id: views.h,v 1.58 2002/06/06 22:50:24 kevin Exp $
+**  $Id: views.h,v 1.59 2003/01/23 23:35:58 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
@@ -25,10 +25,6 @@
 **  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 ******************************************************************************/
 
-#ifdef __GNUG__
-// #pragma interface
-#endif
-
 #ifndef __VIEWSH__
 #define __VIEWSH__
 

diff --git a/tools/nographics.cpp b/tools/nographics.cpp
index 98062b25e075f11d68706e4f5ba04c3a88de9f87..60d1a9c65f5c7930ec4df8b8ee6fe08204680271 100644 (file)
--- a/tools/nographics.cpp
+++ b/tools/nographics.cpp
@@ -9,7 +9,7 @@
 **  This is part of the CTSim program
 **  Copyright (c) 1983-2001 Kevin Rosenberg
 **
-**  $Id: nographics.cpp,v 1.2 2001/03/30 19:32:53 kevin Exp $
+**  $Id: nographics.cpp,v 1.3 2003/01/23 23:35:58 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
@@ -29,11 +29,6 @@
 #include "config.h"
 #endif
 
-
-#ifdef __GNUG__
-#pragma implementation "nographics.h"
-#endif
-
 #include "nographics.h"