best size fix for multi-line fields

[wxWidgets.git] / src / cocoa / evtloop.mm

diff --git a/src/cocoa/evtloop.mm b/src/cocoa/evtloop.mm
index 7e122cb12a02f0aa58a06afb60309dfa6a5868d5..7a6e393670661134afdcf45477d5e11cd96c2357 100644 (file)
--- a/src/cocoa/evtloop.mm
+++ b/src/cocoa/evtloop.mm
@@ -48,8 +48,6 @@ private:
 // wxEventLoop running and exiting
 // ----------------------------------------------------------------------------
 
 // wxEventLoop running and exiting
 // ----------------------------------------------------------------------------
 

-wxEventLoop *wxEventLoopBase::ms_activeLoop = NULL;
-

 wxEventLoop::~wxEventLoop()
 {
     wxASSERT_MSG( !m_impl, _T("should have been deleted in Run()") );
 wxEventLoop::~wxEventLoop()
 {
     wxASSERT_MSG( !m_impl, _T("should have been deleted in Run()") );


@@ -60,19 +58,18 @@ int wxEventLoop::Run()
     // event loops are not recursive, you need to create another loop!
     wxCHECK_MSG( !IsRunning(), -1, _T("can't reenter a message loop") );
 
     // event loops are not recursive, you need to create another loop!
     wxCHECK_MSG( !IsRunning(), -1, _T("can't reenter a message loop") );
 

-    wxEventLoop *oldLoop = ms_activeLoop;
-    ms_activeLoop = this;
+    wxEventLoopActivator activate(this);

 
     m_impl = new wxEventLoopImpl;
 
     [[NSApplication sharedApplication] run];
 
 
     m_impl = new wxEventLoopImpl;
 
     [[NSApplication sharedApplication] run];
 

+    OnExit();
+

     int exitcode = m_impl->GetExitCode();
     delete m_impl;
     m_impl = NULL;
 
     int exitcode = m_impl->GetExitCode();
     delete m_impl;
     m_impl = NULL;
 

-    ms_activeLoop = oldLoop;
-

     return exitcode;
 }
 
     return exitcode;
 }