cleanup in toplevel activation, and switching to native carbon event notification...

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

diff --git a/src/motif/app.cpp b/src/motif/app.cpp
index 9c202c14b17f097bd7c6330c1cae5c6d8806efd0..d17e8fc734efeba00f42164bdd69c844bd6230f5 100644 (file)
--- a/src/motif/app.cpp
+++ b/src/motif/app.cpp
@@ -120,7 +120,7 @@ wxApp::wxApp()
     argc = 0;
     argv = NULL;
 
     argc = 0;
     argv = NULL;
 

-    m_eventLoop = new wxEventLoop;
+    m_mainLoop = new wxEventLoop;

     m_mainColormap = (WXColormap) NULL;
     m_appContext = (WXAppContext) NULL;
     m_initialDisplay = (WXDisplay*) 0;
     m_mainColormap = (WXColormap) NULL;
     m_appContext = (WXAppContext) NULL;
     m_initialDisplay = (WXDisplay*) 0;


@@ -129,7 +129,7 @@ wxApp::wxApp()
 
 wxApp::~wxApp()
 {
 
 wxApp::~wxApp()
 {

-    delete m_eventLoop;
+    delete m_mainLoop;

 
     for( wxPerDisplayDataMap::iterator it  = m_perDisplayData->begin(),
                                        end = m_perDisplayData->end();
 
     for( wxPerDisplayDataMap::iterator it  = m_perDisplayData->begin(),
                                        end = m_perDisplayData->end();


@@ -144,14 +144,6 @@ wxApp::~wxApp()
     wxApp::SetInstance(NULL);
 }
 
     wxApp::SetInstance(NULL);
 }
 

-bool wxApp::Initialized()
-{
-    if (GetTopWindow())
-        return TRUE;
-    else
-        return FALSE;
-}
-

 int wxApp::MainLoop()
 {
     /*
 int wxApp::MainLoop()
 {
     /*


@@ -165,17 +157,11 @@ int wxApp::MainLoop()
         XDefaultRootWindow(XtDisplay((Widget) wxTheApp->GetTopLevelWidget())),
         PropertyChangeMask);
 
         XDefaultRootWindow(XtDisplay((Widget) wxTheApp->GetTopLevelWidget())),
         PropertyChangeMask);
 

-    m_eventLoop->Run();
+    m_mainLoop->Run();

 
     return 0;
 }
 
 
     return 0;
 }
 

-void wxApp::ExitMainLoop()
-{
-    if( m_eventLoop->IsRunning() )
-        m_eventLoop->Exit();
-}
-

 // This should be redefined in a derived class for
 // handling property change events for XAtom IPC.
 void wxApp::HandlePropertyChange(WXEvent *event)
 // This should be redefined in a derived class for
 // handling property change events for XAtom IPC.
 void wxApp::HandlePropertyChange(WXEvent *event)


@@ -318,7 +304,7 @@ void wxApp::SetTopLevelWidget(WXDisplay* display, WXWidget widget)
 
 bool wxApp::Yield(bool onlyIfNeeded)
 {
 
 bool wxApp::Yield(bool onlyIfNeeded)
 {

-    bool s_inYield = FALSE;
+    static bool s_inYield = FALSE;

 
     if ( s_inYield )
     {
 
     if ( s_inYield )
     {