r422: *** empty log message ***

[ctsim.git] / libctsupport / syserror.cpp

diff --git a/libctsupport/syserror.cpp b/libctsupport/syserror.cpp
index f87b82eee3ef08d93d1a31c3699d1d55810c66ad..7707b3071b2612b02c9c7c826a407f9e36e1218a 100644 (file)
--- 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.12 2001/01/02 16:02:13 kevin Exp $
+**  $Id: syserror.cpp,v 1.17 2001/01/19 22:29:15 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
@@ -26,6 +26,9 @@
 #include <string>
 #include "ct.h"
 
+#ifdef HAVE_WXWINDOWS
+#include "../src/ctsim.h"
+#endif
 
 /* NAME
 *   sys_error                  System error handler
@@ -40,7 +43,6 @@
 
 static int s_reportErrorLevel = ERR_WARNING;   // Set error reporting level 
 
-bool g_bRunningWXWindows = false;
 
 void sys_error (int severity, const char *msg, ...)
 {
@@ -50,10 +52,12 @@ void sys_error (int severity, const char *msg, ...)
   
   std::string strOutput;
   sys_verror (strOutput, severity, msg, arg);
-  
-//  if (g_bRunningWXWindows)
-//    theApp->getLog() << strOutput.c_str();
-//  else
+ 
+#ifdef HAVE_WXWINDOWS
+  if (g_bRunningWXWindows)
+    *theApp->getLog() << strOutput.c_str();
+  else
+#endif
     std::cout << strOutput;
 
   va_end(arg);
@@ -115,8 +119,10 @@ void sys_verror (std::string& strOutput, int severity, const char *msg, va_list
   os << errStr << "\n";
   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? ";