X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=src%2Fctsim.h;h=90a0b29693bfb1cfe6acc8eef1dfce9caa048273;hb=0914a8f418770303edfc8d00d68d53061cf01c93;hp=b6690a0040cc30f53f9cd7451ec117b92b94bfb7;hpb=23a88a68dc4365314d21b832740bfaf24831c643;p=ctsim.git diff --git a/src/ctsim.h b/src/ctsim.h index b6690a0..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.27 2001/01/18 18:09: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 @@ -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,23 +89,21 @@ 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); @@ -109,6 +111,10 @@ 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); @@ -190,6 +196,7 @@ enum { MAINMENU_HELP_ABOUT = 600, MAINMENU_HELP_CONTENTS, MAINMENU_HELP_TOPICS, + MAINMENU_HELP_SECONDARY, MAINMENU_FILE_CREATE_PHANTOM, MAINMENU_FILE_CREATE_FILTER,