gcc printf format warning fixed

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

diff --git a/src/mac/carbon/renderer.cpp b/src/mac/carbon/renderer.cpp
index 734a26e74da34960f6ce182091e888c845738374..6735b1f62b26a7aabab7337f40627617adddbcd4 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,40 +21,41 @@
     #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"
+#endif

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

+#include "wx/toplevel.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 );

 
     // 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,
-                                  wxOrientation orient);
+    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;
+    wxBitmap m_bmpTreeExpanded;
+    wxBitmap m_bmpTreeCollapsed;

 };
 
 // ----------------------------------------------------------------------------
 };
 
 // ----------------------------------------------------------------------------


@@ -70,14 +63,16 @@ private:
 // ----------------------------------------------------------------------------
 
 /* XPM */
 // ----------------------------------------------------------------------------
 
 /* XPM */

-static const char *aqua_arrow_right_xpm[] = {
-/* columns rows colors chars-per-pixel */
+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",
 "13 11 4 1",
 "  c None",
 "b c #C0C0C0",
 "c c #707070",
 "d c #A0A0A0",

-/* pixels */
+
+// pixels

 "    b        ",
 "    ddb      ",
 "    cccdb    ",
 "    b        ",
 "    ddb      ",
 "    cccdb    ",


@@ -92,14 +87,16 @@ static const char *aqua_arrow_right_xpm[] = {
 };
 
 /* XPM */
 };
 
 /* XPM */

-static const char *aqua_arrow_down_xpm[] = {
-/* columns rows colors chars-per-pixel */
+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",
 "13 11 4 1",
 "  c None",
 "b c #C0C0C0",
 "c c #707070",
 "d c #A0A0A0",

-/* pixels */
+
+// pixels

 "             ",
 "             ",
 " bdcccccccdb ",
 "             ",
 "             ",
 " bdcccccccdb ",


@@ -117,51 +114,112 @@ static const char *aqua_arrow_down_xpm[] = {
 // 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 )

 {
 {

-    const int CORNER = 1;
+    int major, minor;

 
 

-    const wxCoord x = rect.x,
-                  y = rect.y,
-                  w = rect.width,
-                  h = rect.height;
+    wxGetOsVersion( &major, &minor );
+
+    const wxCoord x = dc.XLOG2DEV(rect.x - 1);
+    const wxCoord y = dc.YLOG2DEV(rect.y - 1);
+    const wxCoord w = dc.XLOG2DEVREL(rect.width);
+    const wxCoord h = dc.YLOG2DEVREL(rect.height);

 
     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)
+#if defined(__WXMAC_OSX__) && ( MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_3 )
+    if ( HIThemeDrawButton != 0 )
+    {
+        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 = ((wxMacCGContext*)(dc.GetGraphicContext()))->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 );

 
 

-    wxPen pen( wxColour( 0x88 , 0x88 , 0x88 ), 1, wxSOLID );
+            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.state = (flags & wxCONTROL_DISABLED) ? kThemeStateInactive : kThemeStateActive;
+                drawInfo.kind = kThemeListHeaderButton;
+                drawInfo.value = 0;
+                drawInfo.adornment = kThemeAdornmentNone;
+                HIThemeDrawButton( &headerRect, &drawInfo, cgContext, kHIThemeOrientationNormal, &labelRect );
+            }

 
 

-    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)
+#if wxMAC_USE_CORE_GRAPHICS
+#else
+            QDEndCGContext( (CGrafPtr) dc.m_macPort, &cgContext );
+#endif
+        }
+    }
+    else
+#endif
+    {
+        wxMacWindowClipper clipper(win);
+        Rect rect = { y, x, y + h, x + w };
+        wxPoint origin = win->GetClientAreaOrigin();
+        int dx, dy;
+        dx = origin.x;
+        dy = origin.y;
+        win->MacWindowToRootWindow( &dx, &dy );
+        OffsetRect( &rect, dx, dy );

 
 

-    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 );
+        ThemeButtonDrawInfo drawInfo;
+        memset( &drawInfo, 0, sizeof(drawInfo) );
+        drawInfo.state = (flags & wxCONTROL_DISABLED) ? kThemeStateInactive : kThemeStateActive;
+        drawInfo.value = 0;
+        drawInfo.adornment = kThemeAdornmentNone;
+        DrawThemeButton( &rect, kThemeListHeaderButton, &drawInfo, NULL, NULL, NULL, 0 );
+    }

 }
 
 }
 

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

 {
     // init the buttons on demand
     if ( !m_bmpTreeExpanded.Ok() )
 {
     // init the buttons on demand
     if ( !m_bmpTreeExpanded.Ok() )


@@ -175,42 +233,129 @@ wxRendererMac::DrawTreeItemButton(wxWindow *win,
     // 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
     // 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__
 #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 ) ;
+    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
 #else // 1

-    dc.DrawBitmap(flags & wxCONTROL_EXPANDED ? m_bmpTreeExpanded
-                                             : m_bmpTreeCollapsed,
-                  rect.x, rect.y, true /* use mask */);
-#endif // 0/1
+    dc.DrawBitmap(
+        flags & wxCONTROL_EXPANDED
+        ? m_bmpTreeExpanded
+        : m_bmpTreeCollapsed,
+         rect.x, rect.y, true /* use mask */);
+#endif

 }
 
 }
 

-void
-wxRendererMac::DrawSplitterSash(wxWindow *win,
-                                wxDC& dc,
-                                const wxSize& size,
-                                wxCoord position,
-                                wxOrientation orient)
+void wxRendererMac::DrawSplitterSash( wxWindow *win,
+    wxDC& dc,
+    const wxSize& size,
+    wxCoord position,
+    wxOrientation orient,
+    int WXUNUSED(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)
-
-    dc.SetPen(*wxLIGHT_GREY_PEN);
-    dc.SetBrush(*wxWHITE_BRUSH);
-    if ( orient == wxVERTICAL )
-        dc.DrawRectangle(position, 0, 7, size.y);
+#if defined(__WXMAC_OSX__) && ( MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_3 )
+    if ( HIThemeDrawPaneSplitter != 0 )
+    {
+        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 = ((wxMacCGContext*)(dc.GetGraphicContext()))->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
+        }
+    }

     else
     else

-        dc.DrawRectangle(0, position, size.x, 7);
-}
+#endif
+    {
+        // Do the gradient fill:
+        static int grayValues[] =
+        {
+            0xA0, 0xF6, 0xED, 0xE4, 0xE2, 0xD0, 0xA0
+        };
+        int i;

 
 

+        dc.SetBrush( *wxTRANSPARENT_BRUSH );
+        if (orient == wxVERTICAL)
+        {
+            for (i=0; i < (int)WXSIZEOF(grayValues); i++)
+            {
+                dc.SetPen( wxPen( wxColour( grayValues[i], grayValues[i], grayValues[i] ), 1, wxSOLID ) );
+                dc.DrawRectangle( position + i, 0, 1, size.y );
+            }
+        }
+        else
+        {
+            for (i=0; i < (int)WXSIZEOF(grayValues); i++)
+            {
+                dc.SetPen( wxPen( wxColour( grayValues[i], grayValues[i], grayValues[i] ), 1, wxSOLID ) );
+                dc.DrawRectangle( 0, position + i, size.x, 1 );
+            }
+        }
+    }
+}