remove also wxT(); it's confusing, too; do load wxstd.mo catalog after calling wxLoca...

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

diff --git a/src/dfb/app.cpp b/src/dfb/app.cpp
index bfde03508efa4fb9ba67e793a3de3b3cfb8c8fcf..c95912e53866c75d74b0b69b56ac506831b9838f 100644 (file)
--- a/src/dfb/app.cpp
+++ b/src/dfb/app.cpp
@@ -19,6 +19,7 @@
 #include "wx/app.h"
 
 #include "wx/evtloop.h"
 #include "wx/app.h"
 
 #include "wx/evtloop.h"

+#include "wx/thread.h"

 #include "wx/dfb/private.h"
 #include "wx/private/fontmgr.h"
 
 #include "wx/dfb/private.h"
 #include "wx/private/fontmgr.h"
 


@@ -28,10 +29,6 @@
 
 IMPLEMENT_DYNAMIC_CLASS(wxApp, wxEvtHandler)
 
 
 IMPLEMENT_DYNAMIC_CLASS(wxApp, wxEvtHandler)
 

-BEGIN_EVENT_TABLE(wxApp, wxEvtHandler)
-    EVT_IDLE(wxAppBase::OnIdle)
-END_EVENT_TABLE()
-

 wxApp::wxApp()
 {
 }
 wxApp::wxApp()
 {
 }


@@ -174,9 +171,7 @@ bool wxApp::Yield(bool onlyIfNeeded)
         return true; // can't process events from other threads
 #endif // wxUSE_THREADS
 
         return true; // can't process events from other threads
 #endif // wxUSE_THREADS
 

-    static bool s_inYield = false;
-
-    if ( s_inYield )
+    if ( m_isInsideYield )

     {
         if ( !onlyIfNeeded )
         {
     {
         if ( !onlyIfNeeded )
         {


@@ -186,12 +181,14 @@ bool wxApp::Yield(bool onlyIfNeeded)
         return false;
     }
 
         return false;
     }
 

-    s_inYield = true;
+    m_isInsideYield = true;

 
 

+#if wxUSE_LOG

     wxLog::Suspend();
     wxLog::Suspend();

+#endif // wxUSE_LOG

 
     wxEventLoop * const
 
     wxEventLoop * const

-        loop = wx_static_cast(wxEventLoop *, wxEventLoop::GetActive());
+        loop = static_cast<wxEventLoop *>(wxEventLoop::GetActive());

     if ( loop )
         loop->Yield();
 
     if ( loop )
         loop->Yield();
 


@@ -200,9 +197,11 @@ bool wxApp::Yield(bool onlyIfNeeded)
     // OnUpdateUI() which is a nice (and desired) side effect)
     while ( ProcessIdle() ) {}
 
     // OnUpdateUI() which is a nice (and desired) side effect)
     while ( ProcessIdle() ) {}
 

+#if wxUSE_LOG

     wxLog::Resume();
     wxLog::Resume();

+#endif // wxUSE_LOG

 
 

-    s_inYield = false;
+    m_isInsideYield = false;

 
     return true;
 }
 
     return true;
 }