From: Stefan Csomor <csomor@advancedconcepts.ch>
Date: Sat, 26 Mar 2005 05:12:57 +0000 (+0000)
Subject: correct scrolling and clipping of list headers
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/6fe1627ca033c38d4650b22691b34ce4c216ab35

correct scrolling and clipping of list headers


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

diff --git a/src/mac/carbon/renderer.cpp b/src/mac/carbon/renderer.cpp
index d726076a49..62ff9846c9 100644
--- a/src/mac/carbon/renderer.cpp
+++ b/src/mac/carbon/renderer.cpp
@@ -135,10 +135,10 @@ wxRendererMac::DrawHeaderButton(wxWindow *win,
                                 const wxRect& rect,
                                 int flags)
 {
-    const wxCoord x = rect.x-1,
-                  y = rect.y-1,
-                  w = rect.width,
-                  h = rect.height;
+    const wxCoord x = dc.XLOG2DEV(rect.x-1),
+                  y = dc.YLOG2DEV(rect.y-1),
+                  w = dc.XLOG2DEVREL(rect.width),
+                  h = dc.YLOG2DEVREL(rect.height);
 
     int major,minor;
     wxGetOsVersion( &major, &minor );
@@ -169,6 +169,8 @@ wxRendererMac::DrawHeaderButton(wxWindow *win,
             QDBeginCGContext( (CGrafPtr) dc.m_macPort , &cgContext ) ;
             CGContextTranslateCTM( cgContext , 0 , bounds.bottom - bounds.top ) ;
             CGContextScaleCTM( cgContext , 1 , -1 ) ;
+			HIShapeReplacePathInCGContext( HIShapeCreateWithQDRgn( (RgnHandle) dc.m_macCurrentClipRgn ) , cgContext ) ;
+			CGContextClip( cgContext ) ; 
             HIViewConvertRect( &headerRect , (HIViewRef) win->GetHandle() , (HIViewRef) win->MacGetTopLevelWindow()->GetHandle() ) ;
 #endif
             {