X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=src%2Fctsim.cpp;h=246d2d1bdf4ff603f07a86acccb73f6b95864774;hb=17f20398d8bb0e4b97b5884b999bbe8d58c5254f;hp=8cd618ef323435f2f507c4ece4390b99eaa458ae;hpb=befd71a7157339b52a0c40359518d5276b25d127;p=ctsim.git

diff --git a/src/ctsim.cpp b/src/ctsim.cpp
index 8cd618e..246d2d1 100644
--- a/src/ctsim.cpp
+++ b/src/ctsim.cpp
@@ -9,7 +9,7 @@
 **  This is part of the CTSim program
 **  Copyright (C) 1983-2000 Kevin Rosenberg
 **
-**  $Id: ctsim.cpp,v 1.75 2001/02/11 21:57:08 kevin Exp $
+**  $Id: ctsim.cpp,v 1.78 2001/02/16 00:28: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
@@ -43,7 +43,9 @@
 #include "wx/image.h"
 #include "wx/filesys.h"
 #include "wx/fs_zip.h"
+#ifdef __WXMSW__
 #include "wx/msw/helpchm.h"
+#endif
 
 #if !wxUSE_DOC_VIEW_ARCHITECTURE
 #error You must set wxUSE_DOC_VIEW_ARCHITECTURE to 1 in setup.h!
@@ -52,7 +54,6 @@
 
 #include "ct.h"
 #include "ctsim.h"
-#include "ctsim-map.h"
 #include "docs.h"
 #include "views.h"
 #include "dialogs.h"
@@ -71,7 +72,7 @@
 #endif
 #endif
 
-static const char* rcsindent = "$Id: ctsim.cpp,v 1.75 2001/02/11 21:57:08 kevin Exp $";
+static const char* rcsindent = "$Id: ctsim.cpp,v 1.78 2001/02/16 00:28:41 kevin Exp $";
 
 struct option CTSimApp::ctsimOptions[] = 
 {
@@ -291,6 +292,17 @@ EVT_MENU(MAINMENU_FILE_PREFERENCES, MainFrame::OnPreferences)
 EVT_MENU(MAINMENU_HELP_ABOUT, MainFrame::OnAbout)
 EVT_MENU(MAINMENU_HELP_CONTENTS, MainFrame::OnHelpContents)
 EVT_MENU(MAINMENU_HELP_TOPICS, MainFrame::OnHelpTopics)
+EVT_BUTTON(IDH_DLG_RASTERIZE, MainFrame::OnHelpButton)
+EVT_BUTTON(IDH_DLG_PROJECTIONS, MainFrame::OnHelpButton)
+EVT_BUTTON(IDH_DLG_RECONSTRUCTION, MainFrame::OnHelpButton)
+EVT_BUTTON(IDH_DLG_FILTER, MainFrame::OnHelpButton)
+EVT_BUTTON(IDH_DLG_MINMAX, MainFrame::OnHelpButton)
+EVT_BUTTON(IDH_DLG_EXPORT, MainFrame::OnHelpButton)
+EVT_BUTTON(IDH_DLG_PHANTOM, MainFrame::OnHelpButton)
+EVT_BUTTON(IDH_DLG_COMPARISON, MainFrame::OnHelpButton)
+EVT_BUTTON(IDH_DLG_PREFERENCES, MainFrame::OnHelpButton)
+EVT_BUTTON(IDH_DLG_POLAR, MainFrame::OnHelpButton)
+EVT_BUTTON(IDH_DLG_AUTOSCALE, MainFrame::OnHelpButton)
 EVT_SIZE(MainFrame::OnSize)
 
 #if defined(CTSIM_WINHELP) && (defined(DEBUG) || defined(_DEBUG))
@@ -343,7 +355,7 @@ MainFrame::MainFrame(wxDocManager *manager, wxFrame *frame, wxWindowID id, const
 	file_menu->Append(wxID_OPEN, "&Open...\tCtrl-O");
 	
 	file_menu->AppendSeparator();
-  file_menu->Append (MAINMENU_FILE_PREFERENCES, "Pr&eferences...");
+  file_menu->Append (MAINMENU_FILE_PREFERENCES, "Prefere&nces...");
 	file_menu->Append(MAINMENU_FILE_EXIT, "E&xit");
 	
 	//  history of files visited
@@ -537,6 +549,12 @@ MainFrame::OnHelpContents (wxCommandEvent& event)
 	showHelp (event.GetId());
 }
 
+void 
+MainFrame::OnHelpButton (wxCommandEvent& event)
+{
+	showHelp (event.GetId());
+}
+
 #if defined(CTSIM_WINHELP) && (defined(DEBUG) || defined(_DEBUG))
 void
 MainFrame::OnHelpSecondary (wxCommandEvent& event)
@@ -560,14 +578,18 @@ MainFrame::showHelp (int commandID)
 		
 	case MAINMENU_HELP_TOPICS:
 #ifdef CTSIM_WINHELP
-		m_winHelp.DisplaySection (introduction);
+		m_winHelp.DisplaySection (IDH_INTRODUCTION);
 #else
 		m_htmlHelp.DisplayIndex();
 #endif
 		break;
 		
 	default:
-		*theApp->getLog() << "Unknown help command # " << commandID << "\n";
+#ifdef CTSIM_WINHELP
+    m_winHelp.DisplaySection (commandID);
+#else
+    m_htmlHelp.DisplaySection (commandID);
+#endif
 		break;
 	}
 }