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 80cc909f63f54d5aae18c327b2b3c594663d1f55..c8e358c18515cfd7d30e3525d9aa25d28b995cbf 100644 (file)
--- a/src/osx/carbon/app.cpp
+++ b/src/osx/carbon/app.cpp
@@ -409,6 +409,7 @@ void wxApp::OSXOnWillFinishLaunching()
 void wxApp::OSXOnDidFinishLaunching()
 {
     wxTheApp->OnLaunched();
 void wxApp::OSXOnDidFinishLaunching()
 {
     wxTheApp->OnLaunched();

+    wxEventLoopBase::SetActive(GetMainLoop());

 }
 
 void wxApp::OSXOnWillTerminate()
 }
 
 void wxApp::OSXOnWillTerminate()


@@ -417,6 +418,11 @@ void wxApp::OSXOnWillTerminate()
     event.SetCanVeto(false);
     wxTheApp->OnEndSession(event);
     
     event.SetCanVeto(false);
     wxTheApp->OnEndSession(event);
     

+    wxGUIEventLoop* mainloop = dynamic_cast<wxGUIEventLoop*>(GetMainLoop());
+    if ( mainloop )
+        mainloop->OSXOnWillTerminate();
+    wxEventLoopBase::SetActive(NULL);
+

     wxTheApp->OnExit();
 }
 
     wxTheApp->OnExit();
 }