attempt to work around SDK specific problems

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

diff --git a/src/motif/app.cpp b/src/motif/app.cpp
index 41e76ef23ce2a5ebe5a89caf895ad5f7632c127e..d17e8fc734efeba00f42164bdd69c844bd6230f5 100644 (file)
--- a/src/motif/app.cpp
+++ b/src/motif/app.cpp
@@ -120,7 +120,7 @@ wxApp::wxApp()
     argc = 0;
     argv = NULL;
 
-    m_eventLoop = new wxEventLoop;
+    m_mainLoop = new wxEventLoop;
     m_mainColormap = (WXColormap) NULL;
     m_appContext = (WXAppContext) NULL;
     m_initialDisplay = (WXDisplay*) 0;
@@ -129,7 +129,7 @@ wxApp::wxApp()
 
 wxApp::~wxApp()
 {
-    delete m_eventLoop;
+    delete m_mainLoop;
 
     for( wxPerDisplayDataMap::iterator it  = m_perDisplayData->begin(),
                                        end = m_perDisplayData->end();
@@ -157,7 +157,7 @@ int wxApp::MainLoop()
         XDefaultRootWindow(XtDisplay((Widget) wxTheApp->GetTopLevelWidget())),
         PropertyChangeMask);
 
-    m_eventLoop->Run();
+    m_mainLoop->Run();
 
     return 0;
 }
@@ -304,7 +304,7 @@ void wxApp::SetTopLevelWidget(WXDisplay* display, WXWidget widget)
 
 bool wxApp::Yield(bool onlyIfNeeded)
 {
-    bool s_inYield = FALSE;
+    static bool s_inYield = FALSE;
 
     if ( s_inYield )
     {