projects
/
ctsim.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
r418: no message
[ctsim.git]
/
libctsupport
/
syserror.cpp
diff --git
a/libctsupport/syserror.cpp
b/libctsupport/syserror.cpp
index ee6980e0291779601b774ebda285b0a0807968e2..8c28c3b6d5859a964f678fc543a55059ef4804ef 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
3 2001/01/10 21:21:53
kevin Exp $
+** $Id: syserror.cpp,v 1.1
6 2001/01/18 21:30:22
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
@@
-25,7
+25,7
@@
#include <ctype.h>
#include <string>
#include "ct.h"
#include <ctype.h>
#include <string>
#include "ct.h"
-
+#include "../src/ctsim.h"
/* NAME
* sys_error System error handler
/* NAME
* sys_error System error handler
@@
-40,7
+40,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
+49,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)
+ *theApp->getLog() << strOutput.c_str();
+ else
+#endif
std::cout << strOutput;
va_end(arg);
std::cout << strOutput;
va_end(arg);