X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/977d15a6ae64752c3ae70824c115229ecbe98403..7564225f8bff6e6c2ed27695836035fa85a81189:/src/mac/carbon/renderer.cpp

diff --git a/src/mac/carbon/renderer.cpp b/src/mac/carbon/renderer.cpp
index 63e7b22333..8cc6fae7dd 100644
--- a/src/mac/carbon/renderer.cpp
+++ b/src/mac/carbon/renderer.cpp
@@ -26,6 +26,7 @@
 #endif
 
 #include "wx/renderer.h"
+#include "wx/graphics.h"
 #include "wx/mac/uma.h"
 
 
@@ -62,58 +63,6 @@ private:
     wxBitmap m_bmpTreeCollapsed;
 };
 
-// ----------------------------------------------------------------------------
-// Aqua arrows
-// ----------------------------------------------------------------------------
-
-/* XPM */
-static const char *aqua_arrow_right_xpm[] =
-{
-// columns rows colors chars-per-pixel
-"13 11 4 1",
-"  c None",
-"b c #C0C0C0",
-"c c #707070",
-"d c #A0A0A0",
-
-// pixels
-"    b        ",
-"    ddb      ",
-"    cccdb    ",
-"    cccccd   ",
-"    ccccccdb ",
-"    ccccccccd",
-"    ccccccdb ",
-"    cccccb   ",
-"    cccdb    ",
-"    ddb      ",
-"    b        "
-};
-
-/* XPM */
-static const char *aqua_arrow_down_xpm[] =
-{
-// columns rows colors chars-per-pixel
-"13 11 4 1",
-"  c None",
-"b c #C0C0C0",
-"c c #707070",
-"d c #A0A0A0",
-
-// pixels
-"             ",
-"             ",
-" bdcccccccdb ",
-"  dcccccccd  ",
-"  bcccccccb  ",
-"   dcccccd   ",
-"   bcccccb   ",
-"    bcccd    ",
-"     dcd     ",
-"     bcb     ",
-"      d      "
-};
-
 // ============================================================================
 // implementation
 // ============================================================================
@@ -133,10 +82,18 @@ void wxRendererMac::DrawHeaderButton( wxWindow *win,
     wxHeaderSortIconType sortArrow,
     wxHeaderButtonParams* params )
 {
-    const wxCoord x = dc.LogicalToDeviceX(rect.x /*- 1*/);
-    const wxCoord y = dc.LogicalToDeviceY(rect.y /*- 1*/);
+#if !wxMAC_USE_CORE_GRAPHICS
+    const wxCoord x = dc.LogicalToDeviceX(rect.x);
+    const wxCoord y = dc.LogicalToDeviceY(rect.y);
     const wxCoord w = dc.LogicalToDeviceXRel(rect.width);
     const wxCoord h = dc.LogicalToDeviceYRel(rect.height);
+#else
+    // now the wxGCDC is using native transformations
+    const wxCoord x = rect.x;
+    const wxCoord y = rect.y;
+    const wxCoord w = rect.width;
+    const wxCoord h = rect.height;
+#endif
 
     dc.SetBrush( *wxTRANSPARENT_BRUSH );
 
@@ -160,7 +117,7 @@ void wxRendererMac::DrawHeaderButton( wxWindow *win,
         CGContextRef cgContext;
 
 #if wxMAC_USE_CORE_GRAPHICS
-        cgContext = (CGContextRef) dc.GetGraphicContext()->GetNativeContext();
+        cgContext = (CGContextRef) dc.GetGraphicsContext()->GetNativeContext();
 #else
         Rect bounds;
 
@@ -238,49 +195,83 @@ int wxRendererMac::GetHeaderButtonHeight(wxWindow* WXUNUSED(win))
     return -1;
 }
 
-
 void wxRendererMac::DrawTreeItemButton( wxWindow *win,
     wxDC& dc,
     const wxRect& rect,
     int flags )
 {
-    // init the buttons on demand
-    if ( !m_bmpTreeExpanded.Ok() )
+#if !wxMAC_USE_CORE_GRAPHICS
+    const wxCoord x = dc.LogicalToDeviceX(rect.x);
+    const wxCoord y = dc.LogicalToDeviceY(rect.y);
+    const wxCoord w = dc.LogicalToDeviceXRel(rect.width);
+    const wxCoord h = dc.LogicalToDeviceYRel(rect.height);
+#else
+    // now the wxGCDC is using native transformations
+    const wxCoord x = rect.x;
+    const wxCoord y = rect.y;
+    const wxCoord w = rect.width;
+    const wxCoord h = rect.height;
+#endif    
+
+    dc.SetBrush( *wxTRANSPARENT_BRUSH );
+
+    HIRect headerRect = CGRectMake( x, y, w, h );
+    if ( !dc.IsKindOf( CLASSINFO( wxPaintDC ) ) )
+    {
+        Rect r =
     {
-        m_bmpTreeExpanded = wxBitmap(aqua_arrow_down_xpm);
-        m_bmpTreeCollapsed = wxBitmap(aqua_arrow_right_xpm);
+            (short) headerRect.origin.y, (short) headerRect.origin.x,
+            (short) (headerRect.origin.y + headerRect.size.height),
+            (short) (headerRect.origin.x + headerRect.size.width)
+        };
+
+        RgnHandle updateRgn = NewRgn();
+        RectRgn( updateRgn, &r );
+        HIViewSetNeedsDisplayInRegion( (HIViewRef) win->GetHandle(), updateRgn, true );
+        DisposeRgn( updateRgn );
     }
+    else
+    {
+        CGContextRef cgContext;
 
-    // draw them
+#if wxMAC_USE_CORE_GRAPHICS
+        cgContext = (CGContextRef) dc.GetGraphicsContext()->GetNativeContext();
+#else
+        Rect bounds;
 
-    // VZ: this is the old code from treectlg.cpp which apparently doesn't work
-    //     but I kept it here just in case it is needed -- if not, please
-    //     remove it
+        GetPortBounds( (CGrafPtr) dc.m_macPort, &bounds );
+        QDBeginCGContext( (CGrafPtr) dc.m_macPort, &cgContext );
+
+        CGContextTranslateCTM( cgContext, 0, bounds.bottom - bounds.top );
+        CGContextScaleCTM( cgContext, 1, -1 );
 
-#if 0 // def __WXMAC__
-    wxMacPortSetter helper(&dc);
-    wxMacWindowClipper clipper(this);
-    wxDC::MacSetupBackgroundForCurrentPort( MacGetBackgroundBrush() );
+        HIShapeReplacePathInCGContext( HIShapeCreateWithQDRgn( (RgnHandle) dc.m_macCurrentClipRgn ), cgContext );
+        CGContextClip( cgContext );
+        HIViewConvertRect( &headerRect, (HIViewRef) win->GetHandle(), (HIViewRef) win->MacGetTopLevelWindow()->GetHandle() );
+#endif
 
-    int loc_x = x - 5;
-    int loc_y = y_mid - 6;
-    MacWindowToRootWindow( &loc_x, &loc_y );
-    Rect bounds = { loc_y, loc_x, loc_y + 18, loc_x + 12 };
-    ThemeButtonDrawInfo info =
     {
-        kThemeStateActive,
-        item->IsExpanded() ? kThemeDisclosureDown : kThemeDisclosureRight,
-        kThemeAdornmentNone
-    };
-
-    DrawThemeButton( &bounds, kThemeDisclosureButton, &info, NULL, NULL, NULL, NULL );
-#else // 1
-    dc.DrawBitmap(
-        flags & wxCONTROL_EXPANDED
-        ? m_bmpTreeExpanded
-        : m_bmpTreeCollapsed,
-         rect.x, rect.y, true /* use mask */);
+            HIThemeButtonDrawInfo drawInfo;
+            HIRect labelRect;
+
+            memset( &drawInfo, 0, sizeof(drawInfo) );
+            drawInfo.version = 0;
+            drawInfo.kind = kThemeDisclosureButton;
+            drawInfo.state = (flags & wxCONTROL_DISABLED) ? kThemeStateInactive : kThemeStateActive;
+            // Apple mailing list posts say to use the arrow adornment constants, but those don't work.
+            // We need to set the value using the 'old' DrawThemeButton constants instead.
+            drawInfo.value = (flags & wxCONTROL_EXPANDED) ? kThemeDisclosureDown : kThemeDisclosureRight;
+            drawInfo.adornment = kThemeAdornmentNone; 
+
+            HIThemeDrawButton( &headerRect, &drawInfo, cgContext, kHIThemeOrientationNormal, &labelRect );
+            
+        }
+
+#if wxMAC_USE_CORE_GRAPHICS
+#else
+        QDEndCGContext( (CGrafPtr) dc.m_macPort, &cgContext );
 #endif
+    }
 }
 
 void wxRendererMac::DrawSplitterSash( wxWindow *win,
@@ -329,7 +320,7 @@ void wxRendererMac::DrawSplitterSash( wxWindow *win,
         CGContextRef cgContext;
 
 #if wxMAC_USE_CORE_GRAPHICS
-        cgContext = (CGContextRef) dc.GetGraphicContext()->GetNativeContext();
+        cgContext = (CGContextRef) dc.GetGraphicsContext()->GetNativeContext();
 #else
         Rect bounds;
         GetPortBounds( (CGrafPtr) dc.m_macPort, &bounds );