X-Git-Url: http://git.kpe.io/?p=ctsim.git;a=blobdiff_plain;f=libctsupport%2Fsyserror.cpp;h=e24ec85511f3f2802c5e441430057839434abec6;hp=dfce52808afbad9e34b0d0eb9455f26e8d53102d;hb=a2bb680d159717dbd81e3ad179cb28adbf3a3e9a;hpb=01ed72399d433ce45a0195f8acaea349a421461e

diff --git a/libctsupport/syserror.cpp b/libctsupport/syserror.cpp
index dfce528..e24ec85 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.18 2001/01/20 08:10:33 kevin Exp $
+**  $Id$
 **
 **  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
@@ -28,6 +28,7 @@
 
 #ifdef HAVE_WXWINDOWS
 #include "../src/ctsim.h"
+#include <wx/log.h>
 #endif
 
 /* NAME
@@ -38,10 +39,9 @@
 *   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 
 
 
 void sys_error (int severity, const char *msg, ...)
@@ -54,17 +54,32 @@ void sys_error (int severity, const char *msg, ...)
   sys_verror (strOutput, severity, msg, arg);
  
 #ifdef HAVE_WXWINDOWS
-  if (g_bRunningWXWindows)
-    wxLog::OnLog (wxLOG_Message, strOutput.c_str(), time(NULL));
+  if (g_bRunningWXWindows) {
+    if (theApp) {
+      wxCommandEvent eventLog (wxEVT_COMMAND_MENU_SELECTED, MAINMENU_LOG_EVENT );
+      wxString msg (strOutput.c_str());
+      if (msg.length() > 0) {
+	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
+    std::cout << strOutput << "\n";
+#else
+    std::cout << strOutput << "\n";
 #endif
-    std::cout << strOutput;
 
   va_end(arg);
 }
 
-static int s_nErrorCount = 0;
-const static int MAX_ERROR_COUNT = 20;
+static unsigned long s_nErrorCount = 0;
+unsigned long int g_lSysErrorMaxCount = 2000;
 
 
 void sys_verror (std::string& strOutput, int severity, const char *msg, va_list arg)
@@ -74,11 +89,13 @@ 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)
+    if (s_nErrorCount > g_lSysErrorMaxCount)
       return;
-    else if (s_nErrorCount == MAX_ERROR_COUNT) {
+    else if (s_nErrorCount == g_lSysErrorMaxCount) {
       os << "*****************************************************************\n";
       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";
@@ -116,11 +133,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); 
   }