r426: Updated online help, html help now working

[ctsim.git] / src / ctsim.h

diff --git a/src/ctsim.h b/src/ctsim.h
index e92b16bb5ee8ac40c8a87bdd20b9046a58b93308..90a0b29693bfb1cfe6acc8eef1dfce9caa048273 100644 (file)
--- a/src/ctsim.h
+++ b/src/ctsim.h
@@ -9,7 +9,7 @@
 **  This is part of the CTSim program
 **  Copyright (C) 1983-2000 Kevin Rosenberg
 **
-**  $Id: ctsim.h,v 1.25 2001/01/17 11:00:18 kevin Exp $
+**  $Id: ctsim.h,v 1.28 2001/01/20 02:25:45 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
@@ -59,6 +59,10 @@ class ImageFileDocument;
 #include "dlgezplot.h"
 
 
+#if defined(__WXMSW__)
+#define CTSIM_WINHELP   1
+#endif
+
 // Define a new frame for main window
 #if CTSIM_MDI
 class MainFrame: public wxMDIParentFrame
@@ -85,29 +89,32 @@ private:
   double m_dDefaultFilterInputScale;
   double m_dDefaultFilterOutputScale;
   
-#ifdef __WXMSW__
-  wxWinHelpController      m_help;
-#else
-  wxHtmlHelpController     m_help;
+#if CTSIM_WINHELP
+  wxWinHelpController      m_winHelp;
 #endif
-
+  wxHtmlHelpController     m_htmlHelp;
   
 public:
   MainFrame(wxDocManager *manager, wxFrame *frame, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, const long type);
   
-#ifdef __WXMSW__
-  wxWinHelpController&   getHelpController()
-  {return m_help; }
-#else
-  wxHtmlHelpController&  getHelpController()
-  { return m_help; }
+#if CTSIM_WINHELP
+  wxWinHelpController&   getWinHelpController()
+  {return m_winHelp; }
 #endif
+  wxHtmlHelpController&  getHtmlHelpController()
+  { return m_htmlHelp; }
+
   void showHelp (int commandID);
 
   void OnAbout (wxCommandEvent& event);
   void OnHelpTopics (wxCommandEvent& event);
+  void OnHelpContents (wxCommandEvent& event);
   void OnCreatePhantom (wxCommandEvent& event);
   
+#if defined(CTSIM_WINHELP) && (defined(DEBUG) || defined(_DEBUG))
+  void OnHelpSecondary (wxCommandEvent& event);
+#endif
+
   void OnCreateFilter (wxCommandEvent& event);
   void OnExit (wxCommandEvent& event);
   
@@ -184,11 +191,12 @@ DECLARE_APP(CTSimApp)
 
 extern class CTSimApp* theApp;
 
-
 enum {
-  MAINMENU_HELP_ABOUT = 500,
-    MAINMENU_WINDOW_BASE,
+    MAINMENU_WINDOW_BASE = 500,
+    MAINMENU_HELP_ABOUT = 600,
+    MAINMENU_HELP_CONTENTS,
     MAINMENU_HELP_TOPICS,
+    MAINMENU_HELP_SECONDARY,
     MAINMENU_FILE_CREATE_PHANTOM,
     
     MAINMENU_FILE_CREATE_FILTER,
@@ -246,8 +254,7 @@ enum {
     
     PLOTMENU_VIEW_SCALE_MINMAX,
     PLOTMENU_VIEW_SCALE_AUTO,
-    PLOTMENU_VIEW_SCALE_FULL,
-    
+    PLOTMENU_VIEW_SCALE_FULL,    
 };
 
 #endif