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

A few checks for null pointers to avoid problems during app shutdown.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@55538 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Kevin Ollivier
2008-09-11 05:35:10 +00:00
parent c6f2bde160
commit 1a4e2d5b2f
1 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/osx/window_osx.cpp
View File

@@ -496,7 +496,7 @@ bool wxWindowMac::MacGetBoundsForControl(
AdjustForParentClientOrigin( x , y ) ; AdjustForParentClientOrigin( x , y ) ;
// this is in window relative coordinate, as this parent may have a border, its physical position is offset by this border // this is in window relative coordinate, as this parent may have a border, its physical position is offset by this border
if ( !GetParent()->IsTopLevel() ) if ( GetParent() && !GetParent()->IsTopLevel() )
{ {
x -= GetParent()->MacGetLeftBorderSize() ; x -= GetParent()->MacGetLeftBorderSize() ;
y -= GetParent()->MacGetTopBorderSize() ; y -= GetParent()->MacGetTopBorderSize() ;
@@ -834,10 +834,12 @@ void wxWindowMac::MacInvalidateBorders()
wxRect topupdate( tx-outerBorder, ty-outerBorder, tw + 2 * outerBorder, outerBorder ); wxRect topupdate( tx-outerBorder, ty-outerBorder, tw + 2 * outerBorder, outerBorder );
wxRect bottomupdate( tx-outerBorder, ty + th, tw + 2 * outerBorder, outerBorder ); wxRect bottomupdate( tx-outerBorder, ty + th, tw + 2 * outerBorder, outerBorder );
GetParent()->m_peer->SetNeedsDisplay(&leftupdate); if (GetParent()) {
GetParent()->m_peer->SetNeedsDisplay(&rightupdate); GetParent()->m_peer->SetNeedsDisplay(&leftupdate);
GetParent()->m_peer->SetNeedsDisplay(&topupdate); GetParent()->m_peer->SetNeedsDisplay(&rightupdate);
GetParent()->m_peer->SetNeedsDisplay(&bottomupdate); GetParent()->m_peer->SetNeedsDisplay(&topupdate);
GetParent()->m_peer->SetNeedsDisplay(&bottomupdate);
}
} }
void wxWindowMac::DoMoveWindow(int x, int y, int width, int height) void wxWindowMac::DoMoveWindow(int x, int y, int width, int height)
@@ -887,9 +889,9 @@ void wxWindowMac::DoMoveWindow(int x, int y, int width, int height)
wxSize( actualWidth - (MacGetLeftBorderSize() + MacGetRightBorderSize()) , wxSize( actualWidth - (MacGetLeftBorderSize() + MacGetRightBorderSize()) ,
actualHeight - (MacGetTopBorderSize() + MacGetBottomBorderSize()) ) ) ; actualHeight - (MacGetTopBorderSize() + MacGetBottomBorderSize()) ) ) ;
if ( !GetParent()->IsTopLevel() ) if ( parent && !parent->IsTopLevel() )
{ {
bounds.Offset( -GetParent()->MacGetLeftBorderSize(), -GetParent()->MacGetTopBorderSize() ); bounds.Offset( -parent->MacGetLeftBorderSize(), -parent->MacGetTopBorderSize() );
} }
MacInvalidateBorders() ; MacInvalidateBorders() ;