X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=src%2Fctsim.h;h=27fb0ee904d16127a49bfd5971c3b2ff8090234a;hb=b81a8819c1122f63d0d20f559b7c75fe981c03be;hp=63316b4190bd697c3f18a5066508f277e6030469;hpb=14703961237e3bc231dbc06aeea7fdd921eee970;p=ctsim.git

diff --git a/src/ctsim.h b/src/ctsim.h
index 63316b4..27fb0ee 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.42 2001/02/06 06:57:46 kevin Exp $
+**  $Id: ctsim.h,v 1.48 2001/02/20 00:07:56 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
@@ -39,6 +39,9 @@
 #include "wx/wx.h"
 #endif
 #include "wx/config.h"
+#ifdef __WXMSW__
+#include "wx/msw/helpchm.h"
+#endif
 
 #ifdef MSVC
 #define CTSIM_MDI 1
@@ -70,9 +73,10 @@ class Graph3dFileDocument;
 #include "wx/help.h"
 #include "wx/html/helpctrl.h"
 #include "dlgezplot.h"
+#include "ctsim-map.h"
 
 
-#if defined(__WXMSW__)
+#if defined(__WXMSW__) || defined (MSVC)
 #define CTSIM_WINHELP   1
 #endif
 
@@ -108,7 +112,7 @@ private:
   bool m_bShuttingDown;
 
 #if CTSIM_WINHELP
-  wxWinHelpController      m_winHelp;
+  wxCHMHelpController      m_winHelp;
 #endif
   wxHtmlHelpController     m_htmlHelp;
   
@@ -122,7 +126,7 @@ public:
   void OnSize (wxSizeEvent& event);
 
 #if CTSIM_WINHELP
-  wxWinHelpController&   getWinHelpController()
+  wxCHMHelpController&   getWinHelpController()
   {return m_winHelp; }
 #endif
   wxHtmlHelpController&  getHtmlHelpController()
@@ -131,10 +135,12 @@ public:
   void showHelp (int commandID);
 
   void OnAbout (wxCommandEvent& event);
-  void OnHelpTopics (wxCommandEvent& event);
   void OnHelpContents (wxCommandEvent& event);
   void OnCreatePhantom (wxCommandEvent& event);
-  
+  void OnPreferences (wxCommandEvent& event);
+
+  void OnHelpButton (wxCommandEvent& event);
+
 #if defined(CTSIM_WINHELP) && (defined(DEBUG) || defined(_DEBUG))
   void OnHelpSecondary (wxCommandEvent& event);
 #endif
@@ -175,9 +181,12 @@ class wxDocManager;
 class CTSimApp: public wxApp
 {
 private:
-  enum { O_HELP, O_VERSION };
+  enum { O_HELP, O_PRINT, O_VERSION };
   static struct option ctsimOptions[];
-  
+
+  bool m_bAdvancedOptions;
+  bool m_bSetModifyNewDocs;
+
   wxDocManager* m_docManager;
   MainFrame* m_pFrame;
   wxConfig* m_pConfig;
@@ -194,7 +203,9 @@ private:
   TextFileDocument* m_pLogDoc;
 
   void usage (const char* program);
-  
+  void openConfig();
+  void closeConfig();
+
 public:
   CTSimApp();
   bool OnInit();
@@ -214,10 +225,14 @@ public:
   { return new EZPlotDialog (m_pFrame); }
   
   void getCompatibleImages (const ImageFileDocument* pIFDoc, std::vector<ImageFileDocument*>& vecIF);
-  
+  bool getAdvancedOptions() const { return m_bAdvancedOptions; }
+  void setAdvancedOptions (bool bAdv) { m_bAdvancedOptions = bAdv; }
+
   void setIconForFrame (wxFrame* pFrame);
   wxConfig* getConfig()
   { return m_pConfig; }
+  bool getAskDeleteNewDocs() const { return m_bSetModifyNewDocs; }
+  void setAskDeleteNewDocs(bool bAsk) { m_bSetModifyNewDocs = bAsk; }
 
   wxDocTemplate* getDocTemplImage() { return m_pDocTemplImage; }
   wxDocTemplate* getDocTemplProjection() { return m_pDocTemplProjection; }
@@ -247,7 +262,6 @@ enum {
     MAINMENU_WINDOW_BASE = 500,
     MAINMENU_HELP_ABOUT = 600,
     MAINMENU_HELP_CONTENTS,
-    MAINMENU_HELP_TOPICS,
 #if defined(CTSIM_WINHELP) && (defined(DEBUG) || defined(_DEBUG))
     MAINMENU_HELP_SECONDARY,
 #endif
@@ -255,6 +269,7 @@ enum {
     
     MAINMENU_FILE_CREATE_FILTER,
     MAINMENU_FILE_EXIT,
+    MAINMENU_FILE_PREFERENCES,
     
     PJMENU_FILE_PROPERTIES,
     PJMENU_RECONSTRUCT_FBP,