projects
/
ctsim.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
r514: no message
[ctsim.git]
/
libctsupport
/
syserror.cpp
diff --git
a/libctsupport/syserror.cpp
b/libctsupport/syserror.cpp
index 1b9aff402c8513575e9492bb8f877b2eb48484a7..d50471ef4f1e504aac49fa806ca76d348fab8373 100644
(file)
--- a/
libctsupport/syserror.cpp
+++ b/
libctsupport/syserror.cpp
@@
-1,8
+1,8
@@
/*****************************************************************************
** This is part of the CTSim program
/*****************************************************************************
** This is part of the CTSim program
-** Copyright (
C) 1983-2000
Kevin Rosenberg
+** Copyright (
c) 1983-2001
Kevin Rosenberg
**
**
-** $Id: syserror.cpp,v 1.
14 2001/01/12 16:41:56
kevin Exp $
+** $Id: syserror.cpp,v 1.
20 2001/01/30 02:20:50
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,10
+43,6
@@
static int s_reportErrorLevel = ERR_WARNING; // Set error reporting level
static int s_reportErrorLevel = ERR_WARNING; // Set error reporting level
-#ifdef HAVE_WXWINDOWS
-#include "../src/ctsim.h"
-bool g_bRunningWXWindows = false;
-#endif
void sys_error (int severity, const char *msg, ...)
{
void sys_error (int severity, const char *msg, ...)
{
@@
-55,8
+54,12
@@
void sys_error (int severity, const char *msg, ...)
sys_verror (strOutput, severity, msg, arg);
#ifdef HAVE_WXWINDOWS
sys_verror (strOutput, severity, msg, arg);
#ifdef HAVE_WXWINDOWS
- if (g_bRunningWXWindows)
- *theApp->getLog() << strOutput.c_str();
+ if (g_bRunningWXWindows) {
+ if (theApp)
+ *theApp->getLog() << strOutput.c_str() << "\n";
+ else
+ wxLog::OnLog (wxLOG_Message, strOutput.c_str(), time(NULL));
+ }
else
#endif
std::cout << strOutput;
else
#endif
std::cout << strOutput;