/*****************************************************************************
** This is part of the CTSim program
-** Copyright (C) 1983-2000 Kevin Rosenberg
+** Copyright (c) 1983-2001 Kevin Rosenberg
**
-** $Id: syserror.cpp,v 1.12 2001/01/02 16:02:13 kevin Exp $
+** $Id: syserror.cpp,v 1.25 2003/03/23 18:37:42 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
#include <string>
#include "ct.h"
+#ifdef HAVE_WXWINDOWS
+#include "../src/ctsim.h"
+#endif
/* NAME
* sys_error System error handler
* 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, ...)
{
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());
+ 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
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)
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";
strncpy (errStr, sizeof(errStr), "Error message not available on this platform.");
#endif
- os << errStr << "\n";
+ os << errStr;
strOutput = os.str();
- if (severity == ERR_FATAL)
- throw std::runtime_error (errStr);
+ if (severity == ERR_FATAL) {
+ std::cerr << strOutput << "\n";
+ throw std::runtime_error (strOutput);
+ }
#if INTERACTIVE_ERROR_DISPLAY
std::cout << "A - Abort C - Continue W - Turn off warnings? ";