X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=libctsupport%2Fsyserror.cpp;h=d50471ef4f1e504aac49fa806ca76d348fab8373;hb=befd71a7157339b52a0c40359518d5276b25d127;hp=ee6980e0291779601b774ebda285b0a0807968e2;hpb=5ff5b33a6bc64fb804106c4d50b83e4cf0d7b0f4;p=ctsim.git diff --git a/libctsupport/syserror.cpp b/libctsupport/syserror.cpp index ee6980e..d50471e 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.13 2001/01/10 21:21:53 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 @@ -26,6 +26,9 @@ #include #include "ct.h" +#ifdef HAVE_WXWINDOWS +#include "../src/ctsim.h" +#endif /* NAME * sys_error System error handler @@ -40,7 +43,6 @@ static int s_reportErrorLevel = ERR_WARNING; // Set error reporting level -bool g_bRunningWXWindows = false; void sys_error (int severity, const char *msg, ...) { @@ -50,10 +52,16 @@ 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 + +#ifdef HAVE_WXWINDOWS + 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; va_end(arg);