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

Do a sanity check to make sure GetWindow() has a valid window, and assert if it doesn't. On OS X Cocoa, try to continue on in release mode.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@58797 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Kevin Ollivier
2009-02-09 02:21:30 +00:00
parent f487501a2c
commit 0600cf3ae9
1 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/osx/carbon/graphics.cpp
View File

@@ -2435,12 +2435,15 @@ wxGraphicsContext * wxMacCoreGraphicsRenderer::CreateContext( const wxWindowDC&
int w, h;
win_impl->GetSize( &w, &h );
CGContextRef cgctx = 0;
#ifdef __WXMAC__
cgctx = (CGContextRef)(win_impl->GetWindow()->MacGetCGContextRef());
#else
cgctx = wxMacGetContextFromCurrentNSContext() ;
wxASSERT_MSG(win_impl->GetWindow(), "Invalid wxWindow in wxMacCoreGraphicsRenderer::CreateContext");
if (win_impl->GetWindow())
cgctx = (CGContextRef)(win_impl->GetWindow()->MacGetCGContextRef());
#if wxOSX_USE_COCOA
else
cgctx = wxMacGetContextFromCurrentNSContext() ;
#endif
return new wxMacCoreGraphicsContext( this, cgctx, (wxDouble) w, (wxDouble) h );
if (cgctx != 0)
return new wxMacCoreGraphicsContext( this, cgctx, (wxDouble) w, (wxDouble) h );
}
return NULL;
}