X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=src%2Fctsim.h;h=a242109fa1a0ac05bdbae41d5af66dddc241d16b;hb=a5d437cb4228b07f8c005eaca497c317b8c19d14;hp=b6690a0040cc30f53f9cd7451ec117b92b94bfb7;hpb=23a88a68dc4365314d21b832740bfaf24831c643;p=ctsim.git

diff --git a/src/ctsim.h b/src/ctsim.h
index b6690a0..a242109 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.27 2001/01/18 18:09:35 kevin Exp $
+**  $Id: ctsim.h,v 1.30 2001/01/20 17:43:41 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
@@ -35,10 +35,22 @@
 #include <dmalloc.h>
 #endif
 
+#ifndef WX_PRECOMP
+#include "wx/wx.h"
+#endif
+#include "wx/config.h"
+
 #ifdef MSVC
-// #define CTSIM_MDI 1
+#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!
+#endif
+#ifdef CTSIM_MDI
+#include "wx/docmdi.h"
+#endif
 
 class wxMenu;
 class wxDocument;
@@ -47,10 +59,6 @@ class ImageFileDocument;
 
 #include <vector>
 
-#ifndef WX_PRECOMP
-#include "wx/wx.h"
-#endif
-
 #include "wx/docview.h"
 #include "wx/textctrl.h"
 #include "wx/menu.h"
@@ -59,16 +67,19 @@ 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
+class MainFrame: public wxDocMDIParentFrame
 #else
 class MainFrame: public wxDocParentFrame
 #endif
 {
   DECLARE_CLASS(MainFrame)
 private:
-  wxTextCtrl* m_pLog;
   wxMenu* m_pWindowMenu;
   
   enum { MAX_WINDOW_MENUITEMS = 20 };
@@ -85,23 +96,27 @@ 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; }
+  ~MainFrame();
+
+#ifdef CTSIM_CUSTOM_MRU
+  void OnMRUFile (wxCommandEvent& event);
+#endif
+  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);
@@ -109,14 +124,15 @@ public:
   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);
   
   void OnUpdateUI (wxUpdateUIEvent& event);
   
-  wxTextCtrl* getLog() 
-  { return m_pLog; }
-  
   void OnWindowMenu0 (wxCommandEvent& event);
   void OnWindowMenu1 (wxCommandEvent& event);
   void OnWindowMenu2 (wxCommandEvent& event);
@@ -147,14 +163,28 @@ public:
 class wxDocManager;
 class CTSimApp: public wxApp
 {
+private:
+  wxDocManager* m_docManager;
+  MainFrame* m_pFrame;
+  wxConfig* m_pConfig;
+  
+  void usage (const char* program);
+  
+  static struct option ctsimOptions[];
+  
+  enum { O_HELP, O_VERSION };
+  wxTextCtrl* m_pLog;
+
 public:
   CTSimApp();
   bool OnInit();
   int OnExit();
   MainFrame* getMainFrame() const
   { return m_pFrame; }
+
   wxTextCtrl* getLog()
-  { return m_pFrame->getLog(); }
+  { return m_pLog; }
+
   wxDocManager* getDocManager() 
   { return m_docManager; }
   
@@ -169,16 +199,8 @@ public:
   { return true; }
   
   void setIconForFrame (wxFrame* pFrame);
-
-private:
-  wxDocManager* m_docManager;
-  MainFrame* m_pFrame;
-  
-  void usage (const char* program);
-  
-  static struct option ctsimOptions[];
-  
-  enum { O_HELP, O_VERSION };
+  wxConfig* getConfig()
+  { return m_pConfig; }
 };
 
 DECLARE_APP(CTSimApp)
@@ -190,6 +212,7 @@ enum {
     MAINMENU_HELP_ABOUT = 600,
     MAINMENU_HELP_CONTENTS,
     MAINMENU_HELP_TOPICS,
+    MAINMENU_HELP_SECONDARY,
     MAINMENU_FILE_CREATE_PHANTOM,
     
     MAINMENU_FILE_CREATE_FILTER,