From 2ab93c569a4aa84314115e9a5543e8c6d2b43e2a Mon Sep 17 00:00:00 2001 From: "Kevin M. Rosenberg" Date: Fri, 30 Mar 2001 19:32:53 +0000 Subject: [PATCH] r650: *** empty log message *** --- include/nographics.h | 4 +++- src/views.h | 4 ++-- tools/Makefile.in | 12 ++++++------ tools/nographics.cpp | 4 ++-- 4 files changed, 13 insertions(+), 11 deletions(-) diff --git a/include/nographics.h b/include/nographics.h index 819fecc..1ab6d6b 100644 --- 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.2 2001/03/30 19:17:32 kevin Exp $ +** $Id: nographics.h,v 1.3 2001/03/30 19:32:53 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,6 +28,8 @@ #ifndef __NOGRAPHICS_H_ #define __NOGRAPHICS_H_ +#include + #ifdef __GNUG__ #pragma interface "nographics.h" #endif diff --git a/src/views.h b/src/views.h index 99551f2..058cb8b 100644 --- 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.53 2001/03/21 21:45:31 kevin Exp $ +** $Id: views.h,v 1.54 2001/03/30 19:31:17 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 @@ -115,7 +115,7 @@ public: void OnInverseFourier (wxCommandEvent& event); void OnShuffleNaturalToFourierOrder (wxCommandEvent& event); void OnShuffleFourierToNaturalOrder (wxCommandEvent& event); -#if wxUSE_GLCANVAS +#ifdef wxUSE_GLCANVAS void OnConvert3d (wxCommandEvent& event); #endif diff --git a/tools/Makefile.in b/tools/Makefile.in index 118d7ca..0743b0d 100644 --- a/tools/Makefile.in +++ b/tools/Makefile.in @@ -97,11 +97,11 @@ INCLUDES = @my_includes@ @HAVE_SGP_TRUE@SOURCE_DEPEND = ../include/ct.h ../libctsim/libctsim.a ../libctsupport/libctsupport.a ../libctgraphics/libctgraphics.a @HAVE_SGP_FALSE@SOURCE_DEPEND = ../include/ct.h ../libctsim/libctsim.a ../libctsupport/libctsupport.a -ctsimtext_SOURCES = ctsimtext.cpp if1.cpp if2.cpp ifinfo.cpp ifexport.cpp phm2if.cpp phm2pj.cpp pj2if.cpp pjinfo.cpp pjrec.cpp +ctsimtext_SOURCES = ctsimtext.cpp if1.cpp if2.cpp ifinfo.cpp ifexport.cpp phm2if.cpp phm2pj.cpp pj2if.cpp pjinfo.cpp pjrec.cpp nographics.cpp ctsimtext_LDADD = @ctlibs@ ctsimtext_DEPENDENCIES = $(SOURCE_DEPEND) -ctsimtext_lam_SOURCES = ctsimtext.cpp if1.cpp if2.cpp ifinfo.cpp ifexport.cpp phm2if.cpp phm2pj.cpp pj2if.cpp pjinfo.cpp pjrec.cpp mpiworld.cpp +ctsimtext_lam_SOURCES = ctsimtext.cpp if1.cpp if2.cpp ifinfo.cpp ifexport.cpp phm2if.cpp phm2pj.cpp pj2if.cpp pjinfo.cpp pjrec.cpp nographics.cpp mpiworld.cpp ctsimtext_lam_LDADD = @ctlamlibs@ @USE_LAM_TRUE@CC_LAM = $(lamdir)/bin/hcp @@ -119,10 +119,10 @@ CPPFLAGS = @CPPFLAGS@ LDFLAGS = @LDFLAGS@ LIBS = @LIBS@ ctsimtext_lam_OBJECTS = ctsimtext.o if1.o if2.o ifinfo.o ifexport.o \ -phm2if.o phm2pj.o pj2if.o pjinfo.o pjrec.o mpiworld.o +phm2if.o phm2pj.o pj2if.o pjinfo.o pjrec.o nographics.o mpiworld.o ctsimtext_lam_LDFLAGS = ctsimtext_OBJECTS = ctsimtext.o if1.o if2.o ifinfo.o ifexport.o \ -phm2if.o phm2pj.o pj2if.o pjinfo.o pjrec.o +phm2if.o phm2pj.o pj2if.o pjinfo.o pjrec.o nographics.o ctsimtext_LDFLAGS = SCRIPTS = $(bin_SCRIPTS) @@ -138,8 +138,8 @@ DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) TAR = gtar GZIP_ENV = --best DEP_FILES = .deps/ctsimtext.P .deps/if1.P .deps/if2.P .deps/ifexport.P \ -.deps/ifinfo.P .deps/mpiworld.P .deps/phm2if.P .deps/phm2pj.P \ -.deps/pj2if.P .deps/pjinfo.P .deps/pjrec.P +.deps/ifinfo.P .deps/mpiworld.P .deps/nographics.P .deps/phm2if.P \ +.deps/phm2pj.P .deps/pj2if.P .deps/pjinfo.P .deps/pjrec.P SOURCES = $(ctsimtext_lam_SOURCES) $(ctsimtext_SOURCES) OBJECTS = $(ctsimtext_lam_OBJECTS) $(ctsimtext_OBJECTS) diff --git a/tools/nographics.cpp b/tools/nographics.cpp index b8940a5..98062b2 100644 --- 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.1 2001/03/29 21:25:50 kevin Exp $ +** $Id: nographics.cpp,v 1.2 2001/03/30 19:32:53 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 @@ -48,5 +48,5 @@ EZPlotDialog::getEZPlot() int EZPlotDialog::ShowModal() { return 0; } -f + #endif -- 2.34.1