X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=src%2Fctsim.h;h=90a0b29693bfb1cfe6acc8eef1dfce9caa048273;hb=0914a8f418770303edfc8d00d68d53061cf01c93;hp=6edcfcf8b9564fc6d538bdc8f2ba5b6db415d806;hpb=c70eb596eeeeda21f872065d9e11a67996394626;p=ctsim.git

diff --git a/src/ctsim.h b/src/ctsim.h
index 6edcfcf..90a0b29 100644
--- 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.23 2001/01/13 03:51:35 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
@@ -54,9 +54,15 @@ class ImageFileDocument;
 #include "wx/docview.h"
 #include "wx/textctrl.h"
 #include "wx/menu.h"
+#include "wx/help.h"
+#include "wx/html/helpctrl.h"
 #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
@@ -83,14 +89,32 @@ private:
   double m_dDefaultFilterInputScale;
   double m_dDefaultFilterOutputScale;
   
+#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);
   
+#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);
   
@@ -150,6 +174,8 @@ public:
   bool getSetModifyNewDocs() const
   { return true; }
   
+  void setIconForFrame (wxFrame* pFrame);
+
 private:
   wxDocManager* m_docManager;
   MainFrame* m_pFrame;
@@ -165,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,
@@ -227,8 +254,7 @@ enum {
     
     PLOTMENU_VIEW_SCALE_MINMAX,
     PLOTMENU_VIEW_SCALE_AUTO,
-    PLOTMENU_VIEW_SCALE_FULL,
-    
+    PLOTMENU_VIEW_SCALE_FULL,    
 };
 
 #endif