X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8d60daa8d3d4ff1df00129b679713809f91f6ec5..efc8837250a62bfd9c60b489db955b79b96ef311:/src/cocoa/app.mm diff --git a/src/cocoa/app.mm b/src/cocoa/app.mm index 80402ff4f9..bc8af99d71 100644 --- a/src/cocoa/app.mm +++ b/src/cocoa/app.mm @@ -116,7 +116,7 @@ bool wxApp::Initialize(int& argc, wxChar **argv) // application (otherwise applications would need to handle it) if ( argc > 1 ) { - static const wxChar *ARG_PSN = _T("-psn_"); + static const wxChar *ARG_PSN = wxT("-psn_"); if ( wxStrncmp(argv[1], ARG_PSN, wxStrlen(ARG_PSN)) == 0 ) { // remove this argument @@ -184,10 +184,6 @@ wxApp::wxApp() { m_topWindow = NULL; -#ifdef __WXDEBUG__ - m_isInAssert = false; -#endif // __WXDEBUG__ - argc = 0; #if !wxUSE_UNICODE argv = NULL; @@ -466,15 +462,6 @@ void wxApp::CF_ObserveMainRunLoopBeforeWaiting(CFRunLoopObserverRef observer, in } } -#ifdef __WXDEBUG__ -void wxApp::OnAssert(const wxChar *file, int line, const wxChar* cond, const wxChar *msg) -{ - m_isInAssert = true; - wxAppBase::OnAssert(file, line, cond, msg); - m_isInAssert = false; -} -#endif // __WXDEBUG__ - /* A note about Cocoa's event loops vs. run loops: It's important to understand that Cocoa has a two-level event loop. The