Fixes for application not closing after last top level

window closed.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24166 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/motif/app.h b/include/wx/motif/app.h
index c33deb99dfa10514ca11575f01071c32719885f1..b7bcef5637bca6d0dd46e31171f09dd7c3dee05d 100644 (file)
--- a/include/wx/motif/app.h
+++ b/include/wx/motif/app.h
@@ -84,8 +84,6 @@ public:
     wxXVisualInfo* GetVisualInfo(WXDisplay* display);
 
 private:
     wxXVisualInfo* GetVisualInfo(WXDisplay* display);
 
 private:

-    wxEventLoop*    m_eventLoop;
-    

     // Motif-specific
     WXAppContext          m_appContext;
     WXColormap            m_mainColormap;
     // Motif-specific
     WXAppContext          m_appContext;
     WXColormap            m_mainColormap;

diff --git a/src/motif/app.cpp b/src/motif/app.cpp
index 41e76ef23ce2a5ebe5a89caf895ad5f7632c127e..a723826ec3a5920c927b0fa0ad506cb28072ec18 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();


@@ -157,7 +157,7 @@ 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;
 }