X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=src%2Fctsim.h;h=89026e547098cb36474e695cc164751696a9a20c;hb=87748a0c3854cd5b2660baad217cf7071cb24be2;hp=4b992da8479d9f48c5a418030b422a8e22a24401;hpb=3ea498d51ce4597e9649cd21f155b51175ea0bea;p=ctsim.git diff --git a/src/ctsim.h b/src/ctsim.h index 4b992da..89026e5 100644 --- a/src/ctsim.h +++ b/src/ctsim.h @@ -9,7 +9,7 @@ ** This is part of the CTSim program ** Copyright (c) 1983-2001 Kevin Rosenberg ** -** $Id: ctsim.h,v 1.61 2001/03/21 21:45:31 kevin Exp $ +** $Id: ctsim.h,v 1.65 2002/06/20 11:55:44 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,7 +24,7 @@ ** along with this program; if not, write to the Free Software ** Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ******************************************************************************/ - + #ifndef __CTSIMH__ #define __CTSIMH__ @@ -37,9 +37,6 @@ #ifdef MSVC #define HAVE_WXTHREADS 1 -#else -#undef HAVE_WXTHREADS -#define HAVE_WXTHREADS 1 #endif #ifndef WX_PRECOMP @@ -53,7 +50,6 @@ #ifdef MSVC #define CTSIM_MDI 1 #endif -#define CTSIM_CUSTOM_MRU 1 #if defined(CTSIM_MDI) && !wxUSE_MDI_ARCHITECTURE #error You must set wxUSE_MDI_ARCHITECTURE to 1 in setup.h! @@ -86,7 +82,7 @@ class Graph3dFileDocument; #if defined(__WXMSW__) || defined (MSVC) -#define CTSIM_WINHELP 1 +// #define CTSIM_WINHELP 1 #endif // Define a new frame for main window @@ -130,9 +126,6 @@ public: MainFrame(wxDocManager *manager, wxFrame *frame, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, const long type); virtual ~MainFrame(); -#ifdef CTSIM_CUSTOM_MRU - void OnMRUFile (wxCommandEvent& event); -#endif void OnSize (wxSizeEvent& event); #if CTSIM_WINHELP @@ -286,7 +279,6 @@ public: }; DECLARE_APP(CTSimApp) - extern class CTSimApp* theApp; enum { @@ -341,7 +333,7 @@ enum { IFMENU_IMAGE_SUBTRACT, IFMENU_IMAGE_MULTIPLY, IFMENU_IMAGE_DIVIDE, -#if wxUSE_GLCANVAS +#ifdef wxUSE_GLCANVAS IFMENU_IMAGE_CONVERT3D, #endif