X-Git-Url: http://git.kpe.io/?p=ctsim.git;a=blobdiff_plain;f=src%2Fctsim.h;h=103f08aa195d1113ef91eeaf813fcf52f18414b0;hp=e92b16bb5ee8ac40c8a87bdd20b9046a58b93308;hb=01ed72399d433ce45a0195f8acaea349a421461e;hpb=ec73e3f9aa11aea5ba6a4255489fdca63d2b4990

diff --git a/src/ctsim.h b/src/ctsim.h
index e92b16b..103f08a 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.25 2001/01/17 11:00:18 kevin Exp $
+**  $Id: ctsim.h,v 1.29 2001/01/20 08:10:33 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
@@ -36,9 +36,15 @@
 #endif
 
 #ifdef MSVC
-// #define CTSIM_MDI 1
+#define CTSIM_MDI 1
 #endif
 
+#if defined(CTSIM_MDI) && !wxUSE_MDI_ARCHITECTURE
+#error You must set wxUSE_MDI_ARCHITECTURE to 1 in setup.h!
+#endif
+#ifdef CTSIM_MDI
+#include "wx/docmdi.h"
+#endif
 
 class wxMenu;
 class wxDocument;
@@ -59,6 +65,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 +95,36 @@ 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; }
+
+  void OnMRUFile (wxCommandEvent& event);
+
+  void OnSize (wxSizeEvent& event);
+
+#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);
   
@@ -115,7 +132,7 @@ public:
   
   wxTextCtrl* getLog() 
   { return m_pLog; }
-  
+
   void OnWindowMenu0 (wxCommandEvent& event);
   void OnWindowMenu1 (wxCommandEvent& event);
   void OnWindowMenu2 (wxCommandEvent& event);
@@ -152,8 +169,10 @@ public:
   int OnExit();
   MainFrame* getMainFrame() const
   { return m_pFrame; }
+
   wxTextCtrl* getLog()
   { return m_pFrame->getLog(); }
+
   wxDocManager* getDocManager() 
   { return m_docManager; }
   
@@ -184,11 +203,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 +266,7 @@ enum {
     
     PLOTMENU_VIEW_SCALE_MINMAX,
     PLOTMENU_VIEW_SCALE_AUTO,
-    PLOTMENU_VIEW_SCALE_FULL,
-    
+    PLOTMENU_VIEW_SCALE_FULL,    
 };
 
 #endif