region calculation for windows with borders too small

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

diff --git a/src/mac/carbon/dc.cpp b/src/mac/carbon/dc.cpp
index 65f74ce58a8ae81b961056dca95226b0ce5b0051..638a4f0d58eddb758c577b739fb920abd98f44b9 100644 (file)
--- a/src/mac/carbon/dc.cpp
+++ b/src/mac/carbon/dc.cpp
@@ -70,8 +70,8 @@ wxMacWindowClipper::wxMacWindowClipper( const wxWindow* win )
         parent->MacWindowToRootWindow( &x,&y ) ;
         wxSize size = parent->GetSize() ;
         SetRectRgn( insidergn , parent->MacGetLeftBorderSize() , parent->MacGetTopBorderSize() , 
         parent->MacWindowToRootWindow( &x,&y ) ;
         wxSize size = parent->GetSize() ;
         SetRectRgn( insidergn , parent->MacGetLeftBorderSize() , parent->MacGetTopBorderSize() , 

-         size.x - parent->MacGetLeftBorderSize() - parent->MacGetRightBorderSize(), 
-         size.y - parent->MacGetTopBorderSize() - parent->MacGetBottomBorderSize()) ;
+         size.x - parent->MacGetRightBorderSize(), 
+         size.y - parent->MacGetBottomBorderSize()) ;

         CopyRgn( (RgnHandle) parent->MacGetVisibleRegion(false).GetWXHRGN() , m_newClip ) ;
        SectRgn( m_newClip , insidergn , m_newClip ) ;
         OffsetRgn( m_newClip , x , y ) ;
         CopyRgn( (RgnHandle) parent->MacGetVisibleRegion(false).GetWXHRGN() , m_newClip ) ;
        SectRgn( m_newClip , insidergn , m_newClip ) ;
         OffsetRgn( m_newClip , x , y ) ;

diff --git a/src/mac/carbon/window.cpp b/src/mac/carbon/window.cpp
index 70ffe076e7c3596ad914eee9a2214f3a4f174dba..0528ad58db9902ea4016aa58df63421f190a3e15 100644 (file)
--- a/src/mac/carbon/window.cpp
+++ b/src/mac/carbon/window.cpp
@@ -1666,8 +1666,8 @@ const wxRegion& wxWindowMac::MacGetVisibleRegion( bool respectChildrenAndSibling
 
       SetRectRgn( tempRgn , 
        x + parent->MacGetLeftBorderSize() , y + parent->MacGetTopBorderSize() , 
 
       SetRectRgn( tempRgn , 
        x + parent->MacGetLeftBorderSize() , y + parent->MacGetTopBorderSize() , 

-       x + size.x - parent->MacGetLeftBorderSize() - parent->MacGetRightBorderSize(), 
-       y + size.y - parent->MacGetTopBorderSize() - parent->MacGetBottomBorderSize()) ;
+       x + size.x - parent->MacGetRightBorderSize(), 
+       y + size.y - parent->MacGetBottomBorderSize()) ;

 
       SectRgn( visRgn , tempRgn , visRgn ) ;
       if ( parent->IsTopLevel() )
 
       SectRgn( visRgn , tempRgn , visRgn ) ;
       if ( parent->IsTopLevel() )

diff --git a/src/mac/dc.cpp b/src/mac/dc.cpp
index 65f74ce58a8ae81b961056dca95226b0ce5b0051..638a4f0d58eddb758c577b739fb920abd98f44b9 100644 (file)
--- a/src/mac/dc.cpp
+++ b/src/mac/dc.cpp
@@ -70,8 +70,8 @@ wxMacWindowClipper::wxMacWindowClipper( const wxWindow* win )
         parent->MacWindowToRootWindow( &x,&y ) ;
         wxSize size = parent->GetSize() ;
         SetRectRgn( insidergn , parent->MacGetLeftBorderSize() , parent->MacGetTopBorderSize() , 
         parent->MacWindowToRootWindow( &x,&y ) ;
         wxSize size = parent->GetSize() ;
         SetRectRgn( insidergn , parent->MacGetLeftBorderSize() , parent->MacGetTopBorderSize() , 

-         size.x - parent->MacGetLeftBorderSize() - parent->MacGetRightBorderSize(), 
-         size.y - parent->MacGetTopBorderSize() - parent->MacGetBottomBorderSize()) ;
+         size.x - parent->MacGetRightBorderSize(), 
+         size.y - parent->MacGetBottomBorderSize()) ;

         CopyRgn( (RgnHandle) parent->MacGetVisibleRegion(false).GetWXHRGN() , m_newClip ) ;
        SectRgn( m_newClip , insidergn , m_newClip ) ;
         OffsetRgn( m_newClip , x , y ) ;
         CopyRgn( (RgnHandle) parent->MacGetVisibleRegion(false).GetWXHRGN() , m_newClip ) ;
        SectRgn( m_newClip , insidergn , m_newClip ) ;
         OffsetRgn( m_newClip , x , y ) ;

diff --git a/src/mac/window.cpp b/src/mac/window.cpp
index 70ffe076e7c3596ad914eee9a2214f3a4f174dba..0528ad58db9902ea4016aa58df63421f190a3e15 100644 (file)
--- a/src/mac/window.cpp
+++ b/src/mac/window.cpp
@@ -1666,8 +1666,8 @@ const wxRegion& wxWindowMac::MacGetVisibleRegion( bool respectChildrenAndSibling
 
       SetRectRgn( tempRgn , 
        x + parent->MacGetLeftBorderSize() , y + parent->MacGetTopBorderSize() , 
 
       SetRectRgn( tempRgn , 
        x + parent->MacGetLeftBorderSize() , y + parent->MacGetTopBorderSize() , 

-       x + size.x - parent->MacGetLeftBorderSize() - parent->MacGetRightBorderSize(), 
-       y + size.y - parent->MacGetTopBorderSize() - parent->MacGetBottomBorderSize()) ;
+       x + size.x - parent->MacGetRightBorderSize(), 
+       y + size.y - parent->MacGetBottomBorderSize()) ;

 
       SectRgn( visRgn , tempRgn , visRgn ) ;
       if ( parent->IsTopLevel() )
 
       SectRgn( visRgn , tempRgn , visRgn ) ;
       if ( parent->IsTopLevel() )