added option for getting visible region w/o children clipped, added to redrawing of control code

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

src/mac/carbon/control.cpp

@@ -42,6 +42,7 @@ END_EVENT_TABLE()
 #endif
 
 #include "wx/mac/uma.h"
+#include "wx/mac/private.h"
 
 // Item members
 
@@ -695,12 +696,13 @@ void wxControl::MacRedrawControl()
         wxClientDC dc(this) ;
         wxMacPortSetter helper(&dc) ;
 
-        // the controls sometimes draw outside their boundaries, this
+        int x = 0 , y = 0;
-        // should be resolved differently but is not trivial (e.g. drop shadows)
+        GetParent()->MacWindowToRootWindow( &x,&y ) ;
-        // since adding them to the border would yield in enormous gaps between
+        RgnHandle clrgn = NewRgn() ;
-        // the controls
+        CopyRgn( (RgnHandle) GetParent()->MacGetVisibleRegion().GetWXHRGN() , clrgn ) ;
-        Rect r = { 0 , 0 , 32000 , 32000 } ;
+        OffsetRgn( clrgn , x , y ) ;
-        ClipRect( &r ) ;
+        SetClip( clrgn ) ;
+
         wxDC::MacSetupBackgroundForCurrentPort( MacGetBackgroundBrush() ) ;
         UMADrawControl( (ControlHandle) m_macControl ) ;
     }
@@ -712,12 +714,13 @@ void wxControl::OnPaint(wxPaintEvent& event)
     {
         wxPaintDC dc(this) ;
         wxMacPortSetter helper(&dc) ;
-        // the controls sometimes draw outside their boundaries, this
+
-        // should be resolved differently but is not trivial (e.g. drop shadows)
+        int x = 0 , y = 0;
-        // since adding them to the border would yield in enormous gaps between
+        GetParent()->MacWindowToRootWindow( &x,&y ) ;
-        // the controls
+        RgnHandle clrgn = NewRgn() ;
-        Rect r = { 0 , 0 , 32000 , 32000 } ;
+        CopyRgn( (RgnHandle) GetParent()->MacGetVisibleRegion().GetWXHRGN() , clrgn ) ;
-        ClipRect( &r ) ;
+        OffsetRgn( clrgn , x , y ) ;
+        SetClip( clrgn ) ;
 
         wxDC::MacSetupBackgroundForCurrentPort( MacGetBackgroundBrush() ) ;
         UMADrawControl( (ControlHandle) m_macControl ) ;

src/mac/carbon/window.cpp

@@ -1542,7 +1542,7 @@ wxTopLevelWindowMac* wxWindowMac::MacGetTopLevelWindow() const
     return win ;
 }
 
-const wxRegion& wxWindowMac::MacGetVisibleRegion()
+const wxRegion& wxWindowMac::MacGetVisibleRegion( bool respectChildrenAndSiblings )
 {
   RgnHandle visRgn = NewRgn() ;
   RgnHandle tempRgn = NewRgn() ;
@@ -1576,6 +1576,8 @@ const wxRegion& wxWindowMac::MacGetVisibleRegion()
       parent = parent->GetParent() ;
     }
   }
+  if ( respectChildrenAndSiblings )
+  {
       if ( GetWindowStyle() & wxCLIP_CHILDREN )
       {
         for (wxNode *node = GetChildren().First(); node; node = node->Next())
@@ -1613,6 +1615,7 @@ const wxRegion& wxWindowMac::MacGetVisibleRegion()
             }
         }
       }
+  }
   m_macVisibleRegion = visRgn ;
   DisposeRgn( visRgn ) ;
   DisposeRgn( tempRgn ) ;

src/mac/control.cpp

@@ -42,6 +42,7 @@ END_EVENT_TABLE()
 #endif
 
 #include "wx/mac/uma.h"
+#include "wx/mac/private.h"
 
 // Item members
 
@@ -695,12 +696,13 @@ void wxControl::MacRedrawControl()
         wxClientDC dc(this) ;
         wxMacPortSetter helper(&dc) ;
 
-        // the controls sometimes draw outside their boundaries, this
+        int x = 0 , y = 0;
-        // should be resolved differently but is not trivial (e.g. drop shadows)
+        GetParent()->MacWindowToRootWindow( &x,&y ) ;
-        // since adding them to the border would yield in enormous gaps between
+        RgnHandle clrgn = NewRgn() ;
-        // the controls
+        CopyRgn( (RgnHandle) GetParent()->MacGetVisibleRegion().GetWXHRGN() , clrgn ) ;
-        Rect r = { 0 , 0 , 32000 , 32000 } ;
+        OffsetRgn( clrgn , x , y ) ;
-        ClipRect( &r ) ;
+        SetClip( clrgn ) ;
+
         wxDC::MacSetupBackgroundForCurrentPort( MacGetBackgroundBrush() ) ;
         UMADrawControl( (ControlHandle) m_macControl ) ;
     }
@@ -712,12 +714,13 @@ void wxControl::OnPaint(wxPaintEvent& event)
     {
         wxPaintDC dc(this) ;
         wxMacPortSetter helper(&dc) ;
-        // the controls sometimes draw outside their boundaries, this
+
-        // should be resolved differently but is not trivial (e.g. drop shadows)
+        int x = 0 , y = 0;
-        // since adding them to the border would yield in enormous gaps between
+        GetParent()->MacWindowToRootWindow( &x,&y ) ;
-        // the controls
+        RgnHandle clrgn = NewRgn() ;
-        Rect r = { 0 , 0 , 32000 , 32000 } ;
+        CopyRgn( (RgnHandle) GetParent()->MacGetVisibleRegion().GetWXHRGN() , clrgn ) ;
-        ClipRect( &r ) ;
+        OffsetRgn( clrgn , x , y ) ;
+        SetClip( clrgn ) ;
 
         wxDC::MacSetupBackgroundForCurrentPort( MacGetBackgroundBrush() ) ;
         UMADrawControl( (ControlHandle) m_macControl ) ;

src/mac/window.cpp

@@ -1542,7 +1542,7 @@ wxTopLevelWindowMac* wxWindowMac::MacGetTopLevelWindow() const
     return win ;
 }
 
-const wxRegion& wxWindowMac::MacGetVisibleRegion()
+const wxRegion& wxWindowMac::MacGetVisibleRegion( bool respectChildrenAndSiblings )
 {
   RgnHandle visRgn = NewRgn() ;
   RgnHandle tempRgn = NewRgn() ;
@@ -1576,6 +1576,8 @@ const wxRegion& wxWindowMac::MacGetVisibleRegion()
       parent = parent->GetParent() ;
     }
   }
+  if ( respectChildrenAndSiblings )
+  {
       if ( GetWindowStyle() & wxCLIP_CHILDREN )
       {
         for (wxNode *node = GetChildren().First(); node; node = node->Next())
@@ -1613,6 +1615,7 @@ const wxRegion& wxWindowMac::MacGetVisibleRegion()
             }
         }
       }
+  }
   m_macVisibleRegion = visRgn ;
   DisposeRgn( visRgn ) ;
   DisposeRgn( tempRgn ) ;