adding explicit log.h include

[wxWidgets.git] / src / mgl / app.cpp

diff --git a/src/mgl/app.cpp b/src/mgl/app.cpp
index 1a614e3f81d87b2988f9bec4fcda0f7f5cd45f92..0c0a1ac7d46e077d3ba741f1a4e37a2978baf672 100644 (file)
--- a/src/mgl/app.cpp
+++ b/src/mgl/app.cpp
@@ -48,11 +48,9 @@ void wxApp::Exit()
 // wxYield
 //-----------------------------------------------------------------------------
 
-static bool gs_inYield = false;
-
 bool wxApp::Yield(bool onlyIfNeeded)
 {
-    if ( gs_inYield )
+    if ( m_isInsideYield )
     {
         if ( !onlyIfNeeded )
         {
@@ -70,14 +68,15 @@ bool wxApp::Yield(bool onlyIfNeeded)
     }
 #endif // wxUSE_THREADS
 
-    gs_inYield = true;
+    m_isInsideYield = true;
 
     wxLog::Suspend();
 
-    if ( wxEventLoop::GetActive() )
+    wxEventLoopBase * const eventLoop = wxEventLoop::GetActive();
+    if ( eventLoop )
     {
-        while (wxEventLoop::GetActive()->Pending())
-            wxEventLoop::GetActive()->Dispatch();
+        while (eventLoop->Pending())
+            eventLoop->Dispatch();
     }
 
     /* it's necessary to call ProcessIdle() to update the frames sizes which
@@ -87,7 +86,7 @@ bool wxApp::Yield(bool onlyIfNeeded)
 
     wxLog::Resume();
 
-    gs_inYield = false;
+    m_isInsideYield = false;
 
     return true;
 }
@@ -200,11 +199,6 @@ static void wxDestroyMGL_WM()
 
 IMPLEMENT_DYNAMIC_CLASS(wxApp,wxEvtHandler)
 
-BEGIN_EVENT_TABLE(wxApp, wxEvtHandler)
-    EVT_IDLE(wxAppBase::OnIdle)
-END_EVENT_TABLE()
-
-
 wxApp::wxApp()
 {
 }