Redirect assertions to the logging system. This doesn't create a popup dialogue like the default method does. If someone actually wants that to happen let me know and I'll write something.

Originally committed to SVN as r4780.
This commit is contained in:
Amar Takhar 2010-09-14 22:05:19 +00:00
parent 01e1a34d43
commit 6f63041156
1 changed files with 16 additions and 3 deletions

View File

@ -139,15 +139,28 @@ void SetThreadName(DWORD dwThreadID, LPCSTR szThreadName) {
#endif #endif
/// @brief Gets called when application starts, creates MainFrame ----------------------- Initialization function /// @brief Handle wx assertions and redirct to the logging system.
/// @return /// @param file File name
/// /// @param line Line number
/// @param func Function name
/// @param cond Condition
/// @param msg Message
static void wxAssertHandler(const wxString &file, int line, const wxString &func, const wxString &cond, const wxString &msg) {
LOG_A("wx/assert") << file << ":" << line << ":" << func << "() " << cond << ": " << msg;
}
/// @brief Gets called when application starts.
/// @return bool
bool AegisubApp::OnInit() { bool AegisubApp::OnInit() {
#ifdef _DEBUG #ifdef _DEBUG
emit_stdout = new agi::log::EmitSTDOUT(); emit_stdout = new agi::log::EmitSTDOUT();
emit_stdout->Enable(); emit_stdout->Enable();
#endif #endif
// Install assertion handler
wxSetAssertHandler(wxAssertHandler);
// App name (yeah, this is a little weird to get rid of an odd warning) // App name (yeah, this is a little weird to get rid of an odd warning)
#if defined(__WXMSW__) || defined(__WXMAC__) #if defined(__WXMSW__) || defined(__WXMAC__)
SetAppName(_T("Aegisub")); SetAppName(_T("Aegisub"));