projects
/
ctsim.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
r439: no message
[ctsim.git]
/
libctsupport
/
syserror.cpp
diff --git
a/libctsupport/syserror.cpp
b/libctsupport/syserror.cpp
index f87b82eee3ef08d93d1a31c3699d1d55810c66ad..dfce52808afbad9e34b0d0eb9455f26e8d53102d 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
**
** This is part of the CTSim program
** Copyright (C) 1983-2000 Kevin Rosenberg
**
-** $Id: syserror.cpp,v 1.1
2 2001/01/02 16:02:1
3 kevin Exp $
+** $Id: syserror.cpp,v 1.1
8 2001/01/20 08:10:3
3 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
**
** 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"
#include <string>
#include "ct.h"
+#ifdef HAVE_WXWINDOWS
+#include "../src/ctsim.h"
+#endif
/* NAME
* sys_error System error handler
/* NAME
* sys_error System error handler
@@
-40,7
+43,6
@@
static int s_reportErrorLevel = ERR_WARNING; // Set error reporting level
static int s_reportErrorLevel = ERR_WARNING; // Set error reporting level
-bool g_bRunningWXWindows = false;
void sys_error (int severity, const char *msg, ...)
{
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);
std::string strOutput;
sys_verror (strOutput, severity, msg, arg);
-
-// if (g_bRunningWXWindows)
-// theApp->getLog() << strOutput.c_str();
-// else
+
+#ifdef HAVE_WXWINDOWS
+ if (g_bRunningWXWindows)
+ wxLog::OnLog (wxLOG_Message, strOutput.c_str(), time(NULL));
+ else
+#endif
std::cout << strOutput;
va_end(arg);
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();
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? ";
#if INTERACTIVE_ERROR_DISPLAY
std::cout << "A - Abort C - Continue W - Turn off warnings? ";