X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=libctsupport%2Fsyserror.cpp;h=0823ea2bbbeb609be1993fdd1051dfe7b9858231;hb=d5a70ac05a479dfb99571bcba4069008d0f3697a;hp=ee6980e0291779601b774ebda285b0a0807968e2;hpb=5ff5b33a6bc64fb804106c4d50b83e4cf0d7b0f4;p=ctsim.git

diff --git a/libctsupport/syserror.cpp b/libctsupport/syserror.cpp
index ee6980e..0823ea2 100644
--- a/libctsupport/syserror.cpp
+++ b/libctsupport/syserror.cpp
@@ -1,8 +1,8 @@
 /*****************************************************************************
 **  This is part of the CTSim program
-**  Copyright (C) 1983-2000 Kevin Rosenberg
+**  Copyright (c) 1983-2001 Kevin Rosenberg
 **
-**  $Id: syserror.cpp,v 1.13 2001/01/10 21:21:53 kevin Exp $
+**  $Id: syserror.cpp,v 1.23 2002/05/05 10:54:34 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
@@ -35,12 +38,10 @@
 *   int severity		Severity of error
 *   char *msg			Error message
 *   args			Argument list, direct transfer to printf stack
-*				Can take 24 byte transfer
 */
 
-static int s_reportErrorLevel = ERR_WARNING;	// Set error reporting level 
+static int s_reportErrorLevel = ERR_TRACE;	// Set error reporting level 
 
-bool g_bRunningWXWindows = false;
 
 void sys_error (int severity, const char *msg, ...)
 {
@@ -50,11 +51,24 @@ 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
-    std::cout << strOutput;
+ 
+#ifdef HAVE_WXWINDOWS
+  if (g_bRunningWXWindows) {
+    if (theApp) {
+      wxCommandEvent eventLog (wxEVT_COMMAND_MENU_SELECTED, MAINMENU_LOG_EVENT );
+      wxString msg (strOutput.c_str());
+      msg += "\n";
+      eventLog.SetString( msg );
+      //      wxPostEvent( theApp->getMainFrame(), eventLog ); // send log event, thread safe
+    } else {
+      wxMutexGuiEnter();
+      wxLog::OnLog (wxLOG_Message, strOutput.c_str(), time(NULL));
+      wxMutexGuiLeave();
+    }
+  }
+  else
+#endif
+    std::cout << strOutput << "\n";
 
   va_end(arg);
 }
@@ -70,7 +84,9 @@ void sys_verror (std::string& strOutput, int severity, const char *msg, va_list
   
   std::ostringstream os;
 
-  s_nErrorCount++;
+  if (severity > ERR_TRACE)
+    s_nErrorCount++;
+
   if (severity != ERR_FATAL) {
     if (s_nErrorCount > MAX_ERROR_COUNT)
       return;
@@ -112,11 +128,11 @@ void sys_verror (std::string& strOutput, int severity, const char *msg, va_list
   strncpy (errStr, sizeof(errStr), "Error message not available on this platform.");
 #endif
   
-  os << errStr << "\n";
+  os << errStr;
   strOutput = os.str();
   
   if (severity == ERR_FATAL) {
-    std::cerr << strOutput;
+    std::cerr << strOutput << "\n";
     throw std::runtime_error (strOutput); 
   }