Use CMsgBoxDisplayer on platforms other than Windows as well.
This commit is contained in:
parent
c246eb3fe2
commit
b8192c387f
3 changed files with 1 additions and 21 deletions
|
@ -1193,13 +1193,7 @@ void createDebug (const char *logPath, bool logInFile, bool eraseLastLog)
|
|||
INelContext::getInstance().setAssertLog(new CLog (CLog::LOG_ASSERT));
|
||||
|
||||
sd = new CStdDisplayer ("DEFAULT_SD");
|
||||
|
||||
#ifdef NL_OS_WINDOWS
|
||||
if (TrapCrashInDebugger || !IsDebuggerPresent ())
|
||||
{
|
||||
DefaultMsgBoxDisplayer = new CMsgBoxDisplayer ("DEFAULT_MBD");
|
||||
}
|
||||
#endif
|
||||
DefaultMsgBoxDisplayer = new CMsgBoxDisplayer ("DEFAULT_MBD");
|
||||
|
||||
#if LOG_IN_FILE
|
||||
if (logInFile)
|
||||
|
|
|
@ -529,7 +529,6 @@ void CFileDisplayer::doDisplay ( const CLog::TDisplayInfo& args, const char *mes
|
|||
// in release "<Msg>"
|
||||
void CMsgBoxDisplayer::doDisplay ( const CLog::TDisplayInfo& args, const char *message)
|
||||
{
|
||||
#ifdef NL_OS_WINDOWS
|
||||
|
||||
bool needSpace = false;
|
||||
// stringstream ss;
|
||||
|
@ -720,7 +719,6 @@ void CMsgBoxDisplayer::doDisplay ( const CLog::TDisplayInfo& args, const char *m
|
|||
}
|
||||
*/ }
|
||||
|
||||
#endif
|
||||
}
|
||||
|
||||
|
||||
|
|
|
@ -52,16 +52,6 @@ void setReportEmailFunction (void *emailFunction)
|
|||
EmailFunction = (TEmailFunction)emailFunction;
|
||||
}
|
||||
|
||||
#ifndef NL_OS_WINDOWS
|
||||
|
||||
// GNU/Linux, do nothing
|
||||
|
||||
void report ()
|
||||
{
|
||||
}
|
||||
|
||||
#else
|
||||
|
||||
TReportResult report (const std::string &title, const std::string &header, const std::string &subject, const std::string &body, bool enableCheckIgnore, uint debugButton, bool ignoreButton, sint quitButton, bool sendReportButton, bool &ignoreNextTime, const string &attachedFile)
|
||||
{
|
||||
std::string fname = "rcerrorlog.txt";
|
||||
|
@ -92,7 +82,5 @@ TReportResult report (const std::string &title, const std::string &header, const
|
|||
return ReportQuit;
|
||||
}
|
||||
|
||||
#endif
|
||||
|
||||
|
||||
} // NLMISC
|
||||
|
|
Loading…
Reference in a new issue