fixing memory leak (reported by Ken Thomases)

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30884 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/mac/carbon/window.cpp b/src/mac/carbon/window.cpp
index 4b312d033e22d2a302fff2a900fbba027ab31d18..8bcc7057079a2effecc2f38ea3b8ec9a4ad9ff35 100644 (file)
--- a/src/mac/carbon/window.cpp
+++ b/src/mac/carbon/window.cpp
@@ -1384,12 +1384,12 @@ void wxWindowMac::MacGetContentAreaInset( int &left , int &top , int &right , in
     if ( m_peer->GetRegion( kControlContentMetaPart , rgn ) == noErr )
     {
         GetRegionBounds( rgn , &content ) ;
     if ( m_peer->GetRegion( kControlContentMetaPart , rgn ) == noErr )
     {
         GetRegionBounds( rgn , &content ) ;

-        DisposeRgn( rgn ) ;

     }
     else
     {
         m_peer->GetRect( &content ) ;
     }
     }
     else
     {
         m_peer->GetRect( &content ) ;
     }

+    DisposeRgn( rgn ) ;

     Rect structure ;
     m_peer->GetRect( &structure ) ;
 #if !TARGET_API_MAC_OSX
     Rect structure ;
     m_peer->GetRect( &structure ) ;
 #if !TARGET_API_MAC_OSX


@@ -1412,12 +1412,12 @@ wxSize wxWindowMac::DoGetSizeFromClientSize( const wxSize & size )  const
     if ( m_peer->GetRegion( kControlContentMetaPart , rgn ) == noErr )
     {
         GetRegionBounds( rgn , &content ) ;
     if ( m_peer->GetRegion( kControlContentMetaPart , rgn ) == noErr )
     {
         GetRegionBounds( rgn , &content ) ;

-        DisposeRgn( rgn ) ;

     }
     else
     {
         m_peer->GetRect( &content ) ;
     }
     }
     else
     {
         m_peer->GetRect( &content ) ;
     }

+    DisposeRgn( rgn ) ;

     Rect structure ;
     m_peer->GetRect( &structure ) ;
 #if !TARGET_API_MAC_OSX
     Rect structure ;
     m_peer->GetRect( &structure ) ;
 #if !TARGET_API_MAC_OSX


@@ -1444,12 +1444,12 @@ void wxWindowMac::DoGetClientSize(int *x, int *y) const
     if ( m_peer->GetRegion( kControlContentMetaPart , rgn ) == noErr )
     {
         GetRegionBounds( rgn , &content ) ;
     if ( m_peer->GetRegion( kControlContentMetaPart , rgn ) == noErr )
     {
         GetRegionBounds( rgn , &content ) ;

-        DisposeRgn( rgn ) ;

     }
     else
     {
         m_peer->GetRect( &content ) ;
     }
     }
     else
     {
         m_peer->GetRect( &content ) ;
     }

+    DisposeRgn( rgn ) ;

 #if !TARGET_API_MAC_OSX
     Rect structure ;
     m_peer->GetRect( &structure ) ;
 #if !TARGET_API_MAC_OSX
     Rect structure ;
     m_peer->GetRect( &structure ) ;