X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/cf511e872e3c4b7b6550bdd548aa1e1c3becef0a..6cef0db28018fd2644ee4e38af715872e5242459:/src/mac/carbon/renderer.cpp?ds=sidebyside

diff --git a/src/mac/carbon/renderer.cpp b/src/mac/carbon/renderer.cpp
index bf271a27bb..abcc1d6aa2 100644
--- a/src/mac/carbon/renderer.cpp
+++ b/src/mac/carbon/renderer.cpp
@@ -34,7 +34,7 @@ class WXDLLEXPORT wxRendererMac : public wxDelegateRendererNative
 {
 public:
     // draw the header control button (used by wxListCtrl)
-    virtual void DrawHeaderButton( wxWindow *win,
+    virtual int DrawHeaderButton( wxWindow *win,
         wxDC& dc,
         const wxRect& rect,
         int flags = 0,
@@ -42,7 +42,7 @@ public:
         wxHeaderButtonParams* params = NULL );
 
     virtual int GetHeaderButtonHeight(wxWindow *win);
-    
+
     // draw the expanded/collapsed icon for a tree control item
     virtual void DrawTreeItemButton( wxWindow *win,
         wxDC& dc,
@@ -57,21 +57,28 @@ public:
         wxOrientation orient,
         int flags = 0 );
 
+    virtual void DrawCheckBox(wxWindow *win,
+                              wxDC& dc,
+                              const wxRect& rect,
+                              int flags = 0);
+
     virtual void DrawComboBoxDropButton(wxWindow *win,
                                         wxDC& dc,
                                         const wxRect& rect,
                                         int flags = 0);
-    
+
     virtual void DrawPushButton(wxWindow *win,
                                 wxDC& dc,
                                 const wxRect& rect,
                                 int flags = 0);
-    
+
     virtual void DrawItemSelectionRect(wxWindow *win,
                                        wxDC& dc,
                                        const wxRect& rect,
                                        int flags = 0);
 
+    virtual void DrawFocusRect(wxWindow* win, wxDC& dc, const wxRect& rect, int flags = 0);
+
 private:
     void DrawMacThemeButton(wxWindow *win,
                             wxDC& dc,
@@ -79,7 +86,7 @@ private:
                             int flags,
                             int kind,
                             int adornment);
-        
+
     // the tree buttons
     wxBitmap m_bmpTreeExpanded;
     wxBitmap m_bmpTreeCollapsed;
@@ -97,62 +104,31 @@ wxRendererNative& wxRendererNative::GetDefault()
     return s_rendererMac;
 }
 
-void wxRendererMac::DrawHeaderButton( wxWindow *win,
+int wxRendererMac::DrawHeaderButton( wxWindow *win,
     wxDC& dc,
     const wxRect& rect,
     int flags,
     wxHeaderSortIconType sortArrow,
     wxHeaderButtonParams* params )
 {
-#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 =
-        {
-            (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 );
+        win->Refresh( &rect );
     }
     else
     {
         CGContextRef cgContext;
+        wxGCDCImpl *impl = (wxGCDCImpl*) dc.GetImpl();
 
-#if wxMAC_USE_CORE_GRAPHICS
-        cgContext = (CGContextRef) dc.GetGraphicsContext()->GetNativeContext();
-#else
-        Rect bounds;
-
-        GetPortBounds( (CGrafPtr) dc.m_macPort, &bounds );
-        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
+        cgContext = (CGContextRef) impl->GetGraphicsContext()->GetNativeContext();
 
         {
             HIThemeButtonDrawInfo drawInfo;
@@ -168,7 +144,7 @@ void wxRendererMac::DrawHeaderButton( wxWindow *win,
             // The down arrow is drawn automatically, change it to an up arrow if needed.
             if ( sortArrow == wxHDR_SORT_ICON_UP )
                 drawInfo.adornment = kThemeAdornmentHeaderButtonSortUp;
-                
+
             HIThemeDrawButton( &headerRect, &drawInfo, cgContext, kHIThemeOrientationNormal, &labelRect );
 
             // If we don't want any arrows we need to draw over the one already there
@@ -181,13 +157,8 @@ void wxRendererMac::DrawHeaderButton( wxWindow *win,
                 headerRect.size.width += 25;
                 HIThemeDrawButton( &headerRect, &drawInfo, cgContext, kHIThemeOrientationNormal, &labelRect );
                 CGContextRestoreGState( cgContext );
-            }                
+            }
         }
-
-#if wxMAC_USE_CORE_GRAPHICS
-#else
-        QDEndCGContext( (CGrafPtr) dc.m_macPort, &cgContext );
-#endif
     }
 
     // Reserve room for the arrows before writing the label, and turn off the
@@ -200,14 +171,14 @@ void wxRendererMac::DrawHeaderButton( wxWindow *win,
     }
     flags &= ~wxCONTROL_SELECTED;
 
-    DrawHeaderButtonContents(win, dc, newRect, flags, sortArrow, params);
+    return DrawHeaderButtonContents(win, dc, newRect, flags, sortArrow, params);
 }
 
 
 int wxRendererMac::GetHeaderButtonHeight(wxWindow* WXUNUSED(win))
 {
-    SInt32		standardHeight;
-    OSStatus		errStatus;
+    SInt32      standardHeight;
+    OSStatus        errStatus;
 
     errStatus = GetThemeMetric( kThemeMetricListHeaderHeight, &standardHeight );
     if (errStatus == noErr)
@@ -222,77 +193,39 @@ void wxRendererMac::DrawTreeItemButton( wxWindow *win,
     const wxRect& rect,
     int flags )
 {
-#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 =
-    {
-            (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 );
+        win->Refresh( &rect );
     }
     else
     {
         CGContextRef cgContext;
 
-#if wxMAC_USE_CORE_GRAPHICS
-        cgContext = (CGContextRef) dc.GetGraphicsContext()->GetNativeContext();
-#else
-        Rect bounds;
-
-        GetPortBounds( (CGrafPtr) dc.m_macPort, &bounds );
-        QDBeginCGContext( (CGrafPtr) dc.m_macPort, &cgContext );
+        wxGCDCImpl *impl = (wxGCDCImpl*) dc.GetImpl();
+        cgContext = (CGContextRef) impl->GetGraphicsContext()->GetNativeContext();
 
-        CGContextTranslateCTM( cgContext, 0, bounds.bottom - bounds.top );
-        CGContextScaleCTM( cgContext, 1, -1 );
+        HIThemeButtonDrawInfo drawInfo;
+        HIRect labelRect;
 
-        HIShapeReplacePathInCGContext( HIShapeCreateWithQDRgn( (RgnHandle) dc.m_macCurrentClipRgn ), cgContext );
-        CGContextClip( cgContext );
-        HIViewConvertRect( &headerRect, (HIViewRef) win->GetHandle(), (HIViewRef) win->MacGetTopLevelWindow()->GetHandle() );
-#endif
-
-    {
-            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
+        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 );
     }
 }
 
@@ -312,74 +245,42 @@ void wxRendererMac::DrawSplitterSash( wxWindow *win,
     else
         splitterRect = CGRectMake( 0, position, size.x, height );
 
-#if !wxMAC_USE_CORE_GRAPHICS
-    HIViewConvertRect(
-        &splitterRect,
-        (HIViewRef) win->GetHandle(),
-        (HIViewRef) win->MacGetTopLevelWindow()->GetHandle() );
-#endif
-
     // under compositing we should only draw when called by the OS, otherwise just issue a redraw command
     // strange redraw errors occur if we don't do this
 
     if ( !dc.IsKindOf( CLASSINFO( wxPaintDC ) ) )
     {
-        Rect r =
-        {
-            (short) splitterRect.origin.y,
-            (short) splitterRect.origin.x,
-            (short) (splitterRect.origin.y + splitterRect.size.height),
-            (short) (splitterRect.origin.x + splitterRect.size.width)
-        };
-
-        RgnHandle updateRgn = NewRgn();
-        RectRgn( updateRgn, &r );
-        HIViewSetNeedsDisplayInRegion( (HIViewRef) win->GetHandle(), updateRgn, true );
-        DisposeRgn( updateRgn );
-    }
+        wxRect rect( (int) splitterRect.origin.x, (int) splitterRect.origin.y, (int) splitterRect.size.width,
+                     (int) splitterRect.size.height );
+        win->Refresh( &rect );
+   }
     else
     {
         CGContextRef cgContext;
-
-#if wxMAC_USE_CORE_GRAPHICS
-        cgContext = (CGContextRef) dc.GetGraphicsContext()->GetNativeContext();
-#else
-        Rect bounds;
-        GetPortBounds( (CGrafPtr) dc.m_macPort, &bounds );
-        QDBeginCGContext( (CGrafPtr) dc.m_macPort, &cgContext );
-        CGContextTranslateCTM( cgContext, 0, bounds.bottom - bounds.top );
-        CGContextScaleCTM( cgContext, 1, -1 );
-#endif
+        wxGCDCImpl *impl = (wxGCDCImpl*) dc.GetImpl();
+        cgContext = (CGContextRef) impl->GetGraphicsContext()->GetNativeContext();
 
         HIThemeSplitterDrawInfo drawInfo;
         drawInfo.version = 0;
         drawInfo.state = kThemeStateActive;
         drawInfo.adornment = hasMetal ? kHIThemeSplitterAdornmentMetal : kHIThemeSplitterAdornmentNone;
         HIThemeDrawPaneSplitter( &splitterRect, &drawInfo, cgContext, kHIThemeOrientationNormal );
-
-#if wxMAC_USE_CORE_GRAPHICS
-#else
-        QDEndCGContext( (CGrafPtr) dc.m_macPort, &cgContext );
-#endif
     }
 }
 
 void
-wxRendererMac::DrawItemSelectionRect(wxWindow *win,
+wxRendererMac::DrawItemSelectionRect(wxWindow * WXUNUSED(win),
                                      wxDC& dc,
                                      const wxRect& rect,
-                                     int flags )
+                                     int flags)
 {
-    RGBColor selColor; 
-    if (flags & wxCONTROL_SELECTED)
-    {
-        if (flags & wxCONTROL_FOCUSED)
-            GetThemeBrushAsColor(kThemeBrushAlternatePrimaryHighlightColor, 32, true, &selColor);
-        else
-            GetThemeBrushAsColor(kThemeBrushSecondaryHighlightColor, 32, true, &selColor);
-    }
-    
-    wxBrush selBrush = wxBrush( wxColour( selColor.red, selColor.green, selColor.blue ), wxSOLID );
+    if ( !(flags & wxCONTROL_SELECTED) )
+        return;
+
+    wxColour col( wxMacCreateCGColorFromHITheme( (flags & wxCONTROL_FOCUSED) ?
+                                                 kThemeBrushAlternatePrimaryHighlightColor
+                                                                             : kThemeBrushSecondaryHighlightColor ) );
+    wxBrush selBrush( col );
 
     dc.SetPen( *wxTRANSPARENT_PEN );
     dc.SetBrush( selBrush );
@@ -395,77 +296,53 @@ wxRendererMac::DrawMacThemeButton(wxWindow *win,
                                   int kind,
                                   int adornment)
 {
-#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 =
-        {
-            (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 );
+        win->Refresh( &rect );
     }
     else
     {
+        wxGCDCImpl *impl = (wxGCDCImpl*) dc.GetImpl();
         CGContextRef cgContext;
+        cgContext = (CGContextRef) impl->GetGraphicsContext()->GetNativeContext();
 
-#if wxMAC_USE_CORE_GRAPHICS
-        cgContext = (CGContextRef) dc.GetGraphicsContext()->GetNativeContext();
-#else
-        Rect bounds;
-
-        GetPortBounds( (CGrafPtr) dc.m_macPort, &bounds );
-        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
-
-        {
-            HIThemeButtonDrawInfo drawInfo;
-            HIRect labelRect;
+        HIThemeButtonDrawInfo drawInfo;
+        HIRect labelRect;
 
-            memset( &drawInfo, 0, sizeof(drawInfo) );
-            drawInfo.version = 0;
-            drawInfo.kind = kind;
-            drawInfo.state = (flags & wxCONTROL_DISABLED) ? kThemeStateInactive : kThemeStateActive;
-            drawInfo.value = (flags & wxCONTROL_SELECTED) ? kThemeButtonOn : kThemeButtonOff;
-            drawInfo.adornment = adornment;
-
-            HIThemeDrawButton( &headerRect, &drawInfo, cgContext, kHIThemeOrientationNormal, &labelRect );
-        }
-
-#if wxMAC_USE_CORE_GRAPHICS
-#else
-        QDEndCGContext( (CGrafPtr) dc.m_macPort, &cgContext );
-#endif
+        memset( &drawInfo, 0, sizeof(drawInfo) );
+        drawInfo.version = 0;
+        drawInfo.kind = kind;
+        drawInfo.state = (flags & wxCONTROL_DISABLED) ? kThemeStateInactive : kThemeStateActive;
+        drawInfo.value = (flags & wxCONTROL_SELECTED) ? kThemeButtonOn : kThemeButtonOff;
+        if (flags & wxCONTROL_UNDETERMINED)
+            drawInfo.value = kThemeButtonMixed;
+        drawInfo.adornment = adornment;
+
+        HIThemeDrawButton( &headerRect, &drawInfo, cgContext, kHIThemeOrientationNormal, &labelRect );
     }
 }
 
+void
+wxRendererMac::DrawCheckBox(wxWindow *win,
+                            wxDC& dc,
+                            const wxRect& rect,
+                            int flags)
+{
+    if (flags & wxCONTROL_CHECKED)
+        flags |= wxCONTROL_SELECTED;
+
+    DrawMacThemeButton(win, dc, rect, flags,
+                       kThemeCheckBox, kThemeAdornmentNone);
+}
 
 void
 wxRendererMac::DrawComboBoxDropButton(wxWindow *win,
@@ -473,17 +350,59 @@ wxRendererMac::DrawComboBoxDropButton(wxWindow *win,
                               const wxRect& rect,
                               int flags)
 {
+    int kind;
+    if (win->GetWindowVariant() == wxWINDOW_VARIANT_SMALL || (win->GetParent() && win->GetParent()->GetWindowVariant() == wxWINDOW_VARIANT_SMALL))
+        kind = kThemeArrowButtonSmall;
+    else if (win->GetWindowVariant() == wxWINDOW_VARIANT_MINI || (win->GetParent() && win->GetParent()->GetWindowVariant() == wxWINDOW_VARIANT_MINI))
+        kind = kThemeArrowButtonMini;
+    else
+        kind = kThemeArrowButton;
+
     DrawMacThemeButton(win, dc, rect, flags,
-                       kThemeArrowButton, kThemeAdornmentArrowDownArrow);
+                       kind, kThemeAdornmentArrowDownArrow);
 }
-    
+
 void
 wxRendererMac::DrawPushButton(wxWindow *win,
                               wxDC& dc,
                               const wxRect& rect,
                               int flags)
 {
+    int kind;
+    if (win->GetWindowVariant() == wxWINDOW_VARIANT_SMALL || (win->GetParent() && win->GetParent()->GetWindowVariant() == wxWINDOW_VARIANT_SMALL))
+        kind = kThemeBevelButtonSmall;
+    // There is no kThemeBevelButtonMini, but in this case, use Small
+    else if (win->GetWindowVariant() == wxWINDOW_VARIANT_MINI || (win->GetParent() && win->GetParent()->GetWindowVariant() == wxWINDOW_VARIANT_MINI))
+        kind = kThemeBevelButtonSmall;
+    else
+        kind = kThemeBevelButton;
+
     DrawMacThemeButton(win, dc, rect, flags,
-                       kThemeBevelButton, kThemeAdornmentNone);
+                       kind, kThemeAdornmentNone);
+}
+
+void
+wxRendererMac::DrawFocusRect(wxWindow* win, wxDC& dc, const wxRect& rect, int flags)
+{
+    if (!win)
+    {
+        wxDelegateRendererNative::DrawFocusRect(win, dc, rect, flags);
+        return;
+    }
+
+    CGRect cgrect = CGRectMake( rect.x , rect.y , rect.width, rect.height ) ;
+
+    HIThemeFrameDrawInfo info ;
+    memset( &info, 0 , sizeof(info) ) ;
+
+    info.version = 0 ;
+    info.kind = 0 ;
+    info.state = kThemeStateActive;
+    info.isFocused = true ;
+
+    CGContextRef cgContext = (CGContextRef) win->MacGetCGContextRef() ;
+    wxASSERT( cgContext ) ;
+
+    HIThemeDrawFocusRect( &cgrect , true , cgContext , kHIThemeOrientationNormal ) ;
 }
-    
+