X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/7e4a196e34ea16231f4dae3bf2c7ee0d324565a4..b9b1f368fe78f4f52dd355faf9f7c0672659697d:/src/mac/window.cpp

diff --git a/src/mac/window.cpp b/src/mac/window.cpp
index d462f005b9..5e485ecf64 100644
--- a/src/mac/window.cpp
+++ b/src/mac/window.cpp
@@ -638,12 +638,40 @@ void wxWindowMac::DoMoveWindow(int x, int y, int width, int height)
                 oldRgn = NewRgn() ;
                 newRgn = NewRgn() ;
                 diffRgn = NewRgn() ;
+                
+                // invalidate the differences between the old and the new area
+                
                 SetRectRgn(oldRgn , oldPos.x , oldPos.y , oldPos.x + m_width , oldPos.y + m_height ) ;
                 SetRectRgn(newRgn , newPos.x , newPos.y , newPos.x + actualWidth , newPos.y + actualHeight ) ;
                 DiffRgn( newRgn , oldRgn , diffRgn ) ;
                 InvalWindowRgn( (WindowRef) MacGetRootWindow() , diffRgn ) ;
                 DiffRgn( oldRgn , newRgn , diffRgn ) ;
                 InvalWindowRgn( (WindowRef) MacGetRootWindow() , diffRgn ) ;
+                
+                // we also must invalidate the border areas, someone might optimize this one day to invalidate only the really
+                // changing pixels...
+                
+                if ( MacGetLeftBorderSize() != 0 || MacGetRightBorderSize() != 0 || 
+                	MacGetTopBorderSize() != 0 || MacGetBottomBorderSize() != 0 )
+                {
+                	RgnHandle innerOldRgn, innerNewRgn ;
+                	innerOldRgn = NewRgn() ;
+                	innerNewRgn = NewRgn() ;
+                	
+                	SetRectRgn(innerOldRgn , oldPos.x + MacGetLeftBorderSize()  , oldPos.y + MacGetTopBorderSize() , 
+                		oldPos.x + m_width - MacGetRightBorderSize() , oldPos.y + m_height - MacGetBottomBorderSize() ) ;
+    	            DiffRgn( oldRgn , innerOldRgn , diffRgn ) ;
+	                InvalWindowRgn( (WindowRef) MacGetRootWindow() , diffRgn ) ;
+
+                	SetRectRgn(innerNewRgn , newPos.x + MacGetLeftBorderSize()  , newPos.y + MacGetTopBorderSize() , 
+                		newPos.x + actualWidth - MacGetRightBorderSize() , newPos.y + actualHeight - MacGetBottomBorderSize() ) ;
+    	            DiffRgn( newRgn , innerNewRgn , diffRgn ) ;
+	                InvalWindowRgn( (WindowRef) MacGetRootWindow() , diffRgn ) ;
+	                
+                	DisposeRgn( innerOldRgn ) ;
+                	DisposeRgn( innerNewRgn ) ;
+                }
+                
                 DisposeRgn(oldRgn) ;
                 DisposeRgn(newRgn) ;
                 DisposeRgn(diffRgn) ;
@@ -1467,11 +1495,7 @@ bool wxWindowMac::MacSetupCursor( const wxPoint& pt)
 }
 
 bool wxWindowMac::MacDispatchMouseEvent(wxMouseEvent& event)
-{
-    //In case a third-party component changed the port...
-    wxMacPortStateHelper help( (GrafPtr) GetWindowPort( (WindowRef) MacGetRootWindow()) ) ;
-    wxMacWindowClipper clip (this);
-    
+{    
     if ((event.m_x < m_x) || (event.m_y < m_y) ||
         (event.m_x > (m_x + m_width)) || (event.m_y > (m_y + m_height)))
         return FALSE;