X-Git-Url: http://git.kpe.io/?p=ctsim.git;a=blobdiff_plain;f=libctsupport%2Fsyserror.cpp;h=1b9aff402c8513575e9492bb8f877b2eb48484a7;hp=679ecb43d2f873540da84d66106870ade400bf46;hb=7f8f356151b0c8db0dbbf1c1896cc22630d6c774;hpb=7ae47cb0ff0a16d1c36797576155263434cc73ff

diff --git a/libctsupport/syserror.cpp b/libctsupport/syserror.cpp
index 679ecb4..1b9aff4 100644
--- a/libctsupport/syserror.cpp
+++ b/libctsupport/syserror.cpp
@@ -2,7 +2,7 @@
 **  This is part of the CTSim program
 **  Copyright (C) 1983-2000 Kevin Rosenberg
 **
-**  $Id: syserror.cpp,v 1.11 2000/12/29 20:11:42 kevin Exp $
+**  $Id: syserror.cpp,v 1.14 2001/01/12 16:41:56 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
@@ -22,7 +22,7 @@
 #include <exception>
 #include <stdexcept>
 #include <stdarg.h>
-#include <ctype.h>
+#include <ctype.h>
 #include <string>
 #include "ct.h"
 
@@ -39,22 +39,27 @@
 */
 
 static int s_reportErrorLevel = ERR_WARNING;	// Set error reporting level 
-
+
+#ifdef HAVE_WXWINDOWS
+#include "../src/ctsim.h"
 bool g_bRunningWXWindows = false;
+#endif
 
 void sys_error (int severity, const char *msg, ...)
 {
   va_list arg;
   
   va_start(arg, msg);
-  
+  
   std::string strOutput;
   sys_verror (strOutput, severity, msg, arg);
-  
-//  if (g_bRunningWXWindows)
-//    theApp->getLog() << strOutput.c_str();
-//  else
-    std::cout << strOutput;
+ 
+#ifdef HAVE_WXWINDOWS
+  if (g_bRunningWXWindows)
+    *theApp->getLog() << strOutput.c_str();
+  else
+#endif
+    std::cout << strOutput;
 
   va_end(arg);
 }
@@ -68,9 +73,9 @@ void sys_verror (std::string& strOutput, int severity, const char *msg, va_list
   if (severity < s_reportErrorLevel)
     return;	// ignore error if less than reporting level
   
-  std::ostringstream os;
+  std::ostringstream os;
 
-  s_nErrorCount++;
+  s_nErrorCount++;
   if (severity != ERR_FATAL) {
     if (s_nErrorCount > MAX_ERROR_COUNT)
       return;
@@ -79,7 +84,7 @@ void sys_verror (std::string& strOutput, int severity, const char *msg, va_list
       os << "***   M A X I M U M   E R R O R   C O U N T   R E A C H E D   ***\n";
       os << "***                                                           ***\n";
       os << "***           No further errors will be reported              ***\n";
-      os << "*****************************************************************\n";
+      os << "*****************************************************************\n";
       strOutput = os.str();
       return;
     }
@@ -94,29 +99,31 @@ void sys_verror (std::string& strOutput, int severity, const char *msg, va_list
     break;
   case ERR_WARNING:
     os << "WARNING ERROR: ";
-    break;
-  case ERR_TRACE:
-    os << "Trace: ";
+    break;
+  case ERR_TRACE:
+    os << "Trace: ";
     break;
   default:
     os << "Illegal error severity #" << severity << ": ";
   }
   
-  char errStr[2000];
+  char errStr[2000];
   
 #if HAVE_VSNPRINTF
   vsnprintf (errStr, sizeof(errStr), msg, arg);
 #elif HAVE_VSPRINTF
-  vsprintf (errStr, msg, arg);
-#else
+  vsprintf (errStr, msg, arg);
+#else
   strncpy (errStr, sizeof(errStr), "Error message not available on this platform.");
 #endif
   
   os << errStr << "\n";
-  strOutput = os.str();
+  strOutput = os.str();
   
-  if (severity == ERR_FATAL)
-    throw std::runtime_error (errStr);
+  if (severity == ERR_FATAL) {
+    std::cerr << strOutput;
+    throw std::runtime_error (strOutput); 
+  }
   
 #if INTERACTIVE_ERROR_DISPLAY
   std::cout << "A - Abort  C - Continue  W - Turn off warnings? ";
@@ -160,7 +167,7 @@ sys_error_level (int severity)
 {
   if (severity == ERR_FATAL ||
     severity == ERR_SEVERE ||
-    severity == ERR_WARNING ||
+    severity == ERR_WARNING ||
     severity == ERR_TRACE)
     s_reportErrorLevel = severity;
   else