Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixes for application not closing after last top level

Browse Source 
window closed.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24166 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Mattia Barbon
2003-10-13 17:23:23 +00:00
parent 7f2e78ed5d
commit f15b55cee0
2 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/wx/motif/app.h
View File

@@ -84,8 +84,6 @@ public:
wxXVisualInfo* GetVisualInfo(WXDisplay* display); wxXVisualInfo* GetVisualInfo(WXDisplay* display);
private: private:
wxEventLoop* m_eventLoop;
// Motif-specific // Motif-specific
WXAppContext m_appContext; WXAppContext m_appContext;
WXColormap m_mainColormap; WXColormap m_mainColormap;

6
src/motif/app.cpp
View File

@@ -120,7 +120,7 @@ wxApp::wxApp()
argc = 0; argc = 0;
argv = NULL; argv = NULL;
m_eventLoop = new wxEventLoop; m_mainLoop = new wxEventLoop;
m_mainColormap = (WXColormap) NULL; m_mainColormap = (WXColormap) NULL;
m_appContext = (WXAppContext) NULL; m_appContext = (WXAppContext) NULL;
m_initialDisplay = (WXDisplay*) 0; 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(), for( wxPerDisplayDataMap::iterator it = m_perDisplayData->begin(),
end = m_perDisplayData->end(); end = m_perDisplayData->end();
@@ -157,7 +157,7 @@ int wxApp::MainLoop()
XDefaultRootWindow(XtDisplay((Widget) wxTheApp->GetTopLevelWidget())), XDefaultRootWindow(XtDisplay((Widget) wxTheApp->GetTopLevelWidget())),
PropertyChangeMask); PropertyChangeMask);
m_eventLoop->Run(); m_mainLoop->Run();
return 0; return 0;
} }