missing header file

[wxWidgets.git] / src / mac / carbon / renderer.cpp

diff --git a/src/mac/carbon/renderer.cpp b/src/mac/carbon/renderer.cpp
index cfa3a8138591898f7c8fae01f33d359e301f3828..8cc6fae7ddc8d8d74ff6823d7767dfdf539b8d38 100644 (file)
--- a/src/mac/carbon/renderer.cpp
+++ b/src/mac/carbon/renderer.cpp
@@ -1,22 +1,14 @@
 ///////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////

-// Name:        mac/renderer.cpp
+// Name:        src/mac/carbon/renderer.cpp

 // Purpose:     implementation of wxRendererNative for Mac
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     20.07.2003
 // RCS-ID:      $Id$
 // Copyright:   (c) 2003 Vadim Zeitlin <vadim@wxwindows.org>
 // Purpose:     implementation of wxRendererNative for Mac
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     20.07.2003
 // RCS-ID:      $Id$
 // Copyright:   (c) 2003 Vadim Zeitlin <vadim@wxwindows.org>

-// License:     wxWindows license
+// License:     wxWindows licence

 ///////////////////////////////////////////////////////////////////////////////
 
 ///////////////////////////////////////////////////////////////////////////////
 

-// ============================================================================
-// declarations
-// ============================================================================
-
-// ----------------------------------------------------------------------------
-// headers
-// ----------------------------------------------------------------------------
-

 // for compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 // for compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 


@@ -29,185 +21,323 @@
     #include "wx/dc.h"
     #include "wx/bitmap.h"
     #include "wx/settings.h"
     #include "wx/dc.h"
     #include "wx/bitmap.h"
     #include "wx/settings.h"

-#endif //WX_PRECOMP
+    #include "wx/dcclient.h"
+    #include "wx/toplevel.h"
+#endif

 
 #include "wx/renderer.h"
 
 #include "wx/renderer.h"

+#include "wx/graphics.h"
+#include "wx/mac/uma.h"

 
 

-// ----------------------------------------------------------------------------
-// wxRendererMac: our wxRendererNative implementation
-// ----------------------------------------------------------------------------

 
 class WXDLLEXPORT wxRendererMac : public wxDelegateRendererNative
 {
 public:
     // draw the header control button (used by wxListCtrl)
 
 class WXDLLEXPORT wxRendererMac : public wxDelegateRendererNative
 {
 public:
     // draw the header control button (used by wxListCtrl)

-    virtual void DrawHeaderButton(wxWindow *win,
-                                  wxDC& dc,
-                                  const wxRect& rect,
-                                  int flags = 0);
-
+    virtual void DrawHeaderButton( wxWindow *win,
+        wxDC& dc,
+        const wxRect& rect,
+        int flags = 0,
+        wxHeaderSortIconType sortArrow = wxHDR_SORT_ICON_NONE,
+        wxHeaderButtonParams* params = NULL );
+
+    virtual int GetHeaderButtonHeight(wxWindow *win);
+    

     // draw the expanded/collapsed icon for a tree control item
     // draw the expanded/collapsed icon for a tree control item

-    virtual void DrawTreeItemButton(wxWindow *win,
-                                    wxDC& dc,
-                                    const wxRect& rect,
-                                    int flags = 0);
+    virtual void DrawTreeItemButton( wxWindow *win,
+        wxDC& dc,
+        const wxRect& rect,
+        int flags = 0 );

 
     // draw a (vertical) sash
 
     // draw a (vertical) sash

-    virtual void DrawSplitterSash(wxWindow *win,
-                                  wxDC& dc,
-                                  const wxSize& size,
-                                  wxCoord position);
+    virtual void DrawSplitterSash( wxWindow *win,
+        wxDC& dc,
+        const wxSize& size,
+        wxCoord position,
+        wxOrientation orient,
+        int flags = 0 );

 
 private:
     // the tree buttons
 
 private:
     // the tree buttons

-    wxBitmap m_bmpTreeExpanded,
-             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      "
+    wxBitmap m_bmpTreeExpanded;
+    wxBitmap m_bmpTreeCollapsed;

 };
 
 // ============================================================================
 // implementation
 // ============================================================================
 
 };
 
 // ============================================================================
 // implementation
 // ============================================================================
 

-/* static */
-wxRendererNative& wxRendererNative::Get()
+// static
+wxRendererNative& wxRendererNative::GetDefault()

 {
     static wxRendererMac s_rendererMac;
 
     return s_rendererMac;
 }
 
 {
     static wxRendererMac s_rendererMac;
 
     return s_rendererMac;
 }
 

-void
-wxRendererMac::DrawHeaderButton(wxWindow *win,
-                                wxDC& dc,
-                                const wxRect& rect,
-                                int WXUNUSED(flags))
+void wxRendererMac::DrawHeaderButton( wxWindow *win,
+    wxDC& dc,
+    const wxRect& rect,
+    int flags,
+    wxHeaderSortIconType sortArrow,
+    wxHeaderButtonParams* params )

 {
 {

-    const int CORNER = 1;
-
-    const wxCoord x = rect.x,
-                  y = rect.y,
-                  w = rect.width,
-                  h = rect.height;
+#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 );
 
 
     dc.SetBrush( *wxTRANSPARENT_BRUSH );
 

-    dc.SetPen( wxPen( wxSystemSettings::GetColour( wxSYS_COLOUR_BTNSHADOW ) , 1 , wxSOLID ) );
-    dc.DrawLine( x+w-CORNER+1, y, x+w, y+h );       // right (outer)
-    dc.DrawRectangle( x, y+h, w+1, 1 );             // bottom (outer)
+    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 );
+    }
+    else
+    {
+        CGContextRef cgContext;
+
+#if wxMAC_USE_CORE_GRAPHICS
+        cgContext = (CGContextRef) dc.GetGraphicsContext()->GetNativeContext();
+#else
+        Rect bounds;

 
 

-    wxPen pen( wxColour( 0x88 , 0x88 , 0x88 ), 1, wxSOLID );
+        GetPortBounds( (CGrafPtr) dc.m_macPort, &bounds );
+        QDBeginCGContext( (CGrafPtr) dc.m_macPort, &cgContext );

 
 

-    dc.SetPen( pen );
-    dc.DrawLine( x+w-CORNER, y, x+w-1, y+h );       // right (inner)
-    dc.DrawRectangle( x+1, y+h-1, w-2, 1 );         // bottom (inner)
+        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;
+
+            memset( &drawInfo, 0, sizeof(drawInfo) );
+            drawInfo.version = 0;
+            drawInfo.kind = kThemeListHeaderButton;
+            drawInfo.state = (flags & wxCONTROL_DISABLED) ? kThemeStateInactive : kThemeStateActive;
+            drawInfo.value = (flags & wxCONTROL_SELECTED) ? kThemeButtonOn : kThemeButtonOff;
+            drawInfo.adornment = kThemeAdornmentNone;
+
+            // 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
+            if ( (flags & wxCONTROL_SELECTED) && (sortArrow == wxHDR_SORT_ICON_NONE) )
+            {
+                // clip to the header rectangle
+                CGContextSaveGState( cgContext );
+                CGContextClipToRect( cgContext, headerRect );
+                // but draw bigger than that so the arrow will get clipped off
+                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
+    }

 
 

-    dc.SetPen( *wxWHITE_PEN );
-    dc.DrawRectangle( x, y, w-CORNER+1, 1 );        // top (outer)
-    dc.DrawRectangle( x, y, 1, h );                 // left (outer)
-    dc.DrawLine( x, y+h-1, x+1, y+h-1 );
-    dc.DrawLine( x+w-1, y, x+w-1, y+1 );
+    // Reserve room for the arrows before writing the label, and turn off the
+    // flags we've already handled
+    wxRect newRect(rect);
+    if ( (flags & wxCONTROL_SELECTED) && (sortArrow != wxHDR_SORT_ICON_NONE) )
+    {
+        newRect.width -= 12;
+        sortArrow = wxHDR_SORT_ICON_NONE;
+    }
+    flags &= ~wxCONTROL_SELECTED;
+
+    DrawHeaderButtonContents(win, dc, newRect, flags, sortArrow, params);

 }
 
 }
 

-void
-wxRendererMac::DrawTreeItemButton(wxWindow *win,
-                                  wxDC& dc,
-                                  const wxRect& rect,
-                                  int flags)
+
+int wxRendererMac::GetHeaderButtonHeight(wxWindow* WXUNUSED(win))

 {
 {

-    // init the buttons on demand
-    if ( !m_bmpTreeExpanded.Ok() )
+    SInt32             standardHeight;
+    OSStatus           errStatus;
+
+    errStatus = GetThemeMetric( kThemeMetricListHeaderHeight, &standardHeight );
+    if (errStatus == noErr)

     {
     {

-        m_bmpTreeExpanded = wxBitmap(aqua_arrow_down_xpm);
-        m_bmpTreeCollapsed = wxBitmap(aqua_arrow_right_xpm);
+        return standardHeight;

     }
     }

-
-    // draw them
-
-    // 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
-#if 0 // def __WXMAC__
-    wxMacPortSetter helper(&dc) ;
-    wxMacWindowClipper clipper(this) ;
-    wxDC::MacSetupBackgroundForCurrentPort( MacGetBackgroundBrush() ) ;
-
-    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 */);
-#endif // 0/1
+    return -1;

 }
 
 }
 

-void
-wxRendererMac::DrawSplitterSash(wxWindow *win,
-                                wxDC& dc,
-                                const wxSize& size,
-                                wxCoord position)
+void wxRendererMac::DrawTreeItemButton( wxWindow *win,
+    wxDC& dc,
+    const wxRect& rect,
+    int flags )

 {
 {

-    // VZ: we have to somehow determine if we're drawing a normal sash or
-    //     a brushed metal one as they look quite differently... this is
-    //     completely bogus anyhow, of course (TODO)
+#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    

 
 

-    const wxCoord h = size.y;
+    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 );
+    }
+    else
+    {
+        CGContextRef cgContext;
+
+#if wxMAC_USE_CORE_GRAPHICS
+        cgContext = (CGContextRef) dc.GetGraphicsContext()->GetNativeContext();
+#else
+        Rect bounds;

 
 

-    dc.SetPen(*wxLIGHT_GREY_PEN);
-    dc.SetBrush(*wxWHITE_BRUSH);
-    dc.DrawRectangle(position, 0, 7, h);
+        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;
+
+            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,
+    wxDC& dc,
+    const wxSize& size,
+    wxCoord position,
+    wxOrientation orient,
+    int WXUNUSED(flags) )
+{
+    bool hasMetal = win->MacGetTopLevelWindow()->MacGetMetalAppearance();
+    SInt32 height;
+    GetThemeMetric( kThemeMetricSmallPaneSplitterHeight, &height );
+    HIRect splitterRect;
+    if (orient == wxVERTICAL)
+        splitterRect = CGRectMake( position, 0, height, size.y );
+    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 );
+    }
+    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
+
+        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
+    }
+}