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

overriding to allocate an outer autorelease pool

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@62216 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Csomor
2009-09-30 18:25:33 +00:00
parent 6bd1764f27
commit ada175836e
2 changed files with 15 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -50,9 +50,7 @@ class WXDLLIMPEXP_CORE wxApp: public wxAppBase
virtual bool OnInitGui(); virtual bool OnInitGui();
#endif // wxUSE_GUI #endif // wxUSE_GUI
#ifdef __WXOSX_IPHONE__
virtual int OnRun(); virtual int OnRun();
#endif
virtual bool ProcessIdle(); virtual bool ProcessIdle();

15
src/osx/carbon/app.cpp
View File

@@ -866,6 +866,20 @@ bool wxApp::ProcessIdle()
return wxAppBase::ProcessIdle(); return wxAppBase::ProcessIdle();
} }
#if wxOSX_USE_COCOA_OR_CARBON
int wxApp::OnRun()
{
wxMacAutoreleasePool pool;
return wxAppBase::OnRun();
}
#else
// iPhone version in utils.mm
#endif
#if wxOSX_USE_CARBON #if wxOSX_USE_CARBON
bool wxApp::DoInitGui() bool wxApp::DoInitGui()
{ {
@@ -939,6 +953,7 @@ void wxApp::DoCleanUp()
void wxApp::CleanUp() void wxApp::CleanUp()
{ {
wxMacAutoreleasePool autoreleasepool;
#if wxUSE_TOOLTIPS #if wxUSE_TOOLTIPS
wxToolTip::RemoveToolTips() ; wxToolTip::RemoveToolTips() ;
#endif #endif