r506: *** empty log message ***

diff --git a/src/ctsim.cpp b/src/ctsim.cpp
index 0aa61a081838f57bfad6f323ce964220b8838868..7362e2366e9afd47ca3741c8b42c63ed617c35d6 100644 (file)
--- 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.67 2001/02/06 06:57:46 kevin Exp $
+**  $Id: ctsim.cpp,v 1.68 2001/02/08 22:38:23 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.67 2001/02/06 06:57:46 kevin Exp $";
+static const char* rcsindent = "$Id: ctsim.cpp,v 1.68 2001/02/08 22:38:23 kevin Exp $";
 
 struct option CTSimApp::ctsimOptions[] = 
 {
@@ -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,16 +177,6 @@ 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
@@ -205,6 +189,11 @@ CTSimApp::OnInit()
        if (! m_pFrame->getHtmlHelpController().Initialize(::wxGetCwd() + "/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;
 }
 

diff --git a/src/graph3dview.cpp b/src/graph3dview.cpp
index 9098e25faec12e0eb2eb4b37fc3f6680727ec96b..71ae71b77e79471b421d4b49874278fed0344bbc 100644 (file)
--- a/src/graph3dview.cpp
+++ b/src/graph3dview.cpp
@@ -9,7 +9,7 @@
 **  This is part of the CTSim program
 **  Copyright (c) 1983-2001 Kevin Rosenberg
 **
-**  $Id: graph3dview.cpp,v 1.11 2001/02/04 22:58:41 kevin Exp $
+**  $Id: graph3dview.cpp,v 1.12 2001/02/08 22:38:23 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
@@ -402,13 +402,14 @@ Graph3dFileView::OnSmooth (wxCommandEvent& event)
 void 
 Graph3dFileView::OnDraw (wxDC* dc)
 {
-#ifndef __WXMOTIF__
-  if (! m_pCanvas->GetContext()) return;
-#endif
-  
   if (! m_pCanvas)
     return;
   m_pCanvas->SetCurrent();
+
+#ifndef __WXMOTIF__
+  //  if (! m_pCanvas->GetContext()) return;
+#endif
+  
   Draw();
   std::ostringstream os;
   os << "Xangle=" << m_dXRotate << ", Yangle=" << m_dYRotate << ", Zangle=" << m_dZRotate;