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

Prevent segfaulting if a NULL window is passed to the DCs, avoid

Browse Source 
reasserting if the base class already did it.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_8_BRANCH@45895 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn
2007-05-08 20:10:47 +00:00
parent 2033f5ec6a
commit a599423672
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/gtk/dcclient.cpp
View File

@@ -271,7 +271,7 @@ wxWindowDC::wxWindowDC()
wxWindowDC::wxWindowDC( wxWindow *window )
{
wxASSERT_MSG( window, wxT("DC needs a window") );
wxCHECK_RET( window, wxT("DC needs a window") );
m_penGC = (GdkGC *) NULL;
m_brushGC = (GdkGC *) NULL;
@@ -2446,6 +2446,9 @@ wxPaintDC::wxPaintDC( wxWindow *win )
: wxClientDC( win )
{
#if USE_PAINT_REGION
if (!win) // the base class already asserted...
return;
if (!win->m_clipPaintRegion)
return;
@@ -2479,7 +2482,8 @@ IMPLEMENT_DYNAMIC_CLASS(wxClientDC, wxWindowDC)
wxClientDC::wxClientDC( wxWindow *win )
: wxWindowDC( win )
{
wxCHECK_RET( win, _T("NULL window in wxClientDC::wxClientDC") );
if (!win) // the base class already asserted...
return;
#ifdef __WXUNIVERSAL__
wxPoint ptOrigin = win->GetClientAreaOrigin();