From: Stefan Csomor <csomor@advancedconcepts.ch>
Date: Sat, 27 Jul 2013 19:19:39 +0000 (+0000)
Subject: wiring event loop callbacks
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/fb5cb86797d8c3a670bb060c1d042bd018cc4bba

wiring event loop callbacks

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74605 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---

diff --git a/src/osx/carbon/app.cpp b/src/osx/carbon/app.cpp
index 80cc909f63..c8e358c185 100644
--- a/src/osx/carbon/app.cpp
+++ b/src/osx/carbon/app.cpp
@@ -409,6 +409,7 @@ void wxApp::OSXOnWillFinishLaunching()
 void wxApp::OSXOnDidFinishLaunching()
 {
     wxTheApp->OnLaunched();
+    wxEventLoopBase::SetActive(GetMainLoop());
 }
 
 void wxApp::OSXOnWillTerminate()
@@ -417,6 +418,11 @@ void wxApp::OSXOnWillTerminate()
     event.SetCanVeto(false);
     wxTheApp->OnEndSession(event);
     
+    wxGUIEventLoop* mainloop = dynamic_cast<wxGUIEventLoop*>(GetMainLoop());
+    if ( mainloop )
+        mainloop->OSXOnWillTerminate();
+    wxEventLoopBase::SetActive(NULL);
+
     wxTheApp->OnExit();
 }