X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=src%2Fctsim.cpp;h=95ca5e7c4c8ab2f78952dc8b27c77b1c3cdd945a;hb=cdf102a192b78dd5a7708d449661ff247309be7e;hp=c024c6ed8706b9833e7de4b74151a07899613091;hpb=c6f2bb52c598291d61d31a3eba54b84ebb338580;p=ctsim.git

diff --git a/src/ctsim.cpp b/src/ctsim.cpp
index c024c6e..95ca5e7 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.66 2001/02/02 23:04:06 kevin Exp $
+**  $Id: ctsim.cpp,v 1.71 2001/02/09 21:42:03 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
@@ -70,7 +70,7 @@
 #endif
 #endif
 
-static const char* rcsindent = "$Id: ctsim.cpp,v 1.66 2001/02/02 23:04:06 kevin Exp $";
+static const char* rcsindent = "$Id: ctsim.cpp,v 1.71 2001/02/09 21:42:03 kevin Exp $";
 
 struct option CTSimApp::ctsimOptions[] = 
 {
@@ -102,7 +102,7 @@ CTSimApp::OnInit()
 	setpriority (PRIO_PROCESS, 0, 15);  // set to low scheduling priority
 #endif
 	
-	m_pConfig = new wxConfig("ctsim");
+	m_pConfig = new wxConfig("ctsim", _T(""), ".ctsim", "", wxCONFIG_USE_LOCAL_FILE);
 	wxConfigBase::Set(m_pConfig);
 	
 	g_bRunningWXWindows = true;
@@ -161,16 +161,10 @@ CTSimApp::OnInit()
 	m_pFrame->Show(true);  
 	SetTopWindow (m_pFrame);
 	
-	for (int i = optind + 1; i <= argc; i++) {
-		wxString filename = argv [i - 1];
-		m_docManager->CreateDocument (filename, wxDOC_SILENT);
-	}
-	
 	if (m_pConfig)
 		m_docManager->FileHistoryLoad(*m_pConfig);
 	
 #ifdef CTSIM_MDI
-#if 1
 	m_pLogDoc = newTextDoc();
 	if (m_pLogDoc) {
 		m_pLog = m_pLogDoc->getTextCtrl();
@@ -183,28 +177,27 @@ CTSimApp::OnInit()
 		m_pLogDoc->getView()->getFrame()->SetSize (0, ySize - yLogSize, xSize, yLogSize);
 		m_pLogDoc->getView()->getFrame()->Show (true);
 	} else
-#else
-//    wxMDIChildFrame *pLogFrame = new wxMDIChildFrame (m_pFrame, -1, "Log", wxDefaultPosition, wxSize(0,0), wxTHICK_FRAME, "Log");
-    m_pLog = new wxTextCtrl(m_pFrame->GetClientWindow(), -1, "", wxPoint(0,0), wxSize(0,0), wxTE_MULTILINE | wxTE_READONLY);
-		int xSize, ySize;
-		m_pFrame->GetClientSize(&xSize, &ySize);
-		int yLogSize = ySize / 5;
-		m_pLog->SetSize (0, ySize - yLogSize, xSize, yLogSize);
-		m_pLog->Show (true);
-    m_pLog->Enable (true);
-#endif
 #else
 		m_pLog = new wxTextCtrl (m_pFrame, -1, "Log Window\n", wxPoint(0, 0), wxSize(0,0), wxTE_MULTILINE | wxTE_READONLY);
 #endif
 	wxLog::SetActiveTarget (new wxLogTextCtrl(m_pLog));
-	
+
 #ifdef CTSIM_WINHELP
 	if (! m_pFrame->getWinHelpController().Initialize("ctsim"))
 		*m_pLog << "Cannot initialize the Windows Help system" << "\n";
 #endif
-	if (! m_pFrame->getHtmlHelpController().Initialize(::wxGetCwd() + "/ctsim"))
+	wxString helpDir;
+	if (! m_pConfig->Read("HelpDir", &helpDir))
+		helpDir = ::wxGetCwd();
+	if (! m_pFrame->getHtmlHelpController().Initialize(helpDir + "/ctsim") ||
+		! m_pFrame->getHtmlHelpController().Initialize("/usr/local/man/ctsim"))
 		*m_pLog << "Cannot initialize the HTML Help system" << "\n";
 	
+	for (int i = optind + 1; i <= argc; i++) {
+		wxString filename = argv [i - 1];
+		m_docManager->CreateDocument (filename, wxDOC_SILENT);
+	}
+	
 	return true;
 }
 
@@ -232,6 +225,8 @@ CTSimApp::usage(const char* program)
 int
 CTSimApp::OnExit()
 {
+	delete m_pConfig;
+
 #ifdef HAVE_DMALLOC
 	dmalloc_shutdown();
 #endif
@@ -329,12 +324,12 @@ MainFrame::MainFrame(wxDocManager *manager, wxFrame *frame, wxWindowID id, const
 #endif
 	
 	wxMenu* help_menu = new wxMenu;
-	help_menu->Append(MAINMENU_HELP_CONTENTS, "&Contents\tF1");
-	help_menu->Append(MAINMENU_HELP_TOPICS, "&Topics\tCtrl-T");
+	help_menu->Append (MAINMENU_HELP_CONTENTS, "&Contents\tF1");
+	help_menu->Append (MAINMENU_HELP_TOPICS, "&Topics\tCtrl-T");
 #if defined(CTSIM_WINHELP) && (defined(DEBUG) || defined(_DEBUG))
-	help_menu->Append(MAINMENU_HELP_SECONDARY, "&Secondary Help");
+	help_menu->Append (MAINMENU_HELP_SECONDARY, "&Secondary Help");
 #endif
-	help_menu->Append(MAINMENU_HELP_ABOUT, "&About");
+	help_menu->Append (MAINMENU_HELP_ABOUT, "&About");
 	
 	wxMenuBar* menu_bar = new wxMenuBar;