X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/97071cdbffd14256c3ea75256f95e8e82757cddc..2cf3a6d7bef6f20bea35062dd3d4dbf0aec9efb5:/src/mac/carbon/dccg.cpp?ds=inline diff --git a/src/mac/carbon/dccg.cpp b/src/mac/carbon/dccg.cpp index 47de1b4b9d..ff20b5cc6b 100755 --- a/src/mac/carbon/dccg.cpp +++ b/src/mac/carbon/dccg.cpp @@ -1,12 +1,12 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: dc.cpp +// Name: src/mac/carbon/dccg.cpp // Purpose: wxDC class // Author: Stefan Csomor // Modified by: // Created: 01/02/97 // RCS-ID: $Id$ // Copyright: (c) Stefan Csomor -// Licence: wxWindows licence +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// #include "wx/wxprec.h" @@ -15,18 +15,23 @@ #if wxMAC_USE_CORE_GRAPHICS -#include "wx/app.h" +#ifndef WX_PRECOMP + #include "wx/log.h" + #include "wx/app.h" + #include "wx/dcmemory.h" + #include "wx/dcprint.h" + #include "wx/region.h" + #include "wx/image.h" +#endif + #include "wx/mac/uma.h" -#include "wx/dcmemory.h" -#include "wx/dcprint.h" -#include "wx/region.h" -#include "wx/image.h" -#include "wx/log.h" #ifdef __MSL__ #if __MSL__ >= 0x6000 #include "math.h" + // in case our functions were defined outside std, we make it known all the same + namespace std { } using namespace std ; #endif #endif @@ -35,6 +40,10 @@ IMPLEMENT_ABSTRACT_CLASS(wxDC, wxObject) +#ifndef wxMAC_USE_CORE_GRAPHICS_BLEND_MODES +#define wxMAC_USE_CORE_GRAPHICS_BLEND_MODES 0 +#endif + //----------------------------------------------------------------------------- // constants //----------------------------------------------------------------------------- @@ -44,19 +53,21 @@ IMPLEMENT_ABSTRACT_CLASS(wxDC, wxObject) const double M_PI = 3.14159265358979 ; #endif #endif -const double RAD2DEG = 180.0 / M_PI; + +const double RAD2DEG = 180.0 / M_PI; const short kEmulatedMode = -1 ; const short kUnsupportedMode = -2 ; extern TECObjectRef s_TECNativeCToUnicode ; -// TODO Update -// The text ctrl implementation still needs that for the non hiview implementation +// TODO: update +// The textctrl implementation still needs that (needs what?) for the non-HIView implementation +// wxMacWindowClipper::wxMacWindowClipper( const wxWindow* win ) : - wxMacPortSaver( (GrafPtr) GetWindowPort((WindowRef) win->MacGetTopLevelWindowRef()) ) + wxMacPortSaver( (GrafPtr) GetWindowPort( (WindowRef) win->MacGetTopLevelWindowRef() ) ) { - m_newPort = (GrafPtr) GetWindowPort((WindowRef) win->MacGetTopLevelWindowRef()) ; + m_newPort = (GrafPtr) GetWindowPort( (WindowRef) win->MacGetTopLevelWindowRef() ) ; m_formerClip = NewRgn() ; m_newClip = NewRgn() ; GetClip( m_formerClip ) ; @@ -67,7 +78,8 @@ wxMacWindowClipper::wxMacWindowClipper( const wxWindow* win ) : if ( win->GetPeer() ) { int x = 0 , y = 0; - win->MacWindowToRootWindow( &x,&y ) ; + win->MacWindowToRootWindow( &x, &y ) ; + // get area including focus rect CopyRgn( (RgnHandle) ((wxWindow*)win)->MacGetVisibleRegion(true).GetWXHRGN() , m_newClip ) ; if ( !EmptyRgn( m_newClip ) ) @@ -78,7 +90,7 @@ wxMacWindowClipper::wxMacWindowClipper( const wxWindow* win ) : } } -wxMacWindowClipper::~wxMacWindowClipper() +wxMacWindowClipper::~wxMacWindowClipper() { SetPort( m_newPort ) ; SetClip( m_formerClip ) ; @@ -90,11 +102,11 @@ wxMacWindowStateSaver::wxMacWindowStateSaver( const wxWindow* win ) : wxMacWindowClipper( win ) { // the port is already set at this point - m_newPort = (GrafPtr) GetWindowPort((WindowRef) win->MacGetTopLevelWindowRef()) ; + m_newPort = (GrafPtr) GetWindowPort( (WindowRef) win->MacGetTopLevelWindowRef() ) ; GetThemeDrawingState( &m_themeDrawingState ) ; } -wxMacWindowStateSaver::~wxMacWindowStateSaver() +wxMacWindowStateSaver::~wxMacWindowStateSaver() { SetPort( m_newPort ) ; SetThemeDrawingState( m_themeDrawingState , true ) ; @@ -107,6 +119,7 @@ wxMacPortSetter::wxMacPortSetter( const wxDC* dc ) : { wxASSERT( dc->Ok() ) ; m_dc = dc ; + // dc->MacSetupPort(&m_ph) ; } @@ -145,13 +158,13 @@ wxMacCGPath::~wxMacCGPath() CGPathRelease( m_path ) ; } -// Starts a new subpath at +// opens (starts) a new subpath void wxMacCGPath::MoveToPoint( wxCoord x1 , wxCoord y1 ) { CGPathMoveToPoint( m_path , NULL , x1 , y1 ) ; } -void wxMacCGPath::AddLineToPoint( wxCoord x1 , wxCoord y1 ) +void wxMacCGPath::AddLineToPoint( wxCoord x1 , wxCoord y1 ) { CGPathAddLineToPoint( m_path , NULL , x1 , y1 ) ; } @@ -178,12 +191,12 @@ void wxMacCGPath::CloseSubpath() CGPathCloseSubpath( m_path ) ; } -CGPathRef wxMacCGPath::GetPath() const +CGPathRef wxMacCGPath::GetPath() const { return m_path ; } -wxMacCGContext::wxMacCGContext( CGrafPtr port ) +wxMacCGContext::wxMacCGContext( CGrafPtr port ) { m_qdPort = port ; m_cgContext = NULL ; @@ -203,7 +216,7 @@ wxMacCGContext::wxMacCGContext() m_cgContext = NULL ; } -wxMacCGContext::~wxMacCGContext() +wxMacCGContext::~wxMacCGContext() { if ( m_cgContext ) { @@ -222,14 +235,14 @@ void wxMacCGContext::Clip( const wxRegion ®ion ) // ClipCGContextToRegion ( m_cgContext, &bounds , (RgnHandle) dc->m_macCurrentClipRgn ) ; } -void wxMacCGContext::StrokePath( const wxGraphicPath *p ) +void wxMacCGContext::StrokePath( const wxGraphicPath *p ) { const wxMacCGPath* path = dynamic_cast< const wxMacCGPath*>( p ) ; CGContextAddPath( m_cgContext , path->GetPath() ) ; CGContextStrokePath( m_cgContext ) ; } -void wxMacCGContext::DrawPath( const wxGraphicPath *p , int fillStyle ) +void wxMacCGContext::DrawPath( const wxGraphicPath *p , int fillStyle ) { const wxMacCGPath* path = dynamic_cast< const wxMacCGPath*>( p ) ; CGPathDrawingMode mode = m_mode ; @@ -246,39 +259,40 @@ void wxMacCGContext::DrawPath( const wxGraphicPath *p , int fillStyle ) CGContextDrawPath( m_cgContext , mode ) ; } -void wxMacCGContext::FillPath( const wxGraphicPath *p , const wxColor &fillColor , int fillStyle ) +void wxMacCGContext::FillPath( const wxGraphicPath *p , const wxColor &fillColor , int fillStyle ) { const wxMacCGPath* path = dynamic_cast< const wxMacCGPath*>( p ) ; CGContextSaveGState( m_cgContext ) ; - + RGBColor col = MAC_WXCOLORREF( fillColor.GetPixel() ) ; CGContextSetRGBFillColor( m_cgContext , col.red / 65536.0 , col.green / 65536.0 , col.blue / 65536.0 , 1.0 ) ; CGPathDrawingMode mode = kCGPathFill ; if ( fillStyle == wxODDEVEN_RULE ) mode = kCGPathEOFill ; - + CGContextBeginPath( m_cgContext ) ; CGContextAddPath( m_cgContext , path->GetPath() ) ; CGContextClosePath( m_cgContext ) ; CGContextDrawPath( m_cgContext , mode ) ; - + CGContextRestoreGState( m_cgContext ) ; } - -wxGraphicPath* wxMacCGContext::CreatePath() -{ + +wxGraphicPath* wxMacCGContext::CreatePath() +{ // make sure that we now have a real cgref, before doing // anything with paths CGContextRef cg = GetNativeContext() ; cg = NULL ; - return new wxMacCGPath() ; + + return new wxMacCGPath() ; } // in case we only got a QDPort only create a cgref now -CGContextRef wxMacCGContext::GetNativeContext() -{ +CGContextRef wxMacCGContext::GetNativeContext() +{ if ( m_cgContext == NULL ) { Rect bounds ; @@ -287,29 +301,32 @@ CGContextRef wxMacCGContext::GetNativeContext() CGContextSaveGState( m_cgContext ) ; wxASSERT_MSG( status == noErr , wxT("Cannot nest wxDCs on the same window") ) ; + CGContextTranslateCTM( m_cgContext , 0 , bounds.bottom - bounds.top ) ; CGContextScaleCTM( m_cgContext , 1 , -1 ) ; - + CGContextSaveGState( m_cgContext ) ; SetPen( m_pen ) ; SetBrush( m_brush ) ; } - return m_cgContext ; + return m_cgContext ; } -void wxMacCGContext::SetNativeContext( CGContextRef cg ) -{ +void wxMacCGContext::SetNativeContext( CGContextRef cg ) +{ // we allow either setting or clearing but not replacing wxASSERT( m_cgContext == NULL || cg == NULL ) ; + if ( cg ) CGContextSaveGState( cg ) ; - m_cgContext = cg ; + m_cgContext = cg ; } #pragma mark - +#pragma mark wxMacCGPattern, ImagePattern, HatchPattern classes -// wrapper class for a CGPattern, always allocate on heap, never call destructor +// CGPattern wrapper class: always allocate on heap, never call destructor class wxMacCGPattern { @@ -317,14 +334,14 @@ public : wxMacCGPattern() {} // is guaranteed to be called only with a non-Null CGContextRef - virtual void Render( CGContextRef ctxRef ) = 0 ; + virtual void Render( CGContextRef ctxRef ) = 0 ; operator CGPatternRef() const { return m_patternRef ; } protected : virtual ~wxMacCGPattern() { - // as this is called only when our m_patternRef is been released; + // as this is called only when the m_patternRef is been released; // don't release it again } @@ -351,12 +368,13 @@ const CGPatternCallbacks wxMacCGPattern::ms_Callbacks = { 0, &wxMacCGPattern::_R class ImagePattern : public wxMacCGPattern { public : - ImagePattern( const wxBitmap* bmp , CGAffineTransform transform ) + ImagePattern( const wxBitmap* bmp , CGAffineTransform transform ) { wxASSERT( bmp && bmp->Ok() ) ; + Init( (CGImageRef) bmp->CGImageCreate() , transform ) ; } - + // ImagePattern takes ownership of CGImageRef passed in ImagePattern( CGImageRef image , CGAffineTransform transform ) { @@ -365,23 +383,24 @@ public : Init( image , transform ) ; } - - virtual void Render( CGContextRef ctxRef ) + + virtual void Render( CGContextRef ctxRef ) { if (m_image != NULL) HIViewDrawCGImage( ctxRef, &m_imageBounds, m_image ); } protected : - void Init( CGImageRef image , CGAffineTransform transform ) + void Init( CGImageRef image, CGAffineTransform transform ) { m_image = image ; if ( m_image ) { - m_imageBounds = CGRectMake( 0.0, 0.0, (float)CGImageGetWidth( m_image ), (float)CGImageGetHeight( m_image ) ) ; - m_patternRef = CGPatternCreate( this , m_imageBounds, transform , - m_imageBounds.size.width, m_imageBounds.size.height, - kCGPatternTilingNoDistortion, true , &wxMacCGPattern::ms_Callbacks ) ; + m_imageBounds = CGRectMake( 0.0, 0.0, (float)CGImageGetWidth( m_image ), (float)CGImageGetHeight( m_image ) ) ; + m_patternRef = CGPatternCreate( + this , m_imageBounds, transform , + m_imageBounds.size.width, m_imageBounds.size.height, + kCGPatternTilingNoDistortion, true , &wxMacCGPattern::ms_Callbacks ) ; } } @@ -391,22 +410,23 @@ protected : CGImageRelease( m_image ) ; } - CGImageRef m_image ; - CGRect m_imageBounds ; + CGImageRef m_image ; + CGRect m_imageBounds ; } ; class HatchPattern : public wxMacCGPattern { public : - HatchPattern( int hatchstyle , CGAffineTransform transform ) + HatchPattern( int hatchstyle, CGAffineTransform transform ) { m_hatch = hatchstyle ; m_imageBounds = CGRectMake( 0.0, 0.0, 8.0 , 8.0 ) ; - m_patternRef = CGPatternCreate( this , m_imageBounds, transform , - m_imageBounds.size.width, m_imageBounds.size.height, - kCGPatternTilingNoDistortion, false , &wxMacCGPattern::ms_Callbacks ) ; + m_patternRef = CGPatternCreate( + this , m_imageBounds, transform , + m_imageBounds.size.width, m_imageBounds.size.height, + kCGPatternTilingNoDistortion, false , &wxMacCGPattern::ms_Callbacks ) ; } - + void StrokeLineSegments( CGContextRef ctxRef , const CGPoint pts[] , size_t count ) { #if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_4 @@ -417,23 +437,25 @@ public : else #endif { - CGContextBeginPath (ctxRef); - for (size_t i = 0; i < count; i += 2) { + CGContextBeginPath( ctxRef ); + for (size_t i = 0; i < count; i += 2) + { CGContextMoveToPoint(ctxRef, pts[i].x, pts[i].y); CGContextAddLineToPoint(ctxRef, pts[i+1].x, pts[i+1].y); } CGContextStrokePath(ctxRef); } } - - virtual void Render( CGContextRef ctxRef ) + + virtual void Render( CGContextRef ctxRef ) { switch ( m_hatch ) { case wxBDIAGONAL_HATCH : { - CGPoint pts[] = { - { 8.0 , 0.0 } , { 0.0 , 8.0 } + CGPoint pts[] = + { + { 8.0 , 0.0 } , { 0.0 , 8.0 } }; StrokeLineSegments( ctxRef , pts , 2 ) ; } @@ -441,9 +463,10 @@ public : case wxCROSSDIAG_HATCH : { - CGPoint pts[] = { - { 0.0 , 0.0 } , { 8.0 , 8.0 } , - { 8.0 , 0.0 } , { 0.0 , 8.0 } + CGPoint pts[] = + { + { 0.0 , 0.0 } , { 8.0 , 8.0 } , + { 8.0 , 0.0 } , { 0.0 , 8.0 } }; StrokeLineSegments( ctxRef , pts , 4 ) ; } @@ -451,8 +474,9 @@ public : case wxFDIAGONAL_HATCH : { - CGPoint pts[] = { - { 0.0 , 0.0 } , { 8.0 , 8.0 } + CGPoint pts[] = + { + { 0.0 , 0.0 } , { 8.0 , 8.0 } }; StrokeLineSegments( ctxRef , pts , 2 ) ; } @@ -460,9 +484,10 @@ public : case wxCROSS_HATCH : { - CGPoint pts[] = { - { 0.0 , 4.0 } , { 8.0 , 4.0 } , - { 4.0 , 0.0 } , { 4.0 , 8.0 } , + CGPoint pts[] = + { + { 0.0 , 4.0 } , { 8.0 , 4.0 } , + { 4.0 , 0.0 } , { 4.0 , 8.0 } , }; StrokeLineSegments( ctxRef , pts , 4 ) ; } @@ -470,8 +495,9 @@ public : case wxHORIZONTAL_HATCH : { - CGPoint pts[] = { - { 0.0 , 4.0 } , { 8.0 , 4.0 } , + CGPoint pts[] = + { + { 0.0 , 4.0 } , { 8.0 , 4.0 } , }; StrokeLineSegments( ctxRef , pts , 2 ) ; } @@ -479,67 +505,73 @@ public : case wxVERTICAL_HATCH : { - CGPoint pts[] = { - { 4.0 , 0.0 } , { 4.0 , 8.0 } , + CGPoint pts[] = + { + { 4.0 , 0.0 } , { 4.0 , 8.0 } , }; StrokeLineSegments( ctxRef , pts , 2 ) ; } break ; + + default: + break; } } - + protected : ~HatchPattern() {} - int m_hatch ; CGRect m_imageBounds ; -} ; + int m_hatch ; +}; + +#pragma mark - void wxMacCGContext::SetPen( const wxPen &pen ) { m_pen = pen ; if ( m_cgContext == NULL ) return ; + bool fill = m_brush.GetStyle() != wxTRANSPARENT ; bool stroke = pen.GetStyle() != wxTRANSPARENT ; - + #if 0 - // we can benchmark performance, should go into a setting later + // we can benchmark performance; should go into a setting eventually CGContextSetShouldAntialias( m_cgContext , false ) ; #endif + if ( fill | stroke ) { - // setup brushes + // set up brushes m_mode = kCGPathFill ; // just a default - if ( fill ) - { - m_mode = kCGPathFill ; - } - if ( stroke ) { RGBColor col = MAC_WXCOLORREF( pen.GetColour().GetPixel() ) ; CGContextSetRGBStrokeColor( m_cgContext , col.red / 65536.0 , col.green / 65536.0 , col.blue / 65536.0 , 1.0 ) ; - /* TODO * m_dc->m_scaleX */ + // TODO: * m_dc->m_scaleX float penWidth = pen.GetWidth(); if (penWidth <= 0.0) penWidth = 0.1; CGContextSetLineWidth( m_cgContext , penWidth ) ; - + CGLineCap cap ; switch ( pen.GetCap() ) { case wxCAP_ROUND : cap = kCGLineCapRound ; break ; + case wxCAP_PROJECTING : cap = kCGLineCapSquare ; break ; + case wxCAP_BUTT : cap = kCGLineCapButt ; break ; + default : cap = kCGLineCapButt ; break ; @@ -551,32 +583,33 @@ void wxMacCGContext::SetPen( const wxPen &pen ) case wxJOIN_BEVEL : join = kCGLineJoinBevel ; break ; + case wxJOIN_MITER : join = kCGLineJoinMiter ; break ; + case wxJOIN_ROUND : join = kCGLineJoinRound ; break ; + default : join = kCGLineJoinMiter ; - break; + break; } - CGContextSetLineJoin( m_cgContext , join ) ; m_mode = kCGPathStroke ; int count = 0 ; - + const float *lengths = NULL ; float *userLengths = NULL ; const float dashUnit = penWidth < 1.0 ? 1.0 : penWidth; - - const float dotted[] = { dashUnit , dashUnit + 2.0 }; + + const float dotted[] = { dashUnit , dashUnit + 2.0 }; const float short_dashed[] = { 9.0 , 6.0 }; const float dashed[] = { 19.0 , 9.0 }; const float dotted_dashed[] = { 9.0 , 6.0 , 3.0 , 3.0 }; - switch ( pen.GetStyle() ) { case wxSOLID : @@ -608,7 +641,7 @@ void wxMacCGContext::SetPen( const wxPen &pen ) if ((dashes != NULL) && (count > 0)) { userLengths = new float[count] ; - for( int i = 0 ; i < count ; ++i ) + for ( int i = 0 ; i < count ; ++i ) { userLengths[i] = dashes[i] * dashUnit ; @@ -625,7 +658,7 @@ void wxMacCGContext::SetPen( const wxPen &pen ) { float alphaArray[1] = { 1.0 } ; wxBitmap* bmp = pen.GetStipple() ; - if ( bmp && bmp->Ok() ) + if ( bmp && bmp->Ok() ) { wxMacCFRefHolder patternSpace( CGColorSpaceCreatePattern( NULL ) ) ; CGContextSetStrokeColorSpace( m_cgContext , patternSpace ) ; @@ -640,13 +673,13 @@ void wxMacCGContext::SetPen( const wxPen &pen ) wxMacCFRefHolder patternSpace( CGColorSpaceCreatePattern( wxMacGetGenericRGBColorSpace() ) ) ; CGContextSetStrokeColorSpace( m_cgContext , patternSpace ) ; wxMacCFRefHolder pattern( *( new HatchPattern( pen.GetStyle() , CGContextGetCTM( m_cgContext ) ) ) ); - + RGBColor col = MAC_WXCOLORREF( pen.GetColour().GetPixel() ) ; float colorArray[4] = { col.red / 65536.0 , col.green / 65536.0 , col.blue / 65536.0 , 1.0 } ; - + CGContextSetStrokePattern( m_cgContext, pattern , colorArray ) ; } - break ; + break ; } if ((lengths != NULL) && (count > 0)) @@ -655,20 +688,19 @@ void wxMacCGContext::SetPen( const wxPen &pen ) // force the line cap, otherwise we get artifacts (overlaps) and just solid lines cap = kCGLineCapButt ; } - else + else { CGContextSetLineDash( m_cgContext , 0 , NULL , 0 ) ; } CGContextSetLineCap( m_cgContext , cap ) ; + CGContextSetLineJoin( m_cgContext , join ) ; delete[] userLengths ; } if ( fill && stroke ) - { m_mode = kCGPathFillStroke ; - } } } @@ -706,7 +738,7 @@ void wxMacCGContext::SetBrush( const wxBrush &brush ) RGBColor col = MAC_WXCOLORREF( brush.GetColour().GetPixel() ) ; float colorArray[4] = { col.red / 65536.0 , col.green / 65536.0 , col.blue / 65536.0 , 1.0 } ; - + CGContextSetFillPattern( m_cgContext, pattern , colorArray ) ; } else @@ -714,7 +746,7 @@ void wxMacCGContext::SetBrush( const wxBrush &brush ) // now brush is a bitmap float alphaArray[1] = { 1.0 } ; wxBitmap* bmp = brush.GetStipple() ; - if ( bmp && bmp->Ok() ) + if ( bmp && bmp->Ok() ) { wxMacCFRefHolder patternSpace( CGColorSpaceCreatePattern( NULL ) ) ; CGContextSetFillColorSpace( m_cgContext , patternSpace ) ; @@ -722,14 +754,14 @@ void wxMacCGContext::SetBrush( const wxBrush &brush ) CGContextSetFillPattern( m_cgContext, pattern , alphaArray ) ; } } + m_mode = kCGPathFill ; } - if ( stroke ) - m_mode = kCGPathStroke ; - if ( fill && stroke ) m_mode = kCGPathFillStroke ; + else if ( stroke ) + m_mode = kCGPathStroke ; } } @@ -742,13 +774,13 @@ void AddEllipticArcToPath(CGContextRef c, CGPoint center, float a, float b, floa CGContextAddArc(c, 0, 0, 1, DegToRad(fromDegree), DegToRad(toDegree), 0); CGContextClosePath(c); CGContextRestoreGState(c); -} +} void AddRoundedRectToPath(CGContextRef c, CGRect rect, float ovalWidth, float ovalHeight) { float fw, fh; - if (ovalWidth == 0 || ovalHeight == 0) + if (ovalWidth == 0 || ovalHeight == 0) { CGContextAddRect(c, rect); return; @@ -757,20 +789,24 @@ void AddRoundedRectToPath(CGContextRef c, CGRect rect, float ovalWidth, CGContextSaveGState(c); CGContextTranslateCTM(c, CGRectGetMinX(rect), CGRectGetMinY(rect)); CGContextScaleCTM(c, ovalWidth, ovalHeight); + fw = CGRectGetWidth(rect) / ovalWidth; fh = CGRectGetHeight(rect) / ovalHeight; - CGContextMoveToPoint(c, fw, fh/2); - CGContextAddArcToPoint(c, fw, fh, fw/2, fh, 1); - CGContextAddArcToPoint(c, 0, fh, 0, fh/2, 1); - CGContextAddArcToPoint(c, 0, 0, fw/2, 0, 1); - CGContextAddArcToPoint(c, fw, 0, fw, fh/2, 1); + + CGContextMoveToPoint(c, fw, fh / 2); + CGContextAddArcToPoint(c, fw, fh, fw / 2, fh, 1); + CGContextAddArcToPoint(c, 0, fh, 0, fh / 2, 1); + CGContextAddArcToPoint(c, 0, 0, fw / 2, 0, 1); + CGContextAddArcToPoint(c, fw, 0, fw, fh / 2, 1); CGContextClosePath(c); CGContextRestoreGState(c); -} +} + +#pragma mark - wxDC::wxDC() { - m_ok = false; + m_ok = false ; m_colour = true; m_mm_to_pix_x = mm2pt; m_mm_to_pix_y = mm2pt; @@ -783,19 +819,18 @@ wxDC::wxDC() m_userScaleY = 1.0; m_scaleX = 1.0; m_scaleY = 1.0; - m_needComputeScaleX = false; + m_needComputeScaleX = m_needComputeScaleY = false; - m_ok = false ; m_macPort = 0 ; - m_macLocalOrigin.x = m_macLocalOrigin.y = 0 ; + m_macLocalOrigin.x = + m_macLocalOrigin.y = 0 ; m_pen = *wxBLACK_PEN; m_font = *wxNORMAL_FONT; m_brush = *wxWHITE_BRUSH; m_macATSUIStyle = NULL ; - m_graphicContext = NULL ; } @@ -807,13 +842,14 @@ wxDC::~wxDC() m_macATSUIStyle = NULL ; } - delete m_graphicContext ; + delete m_graphicContext ; } void wxDC::DoDrawBitmap( const wxBitmap &bmp, wxCoord x, wxCoord y, bool useMask ) { - wxCHECK_RET( Ok(), wxT("invalid window dc") ); - wxCHECK_RET( bmp.Ok(), wxT("invalid bitmap") ); + wxCHECK_RET( Ok(), wxT("wxDC(cg)::DoDrawBitmap - invalid DC") ); + wxCHECK_RET( bmp.Ok(), wxT("wxDC(cg)::DoDrawBitmap - invalid bitmap") ); + wxCoord xx = XLOG2DEVMAC(x); wxCoord yy = YLOG2DEVMAC(y); wxCoord w = bmp.GetWidth(); @@ -830,8 +866,8 @@ void wxDC::DoDrawBitmap( const wxBitmap &bmp, wxCoord x, wxCoord y, bool useMask void wxDC::DoDrawIcon( const wxIcon &icon, wxCoord x, wxCoord y ) { - wxCHECK_RET(Ok(), wxT("Invalid dc wxDC::DoDrawIcon")); - wxCHECK_RET(icon.Ok(), wxT("Invalid icon wxDC::DoDrawIcon")); + wxCHECK_RET( Ok(), wxT("wxDC(cg)::DoDrawIcon - invalid DC") ); + wxCHECK_RET( icon.Ok(), wxT("wxDC(cg)::DoDrawIcon - invalid icon") ); wxCoord xx = XLOG2DEVMAC(x); wxCoord yy = YLOG2DEVMAC(y); @@ -842,9 +878,9 @@ void wxDC::DoDrawIcon( const wxIcon &icon, wxCoord x, wxCoord y ) CGContextRef cg = ((wxMacCGContext*)(m_graphicContext))->GetNativeContext() ; CGRect r = CGRectMake( 00 , 00 , ww , hh ) ; - CGContextSaveGState(cg); - CGContextTranslateCTM(cg, xx , yy + hh ); - CGContextScaleCTM(cg, 1, -1); + CGContextSaveGState( cg ); + CGContextTranslateCTM( cg, xx , yy + hh ); + CGContextScaleCTM( cg, 1, -1 ); PlotIconRefInContext( cg , &r , kAlignNone , kTransformNone , NULL , kPlotIconRefNormalFlags , MAC_WXHICON( icon.GetHICON() ) ) ; CGContextRestoreGState( cg ) ; @@ -852,7 +888,8 @@ void wxDC::DoDrawIcon( const wxIcon &icon, wxCoord x, wxCoord y ) void wxDC::DoSetClippingRegion( wxCoord x, wxCoord y, wxCoord width, wxCoord height ) { - wxCHECK_RET(Ok(), wxT("wxDC::DoSetClippingRegion Invalid DC")); + wxCHECK_RET( Ok(), wxT("wxDC(cg)::DoSetClippingRegion - invalid DC") ); + wxCoord xx, yy, ww, hh; xx = XLOG2DEVMAC(x); yy = YLOG2DEVMAC(y); @@ -860,33 +897,37 @@ void wxDC::DoSetClippingRegion( wxCoord x, wxCoord y, wxCoord width, wxCoord hei hh = YLOG2DEVREL(height); CGContextRef cgContext = ((wxMacCGContext*)(m_graphicContext))->GetNativeContext() ; - CGRect clipRect = CGRectMake( xx ,yy , ww, hh ) ; + CGRect clipRect = CGRectMake( xx , yy , ww, hh ) ; CGContextClipToRect( cgContext , clipRect ) ; // SetRectRgn( (RgnHandle) m_macCurrentClipRgn , xx , yy , xx + ww , yy + hh ) ; // SectRgn( (RgnHandle) m_macCurrentClipRgn , (RgnHandle) m_macBoundaryClipRgn , (RgnHandle) m_macCurrentClipRgn ) ; + if ( m_clipping ) { - m_clipX1 = wxMax( m_clipX1 , xx ); - m_clipY1 = wxMax( m_clipY1 , yy ); - m_clipX2 = wxMin( m_clipX2, (xx + ww)); - m_clipY2 = wxMin( m_clipY2, (yy + hh)); + m_clipX1 = wxMax( m_clipX1, xx ); + m_clipY1 = wxMax( m_clipY1, yy ); + m_clipX2 = wxMin( m_clipX2, (xx + ww) ); + m_clipY2 = wxMin( m_clipY2, (yy + hh) ); } else { m_clipping = true; + m_clipX1 = xx; m_clipY1 = yy; m_clipX2 = xx + ww; m_clipY2 = yy + hh; } - // TODO as soon as we don't reset the context for each operation anymore + + // TODO: as soon as we don't reset the context for each operation anymore // we have to update the context as well } -void wxDC::DoSetClippingRegionAsRegion( const wxRegion ®ion ) +void wxDC::DoSetClippingRegionAsRegion( const wxRegion ®ion ) { - wxCHECK_RET( Ok(), wxT("invalid window dc") ) ; + wxCHECK_RET( Ok(), wxT("wxDC(cg)::DoSetClippingRegionAsRegion - invalid DC") ); + if (region.Empty()) { DestroyClippingRegion(); @@ -900,6 +941,7 @@ void wxDC::DoSetClippingRegionAsRegion( const wxRegion ®ion ) yy = YLOG2DEVMAC(y); ww = XLOG2DEVREL(w); hh = YLOG2DEVREL(h); + // if we have a scaling that we cannot map onto native regions // we must use the box if ( ww != w || hh != h ) @@ -908,24 +950,24 @@ void wxDC::DoSetClippingRegionAsRegion( const wxRegion ®ion ) } else { - /* +#if 0 CopyRgn( (RgnHandle) region.GetWXHRGN() , (RgnHandle) m_macCurrentClipRgn ) ; if ( xx != x || yy != y ) - { OffsetRgn( (RgnHandle) m_macCurrentClipRgn , xx - x , yy - y ) ; - } - SectRgn( (RgnHandle) m_macCurrentClipRgn , (RgnHandle) m_macBoundaryClipRgn , (RgnHandle) m_macCurrentClipRgn ) ; - */ + SectRgn( (RgnHandle)m_macCurrentClipRgn , (RgnHandle)m_macBoundaryClipRgn , (RgnHandle)m_macCurrentClipRgn ) ; +#endif + if ( m_clipping ) { - m_clipX1 = wxMax( m_clipX1 , xx ); - m_clipY1 = wxMax( m_clipY1 , yy ); - m_clipX2 = wxMin( m_clipX2, (xx + ww)); - m_clipY2 = wxMin( m_clipY2, (yy + hh)); + m_clipX1 = wxMax( m_clipX1, xx ); + m_clipY1 = wxMax( m_clipY1, yy ); + m_clipX2 = wxMin( m_clipX2, (xx + ww) ); + m_clipY2 = wxMin( m_clipY2, (yy + hh) ); } else { m_clipping = true; + m_clipX1 = xx; m_clipY1 = yy; m_clipX2 = xx + ww; @@ -937,26 +979,32 @@ void wxDC::DoSetClippingRegionAsRegion( const wxRegion ®ion ) void wxDC::DestroyClippingRegion() { // CopyRgn( (RgnHandle) m_macBoundaryClipRgn , (RgnHandle) m_macCurrentClipRgn ) ; + CGContextRef cgContext = ((wxMacCGContext*)(m_graphicContext))->GetNativeContext() ; - CGContextRestoreGState( cgContext ); - CGContextSaveGState( cgContext ); + CGContextRestoreGState( cgContext ); + CGContextSaveGState( cgContext ); + m_graphicContext->SetPen( m_pen ) ; m_graphicContext->SetBrush( m_brush ) ; + m_clipping = false; } void wxDC::DoGetSizeMM( int* width, int* height ) const { - int w = 0; - int h = 0; + int w = 0, h = 0; + GetSize( &w, &h ); - *width = long( double(w) / (m_scaleX*m_mm_to_pix_x) ); - *height = long( double(h) / (m_scaleY*m_mm_to_pix_y) ); + if (width) + *width = long( double(w) / (m_scaleX * m_mm_to_pix_x) ); + if (height) + *height = long( double(h) / (m_scaleY * m_mm_to_pix_y) ); } void wxDC::SetTextForeground( const wxColour &col ) { - wxCHECK_RET(Ok(), wxT("Invalid DC")); + wxCHECK_RET( Ok(), wxT("wxDC(cg)::SetTextForeground - invalid DC") ); + if ( col != m_textForegroundColour ) { m_textForegroundColour = col; @@ -966,7 +1014,8 @@ void wxDC::SetTextForeground( const wxColour &col ) void wxDC::SetTextBackground( const wxColour &col ) { - wxCHECK_RET(Ok(), wxT("Invalid DC")); + wxCHECK_RET( Ok(), wxT("wxDC(cg)::SetTextBackground - invalid DC") ); + m_textBackgroundColour = col; } @@ -975,11 +1024,11 @@ void wxDC::SetMapMode( int mode ) switch (mode) { case wxMM_TWIPS: - SetLogicalScale( twips2mm*m_mm_to_pix_x, twips2mm*m_mm_to_pix_y ); + SetLogicalScale( twips2mm * m_mm_to_pix_x, twips2mm * m_mm_to_pix_y ); break; case wxMM_POINTS: - SetLogicalScale( pt2mm*m_mm_to_pix_x, pt2mm*m_mm_to_pix_y ); + SetLogicalScale( pt2mm * m_mm_to_pix_x, pt2mm * m_mm_to_pix_y ); break; case wxMM_METRIC: @@ -987,7 +1036,7 @@ void wxDC::SetMapMode( int mode ) break; case wxMM_LOMETRIC: - SetLogicalScale( m_mm_to_pix_x/10.0, m_mm_to_pix_y/10.0 ); + SetLogicalScale( m_mm_to_pix_x / 10.0, m_mm_to_pix_y / 10.0 ); break; case wxMM_TEXT: @@ -1036,7 +1085,7 @@ void wxDC::SetDeviceOrigin( wxCoord x, wxCoord y ) void wxDC::SetAxisOrientation( bool xLeftRight, bool yBottomUp ) { m_signX = (xLeftRight ? 1 : -1); - m_signY = (yBottomUp ? -1 : 1); + m_signY = (yBottomUp ? -1 : 1); ComputeScaleAndOrigin(); } @@ -1047,7 +1096,7 @@ wxSize wxDC::GetPPI() const int wxDC::GetDepth() const { - return 32 ; + return 32; } void wxDC::ComputeScaleAndOrigin() @@ -1065,29 +1114,29 @@ void wxDC::ComputeScaleAndOrigin() { // this is a bit artificial, but we need to force wxDC to think // the pen has changed - wxPen pen(GetPen()); + wxPen pen( GetPen() ); m_pen = wxNullPen; - SetPen(pen); + SetPen( pen ); } } -void wxDC::SetPalette( const wxPalette& palette ) +void wxDC::SetPalette( const wxPalette& palette ) { } -void wxDC::SetBackgroundMode( int mode ) +void wxDC::SetBackgroundMode( int mode ) { m_backgroundMode = mode ; } -void wxDC::SetFont( const wxFont &font ) +void wxDC::SetFont( const wxFont &font ) { m_font = font; MacInstallFont() ; } -void wxDC::SetPen( const wxPen &pen ) +void wxDC::SetPen( const wxPen &pen ) { if ( m_pen == pen ) return ; @@ -1104,16 +1153,16 @@ void wxDC::SetPen( const wxPen &pen ) // we have to compensate for moved device origins etc. otherwise patterned pens are standing still // eg when using a wxScrollWindow and scrolling around CGContextRef cgContext = ((wxMacCGContext*)(m_graphicContext))->GetNativeContext() ; - int origX = XLOG2DEVMAC(0) ; - int origY = YLOG2DEVMAC(0) ; - CGContextTranslateCTM (cgContext,origX,origY); + int origX = XLOG2DEVMAC( 0 ) ; + int origY = YLOG2DEVMAC( 0 ) ; + CGContextTranslateCTM( cgContext, origX, origY ); m_graphicContext->SetPen( m_pen ) ; - CGContextTranslateCTM (cgContext,-origX,-origY); + CGContextTranslateCTM( cgContext, -origX, -origY ); } } } -void wxDC::SetBrush( const wxBrush &brush ) +void wxDC::SetBrush( const wxBrush &brush ) { if (m_brush == brush) return; @@ -1132,29 +1181,38 @@ void wxDC::SetBrush( const wxBrush &brush ) CGContextRef cgContext = ((wxMacCGContext*)(m_graphicContext))->GetNativeContext() ; int origX = XLOG2DEVMAC(0) ; int origY = YLOG2DEVMAC(0) ; - CGContextTranslateCTM (cgContext,origX,origY); + CGContextTranslateCTM( cgContext, origX, origY ); m_graphicContext->SetBrush( m_brush ) ; - CGContextTranslateCTM (cgContext,-origX,-origY); + CGContextTranslateCTM( cgContext, -origX, -origY ); } } } -void wxDC::SetBackground( const wxBrush &brush ) +void wxDC::SetBackground( const wxBrush &brush ) { if (m_backgroundBrush == brush) return; - + m_backgroundBrush = brush; if (!m_backgroundBrush.Ok()) return; } -void wxDC::SetLogicalFunction( int function ) +void wxDC::SetLogicalFunction( int function ) { if (m_logicalFunction == function) return; m_logicalFunction = function ; +#if wxMAC_USE_CORE_GRAPHICS_BLEND_MODES + CGContextRef cgContext = ((wxMacCGContext*)(m_graphicContext))->GetNativeContext() ; + if ( m_logicalFunction == wxCOPY ) + CGContextSetBlendMode( cgContext, kCGBlendModeNormal ) ; + else if ( m_logicalFunction == wxINVERT ) + CGContextSetBlendMode( cgContext, kCGBlendModeExclusion ) ; + else + CGContextSetBlendMode( cgContext, kCGBlendModeNormal ) ; +#endif } extern bool wxDoFloodFill(wxDC *dc, wxCoord x, wxCoord y, @@ -1166,37 +1224,40 @@ bool wxDC::DoFloodFill(wxCoord x, wxCoord y, return wxDoFloodFill(this, x, y, col, style); } -bool wxDC::DoGetPixel( wxCoord x, wxCoord y, wxColour *col ) const +bool wxDC::DoGetPixel( wxCoord x, wxCoord y, wxColour *col ) const { - wxCHECK_MSG( Ok(), false, wxT("wxDC::DoGetPixel Invalid DC") ); - wxCHECK_MSG( Ok(), false, wxT("wxDC::DoGetPixel Invalid DC") ); + wxCHECK_MSG( Ok(), false, wxT("wxDC(cg)::DoGetPixel - invalid DC") ); + wxMacPortSaver helper((CGrafPtr)m_macPort) ; RGBColor colour; - GetCPixel( - XLOG2DEVMAC(x) + m_macLocalOriginInPort.x - m_macLocalOrigin.x, + + // NB: GetCPixel is a deprecated QD call, and a slow one at that + GetCPixel( + XLOG2DEVMAC(x) + m_macLocalOriginInPort.x - m_macLocalOrigin.x, YLOG2DEVMAC(y) + m_macLocalOriginInPort.y - m_macLocalOrigin.y, &colour ); - // Convert from Mac colour to wx - col->Set( colour.red >> 8, - colour.green >> 8, - colour.blue >> 8); + + // convert from Mac colour to wx + col->Set( colour.red >> 8, colour.green >> 8, colour.blue >> 8 ); return true ; } -void wxDC::DoDrawLine( wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2 ) +void wxDC::DoDrawLine( wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2 ) { - wxCHECK_RET(Ok(), wxT("Invalid DC")); - + wxCHECK_RET( Ok(), wxT("wxDC(cg)::DoDrawLine - invalid DC") ); + +#if !wxMAC_USE_CORE_GRAPHICS_BLEND_MODES if ( m_logicalFunction != wxCOPY ) return ; - +#endif + wxCoord xx1 = XLOG2DEVMAC(x1) ; wxCoord yy1 = YLOG2DEVMAC(y1) ; wxCoord xx2 = XLOG2DEVMAC(x2) ; wxCoord yy2 = YLOG2DEVMAC(y2) ; wxGraphicPath* path = m_graphicContext->CreatePath() ; - path->MoveToPoint( xx1 , yy1 ) ; + path->MoveToPoint( xx1, yy1 ) ; path->AddLineToPoint( xx2 , yy2 ) ; path->CloseSubpath() ; m_graphicContext->StrokePath( path ) ; @@ -1206,21 +1267,21 @@ void wxDC::DoDrawLine( wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2 ) CalcBoundingBox(x2, y2); } -void wxDC::DoCrossHair( wxCoord x, wxCoord y ) +void wxDC::DoCrossHair( wxCoord x, wxCoord y ) { - wxCHECK_RET( Ok(), wxT("wxDC::DoCrossHair Invalid window dc") ); + wxCHECK_RET( Ok(), wxT("wxDC(cg)::DoCrossHair - invalid DC") ); if ( m_logicalFunction != wxCOPY ) return ; - - int w = 0; - int h = 0; + + int w = 0, h = 0; + GetSize( &w, &h ); wxCoord xx = XLOG2DEVMAC(x); wxCoord yy = YLOG2DEVMAC(y); wxGraphicPath* path = m_graphicContext->CreatePath() ; - path->MoveToPoint( XLOG2DEVMAC(0), yy ) ; + path->MoveToPoint( XLOG2DEVMAC(0), yy ) ; path->AddLineToPoint( XLOG2DEVMAC(w), yy ) ; path->CloseSubpath() ; path->MoveToPoint( xx, YLOG2DEVMAC(0) ) ; @@ -1230,14 +1291,14 @@ void wxDC::DoCrossHair( wxCoord x, wxCoord y ) delete path ; CalcBoundingBox(x, y); - CalcBoundingBox(x+w, y+h); + CalcBoundingBox(x + w, y + h); } -void wxDC::DoDrawArc( wxCoord x1, wxCoord y1, +void wxDC::DoDrawArc( wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2, wxCoord xc, wxCoord yc ) { - wxCHECK_RET(Ok(), wxT("wxDC::DoDrawArc Invalid DC")); + wxCHECK_RET( Ok(), wxT("wxDC(cg)::DoDrawArc - invalid DC") ); if ( m_logicalFunction != wxCOPY ) return ; @@ -1248,10 +1309,11 @@ void wxDC::DoDrawArc( wxCoord x1, wxCoord y1, wxCoord yy2 = YLOG2DEVMAC(y2); wxCoord xxc = XLOG2DEVMAC(xc); wxCoord yyc = YLOG2DEVMAC(yc); + double dx = xx1 - xxc; double dy = yy1 - yyc; - double radius = sqrt((double)(dx*dx+dy*dy)); - wxCoord rad = (wxCoord)radius; + double radius = sqrt((double)(dx * dx + dy * dy)); + wxCoord rad = (wxCoord)radius; double sa, ea; if (xx1 == xx2 && yy1 == yy2) { @@ -1266,10 +1328,10 @@ void wxDC::DoDrawArc( wxCoord x1, wxCoord y1, { sa = (xx1 - xxc == 0) ? (yy1 - yyc < 0) ? 90.0 : -90.0 : - -atan2(double(yy1-yyc), double(xx1-xxc)) * RAD2DEG; + -atan2(double(yy1 - yyc), double(xx1 - xxc)) * RAD2DEG; ea = (xx2 - xxc == 0) ? (yy2 - yyc < 0) ? 90.0 : -90.0 : - -atan2(double(yy2-yyc), double(xx2-xxc)) * RAD2DEG; + -atan2(double(yy2 - yyc), double(xx2 - xxc)) * RAD2DEG; } bool fill = m_brush.GetStyle() != wxTRANSPARENT ; @@ -1280,17 +1342,17 @@ void wxDC::DoDrawArc( wxCoord x1, wxCoord y1, CGContextScaleCTM( ctx , 1 , -1 ) ; if ( fill ) CGContextMoveToPoint( ctx , 0 , 0 ) ; - CGContextAddArc( ctx, 0, 0 , rad , DegToRad(sa), DegToRad(ea), 0); + CGContextAddArc( ctx, 0, 0 , rad , DegToRad(sa), DegToRad(ea), 0 ); if ( fill ) CGContextAddLineToPoint( ctx , 0 , 0 ) ; CGContextRestoreGState( ctx ) ; CGContextDrawPath( ctx , mctx->GetDrawingMode() ) ; } -void wxDC::DoDrawEllipticArc( wxCoord x, wxCoord y, wxCoord w, wxCoord h, +void wxDC::DoDrawEllipticArc( wxCoord x, wxCoord y, wxCoord w, wxCoord h, double sa, double ea ) { - wxCHECK_RET(Ok(), wxT("wxDC::DoDrawEllepticArc Invalid DC")); + wxCHECK_RET( Ok(), wxT("wxDC(cg)::DoDrawEllipticArc - invalid DC") ); if ( m_logicalFunction != wxCOPY ) return ; @@ -1299,9 +1361,18 @@ void wxDC::DoDrawEllipticArc( wxCoord x, wxCoord y, wxCoord w, wxCoord h, wxCoord yy = YLOG2DEVMAC(y); wxCoord ww = m_signX * XLOG2DEVREL(w); wxCoord hh = m_signY * YLOG2DEVREL(h); + // handle -ve width and/or height - if (ww < 0) { ww = -ww; xx = xx - ww; } - if (hh < 0) { hh = -hh; yy = yy - hh; } + if (ww < 0) + { + ww = -ww; + xx = xx - ww; + } + if (hh < 0) + { + hh = -hh; + yy = yy - hh; + } bool fill = m_brush.GetStyle() != wxTRANSPARENT ; @@ -1309,30 +1380,33 @@ void wxDC::DoDrawEllipticArc( wxCoord x, wxCoord y, wxCoord w, wxCoord h, CGContextRef ctx = mctx->GetNativeContext() ; CGContextSaveGState( ctx ) ; - CGContextTranslateCTM( ctx, xx + ww / 2, yy + hh / 2); + CGContextTranslateCTM( ctx, xx + ww / 2, yy + hh / 2 ); CGContextScaleCTM( ctx , 1 * ww / 2 , -1 * hh / 2 ) ; if ( fill ) CGContextMoveToPoint( ctx , 0 , 0 ) ; - CGContextAddArc( ctx, 0, 0, 1, DegToRad(sa), DegToRad(ea), 0); + CGContextAddArc( ctx, 0, 0, 1, DegToRad( sa ), DegToRad( ea ), 0 ); if ( fill ) CGContextAddLineToPoint( ctx , 0 , 0 ) ; CGContextRestoreGState( ctx ) ; - CGContextDrawPath( ctx , mctx->GetDrawingMode() ) ; + CGContextDrawPath( ctx , mctx->GetDrawingMode() ) ; } -void wxDC::DoDrawPoint( wxCoord x, wxCoord y ) +void wxDC::DoDrawPoint( wxCoord x, wxCoord y ) { - wxCHECK_RET(Ok(), wxT("Invalid DC")); + wxCHECK_RET( Ok(), wxT("wxDC(cg)::DoDrawPoint - invalid DC") ); + DoDrawLine( x , y , x + 1 , y + 1 ) ; } -void wxDC::DoDrawLines(int n, wxPoint points[], +void wxDC::DoDrawLines(int n, wxPoint points[], wxCoord xoffset, wxCoord yoffset) { - wxCHECK_RET(Ok(), wxT("Invalid DC")); - + wxCHECK_RET( Ok(), wxT("wxDC(cg)::DoDrawLines - invalid DC") ); + +#if !wxMAC_USE_CORE_GRAPHICS_BLEND_MODES if ( m_logicalFunction != wxCOPY ) return ; +#endif wxCoord x1, x2 , y1 , y2 ; x1 = XLOG2DEVMAC(points[0].x + xoffset); @@ -1354,34 +1428,34 @@ void wxDC::DoDrawLines(int n, wxPoint points[], #if wxUSE_SPLINES void wxDC::DoDrawSpline(wxList *points) { - wxCHECK_RET(Ok(), wxT("Invalid DC")); - + wxCHECK_RET( Ok(), wxT("wxDC(cg)::DoDrawSpline - invalid DC") ); + if ( m_logicalFunction != wxCOPY ) return ; - + wxGraphicPath* path = m_graphicContext->CreatePath() ; - + wxList::compatibility_iterator node = points->GetFirst(); if (node == wxList::compatibility_iterator()) // empty list return; - + wxPoint *p = (wxPoint *)node->GetData(); - + wxCoord x1 = p->x; wxCoord y1 = p->y; - + node = node->GetNext(); p = (wxPoint *)node->GetData(); - + wxCoord x2 = p->x; wxCoord y2 = p->y; wxCoord cx1 = ( x1 + x2 ) / 2; wxCoord cy1 = ( y1 + y2 ) / 2; - + path->MoveToPoint( XLOG2DEVMAC( x1 ) , XLOG2DEVMAC( y1 ) ) ; path->AddLineToPoint( XLOG2DEVMAC( cx1 ) , XLOG2DEVMAC( cy1 ) ) ; - + #if !wxUSE_STL while ((node = node->GetNext()) != NULL) #else @@ -1395,36 +1469,37 @@ void wxDC::DoDrawSpline(wxList *points) y2 = p->y; wxCoord cx4 = (x1 + x2) / 2; wxCoord cy4 = (y1 + y2) / 2; - - path->AddQuadCurveToPoint( XLOG2DEVMAC( x1 ) , XLOG2DEVMAC( y1 ) , - XLOG2DEVMAC( cx4 ) , XLOG2DEVMAC( cy4 ) ) ; - + + path->AddQuadCurveToPoint( + XLOG2DEVMAC( x1 ) , XLOG2DEVMAC( y1 ) , + XLOG2DEVMAC( cx4 ) , XLOG2DEVMAC( cy4 ) ) ; + cx1 = cx4; cy1 = cy4; } - + path->AddLineToPoint( XLOG2DEVMAC( x2 ) , XLOG2DEVMAC( y2 ) ) ; - + m_graphicContext->StrokePath( path ) ; delete path ; } #endif -void wxDC::DoDrawPolygon(int n, wxPoint points[], +void wxDC::DoDrawPolygon( int n, wxPoint points[], wxCoord xoffset, wxCoord yoffset, int fillStyle ) { - wxCHECK_RET(Ok(), wxT("Invalid DC")); - wxCoord x1, x2 , y1 , y2 ; - if ( n== 0 || (m_brush.GetStyle() == wxTRANSPARENT && m_pen.GetStyle() == wxTRANSPARENT ) ) + wxCHECK_RET( Ok(), wxT("wxDC(cg)::DoDrawPolygon - invalid DC") ); + + if ( n <= 0 || (m_brush.GetStyle() == wxTRANSPARENT && m_pen.GetStyle() == wxTRANSPARENT ) ) return ; - if ( m_logicalFunction != wxCOPY ) return ; + wxCoord x1, x2 , y1 , y2 ; x2 = x1 = XLOG2DEVMAC(points[0].x + xoffset); y2 = y1 = YLOG2DEVMAC(points[0].y + yoffset); - + wxGraphicPath* path = m_graphicContext->CreatePath() ; path->MoveToPoint( x1 , y1 ) ; for (int i = 1; i < n; i++) @@ -1436,16 +1511,17 @@ void wxDC::DoDrawPolygon(int n, wxPoint points[], } if ( x1 != x2 || y1 != y2 ) - path->AddLineToPoint( x1,y1 ) ; + path->AddLineToPoint( x1, y1 ) ; path->CloseSubpath() ; m_graphicContext->DrawPath( path , fillStyle ) ; + delete path ; } void wxDC::DoDrawRectangle(wxCoord x, wxCoord y, wxCoord width, wxCoord height) { - wxCHECK_RET(Ok(), wxT("Invalid DC")); + wxCHECK_RET( Ok(), wxT("wxDC(cg)::DoDrawRectangle - invalid DC") ); if ( m_logicalFunction != wxCOPY ) return ; @@ -1454,6 +1530,7 @@ void wxDC::DoDrawRectangle(wxCoord x, wxCoord y, wxCoord width, wxCoord height) wxCoord yy = YLOG2DEVMAC(y); wxCoord ww = m_signX * XLOG2DEVREL(width); wxCoord hh = m_signY * YLOG2DEVREL(height); + // CMB: draw nothing if transformed w or h is 0 if (ww == 0 || hh == 0) return; @@ -1476,11 +1553,11 @@ void wxDC::DoDrawRectangle(wxCoord x, wxCoord y, wxCoord width, wxCoord height) delete path ; } -void wxDC::DoDrawRoundedRectangle(wxCoord x, wxCoord y, +void wxDC::DoDrawRoundedRectangle(wxCoord x, wxCoord y, wxCoord width, wxCoord height, double radius) { - wxCHECK_RET(Ok(), wxT("Invalid DC")); + wxCHECK_RET( Ok(), wxT("wxDC(cg)::DoDrawRoundedRectangle - invalid DC") ); if ( m_logicalFunction != wxCOPY ) return ; @@ -1491,6 +1568,7 @@ void wxDC::DoDrawRoundedRectangle(wxCoord x, wxCoord y, wxCoord yy = YLOG2DEVMAC(y); wxCoord ww = m_signX * XLOG2DEVREL(width); wxCoord hh = m_signY * YLOG2DEVREL(height); + // CMB: draw nothing if transformed w or h is 0 if (ww == 0 || hh == 0) return; @@ -1509,13 +1587,13 @@ void wxDC::DoDrawRoundedRectangle(wxCoord x, wxCoord y, wxMacCGContext* mctx = ((wxMacCGContext*) m_graphicContext) ; CGContextRef ctx = mctx->GetNativeContext() ; - AddRoundedRectToPath( ctx , CGRectMake( xx , yy , ww , hh ) , 16 ,16 ) ; + AddRoundedRectToPath( ctx , CGRectMake( xx , yy , ww , hh ) , radius , radius ) ; CGContextDrawPath( ctx , mctx->GetDrawingMode() ) ; } -void wxDC::DoDrawEllipse(wxCoord x, wxCoord y, wxCoord width, wxCoord height) +void wxDC::DoDrawEllipse(wxCoord x, wxCoord y, wxCoord width, wxCoord height) { - wxCHECK_RET(Ok(), wxT("Invalid DC")); + wxCHECK_RET( Ok(), wxT("wxDC(cg)::DoDrawEllipse - invalid DC") ); if ( m_logicalFunction != wxCOPY ) return ; @@ -1524,6 +1602,7 @@ void wxDC::DoDrawEllipse(wxCoord x, wxCoord y, wxCoord width, wxCoord height) wxCoord yy = YLOG2DEVMAC(y); wxCoord ww = m_signX * XLOG2DEVREL(width); wxCoord hh = m_signY * YLOG2DEVREL(height); + // CMB: draw nothing if transformed w or h is 0 if (ww == 0 || hh == 0) return; @@ -1543,24 +1622,26 @@ void wxDC::DoDrawEllipse(wxCoord x, wxCoord y, wxCoord width, wxCoord height) wxMacCGContext* mctx = ((wxMacCGContext*) m_graphicContext) ; CGContextRef ctx = mctx->GetNativeContext() ; CGContextSaveGState( ctx ) ; - CGContextTranslateCTM( ctx, xx + ww / 2, yy + hh / 2); + CGContextTranslateCTM( ctx, xx + ww / 2, yy + hh / 2 ); CGContextScaleCTM( ctx , ww / 2 , hh / 2 ) ; - CGContextAddArc( ctx, 0, 0, 1, 0 , 2*M_PI , 0); + CGContextAddArc( ctx, 0, 0, 1, 0 , 2 * M_PI , 0 ); CGContextRestoreGState( ctx ) ; CGContextDrawPath( ctx , mctx->GetDrawingMode() ) ; } -bool wxDC::CanDrawBitmap(void) const +bool wxDC::CanDrawBitmap() const { return true ; } -bool wxDC::DoBlit(wxCoord xdest, wxCoord ydest, wxCoord width, wxCoord height, - wxDC *source, wxCoord xsrc, wxCoord ysrc, int logical_func , bool useMask, - wxCoord xsrcMask, wxCoord ysrcMask ) +bool wxDC::DoBlit( + wxCoord xdest, wxCoord ydest, wxCoord width, wxCoord height, + wxDC *source, wxCoord xsrc, wxCoord ysrc, int logical_func , bool useMask, + wxCoord xsrcMask, wxCoord ysrcMask ) { - wxCHECK_MSG(Ok(), false, wxT("wxDC::DoBlit Illegal dc")); - wxCHECK_MSG(source->Ok(), false, wxT("wxDC::DoBlit Illegal source DC")); + wxCHECK_MSG( Ok(), false, wxT("wxDC(cg)::DoBlit - invalid DC") ); + wxCHECK_MSG( source->Ok(), false, wxT("wxDC(cg)::DoBlit - invalid source DC") ); + if ( logical_func == wxNO_OP ) return true ; @@ -1571,24 +1652,25 @@ bool wxDC::DoBlit(wxCoord xdest, wxCoord ydest, wxCoord width, wxCoord height, } wxCoord yysrc = source->YLOG2DEVMAC(ysrc) ; - wxCoord xxsrc = source->XLOG2DEVMAC(xsrc) ; - wxCoord wwsrc = source->XLOG2DEVREL(width ) ; + wxCoord xxsrc = source->XLOG2DEVMAC(xsrc) ; + wxCoord wwsrc = source->XLOG2DEVREL(width) ; wxCoord hhsrc = source->YLOG2DEVREL(height) ; - + wxCoord yydest = YLOG2DEVMAC(ydest) ; wxCoord xxdest = XLOG2DEVMAC(xdest) ; - wxCoord wwdest = XLOG2DEVREL(width ) ; + wxCoord wwdest = XLOG2DEVREL(width) ; wxCoord hhdest = YLOG2DEVREL(height) ; - + wxMemoryDC* memdc = dynamic_cast(source) ; if ( memdc && logical_func == wxCOPY ) { wxBitmap blit = memdc->GetSelectedObject() ; + wxASSERT_MSG( blit.Ok() , wxT("Invalid bitmap for blitting") ) ; wxCoord bmpwidth = blit.GetWidth(); wxCoord bmpheight = blit.GetHeight(); - + if ( xxsrc != 0 || yysrc != 0 || bmpwidth != wwsrc || bmpheight != hhsrc ) { wwsrc = wxMin( wwsrc , bmpwidth - xxsrc ) ; @@ -1624,43 +1706,44 @@ bool wxDC::DoBlit(wxCoord xdest, wxCoord ydest, wxCoord width, wxCoord height, } else { - /* +#if 0 CGContextRef cg = (wxMacCGContext*)(source->GetGraphicContext())->GetNativeContext() ; void *data = CGBitmapContextGetData( cg ) ; - */ +#endif + return false ; // wxFAIL_MSG( wxT("Blitting is only supported from bitmap contexts") ) ; } return true; } -void wxDC::DoDrawRotatedText(const wxString& str, wxCoord x, wxCoord y, +void wxDC::DoDrawRotatedText(const wxString& str, wxCoord x, wxCoord y, double angle) { - wxCHECK_RET( Ok(), wxT("wxDC::DoDrawRotatedText Invalid window dc") ); + wxCHECK_RET( Ok(), wxT("wxDC(cg)::DoDrawRotatedText - invalid DC") ); + wxCHECK_RET( m_macATSUIStyle != NULL, wxT("wxDC(cg)::DoDrawRotatedText - no valid font set") ); - if ( str.Length() == 0 ) + if ( str.length() == 0 ) return ; if ( m_logicalFunction != wxCOPY ) return ; - wxCHECK_RET( m_macATSUIStyle != NULL , wxT("No valid font set") ) ; - OSStatus status = noErr ; ATSUTextLayout atsuLayout ; - UniCharCount chars = str.Length() ; + UniCharCount chars = str.length() ; UniChar* ubuf = NULL ; + #if SIZEOF_WCHAR_T == 4 - wxMBConvUTF16 converter ; + wxMBConvUTF16 converter ; #if wxUSE_UNICODE - size_t unicharlen = converter.WC2MB( NULL , str.wc_str() , 0 ) ; - ubuf = (UniChar*) malloc( unicharlen + 2 ) ; - converter.WC2MB( (char*) ubuf , str.wc_str(), unicharlen + 2 ) ; + size_t unicharlen = converter.WC2MB( NULL , str.wc_str() , 0 ) ; + ubuf = (UniChar*) malloc( unicharlen + 2 ) ; + converter.WC2MB( (char*) ubuf , str.wc_str(), unicharlen + 2 ) ; #else const wxWCharBuffer wchar = str.wc_str( wxConvLocal ) ; - size_t unicharlen = converter.WC2MB( NULL , wchar.data() , 0 ) ; - ubuf = (UniChar*) malloc( unicharlen + 2 ) ; - converter.WC2MB( (char*) ubuf , wchar.data() , unicharlen + 2 ) ; + size_t unicharlen = converter.WC2MB( NULL , wchar.data() , 0 ) ; + ubuf = (UniChar*) malloc( unicharlen + 2 ) ; + converter.WC2MB( (char*) ubuf , wchar.data() , unicharlen + 2 ) ; #endif chars = unicharlen / 2 ; #else @@ -1680,10 +1763,10 @@ void wxDC::DoDrawRotatedText(const wxString& str, wxCoord x, wxCoord y, &chars , (ATSUStyle*) &m_macATSUIStyle , &atsuLayout ) ; wxASSERT_MSG( status == noErr , wxT("couldn't create the layout of the rotated text") ); - + status = ::ATSUSetTransientFontMatching( atsuLayout , true ) ; wxASSERT_MSG( status == noErr , wxT("couldn't setup transient font matching") ); - + int iAngle = int( angle ); if ( abs(iAngle) > 0 ) { @@ -1692,79 +1775,79 @@ void wxDC::DoDrawRotatedText(const wxString& str, wxCoord x, wxCoord y, { kATSULineRotationTag , } ; - ByteCount atsuSizes[sizeof(atsuTags)/sizeof(ATSUAttributeTag)] = + ByteCount atsuSizes[sizeof(atsuTags) / sizeof(ATSUAttributeTag)] = { sizeof( Fixed ) , } ; - ATSUAttributeValuePtr atsuValues[sizeof(atsuTags)/sizeof(ATSUAttributeTag)] = + ATSUAttributeValuePtr atsuValues[sizeof(atsuTags) / sizeof(ATSUAttributeTag)] = { &atsuAngle , } ; - status = ::ATSUSetLayoutControls(atsuLayout , sizeof(atsuTags)/sizeof(ATSUAttributeTag), + status = ::ATSUSetLayoutControls(atsuLayout , sizeof(atsuTags) / sizeof(ATSUAttributeTag), atsuTags, atsuSizes, atsuValues ) ; } + { CGContextRef cgContext = ((wxMacCGContext*)(m_graphicContext))->GetNativeContext() ; ATSUAttributeTag atsuTags[] = { kATSUCGContextTag , } ; - ByteCount atsuSizes[sizeof(atsuTags)/sizeof(ATSUAttributeTag)] = + ByteCount atsuSizes[sizeof(atsuTags) / sizeof(ATSUAttributeTag)] = { sizeof( CGContextRef ) , } ; - ATSUAttributeValuePtr atsuValues[sizeof(atsuTags)/sizeof(ATSUAttributeTag)] = + ATSUAttributeValuePtr atsuValues[sizeof(atsuTags) / sizeof(ATSUAttributeTag)] = { &cgContext , } ; - status = ::ATSUSetLayoutControls(atsuLayout , sizeof(atsuTags)/sizeof(ATSUAttributeTag), + status = ::ATSUSetLayoutControls(atsuLayout , sizeof(atsuTags) / sizeof(ATSUAttributeTag), atsuTags, atsuSizes, atsuValues ) ; } - ATSUTextMeasurement textBefore ; - ATSUTextMeasurement textAfter ; - ATSUTextMeasurement ascent ; - ATSUTextMeasurement descent ; + ATSUTextMeasurement textBefore, textAfter ; + ATSUTextMeasurement ascent, descent ; status = ::ATSUGetUnjustifiedBounds( atsuLayout, kATSUFromTextBeginning, kATSUToTextEnd, &textBefore , &textAfter, &ascent , &descent ); + wxASSERT_MSG( status == noErr , wxT("couldn't measure the rotated text") ); - + Rect rect ; - + if ( m_backgroundMode == wxSOLID ) { wxGraphicPath* path = m_graphicContext->CreatePath() ; - path->MoveToPoint( - drawX , - drawY ) ; - path->AddLineToPoint( - (int) (drawX + sin(angle/RAD2DEG) * FixedToInt(ascent + descent)) , - (int) (drawY + cos(angle/RAD2DEG) * FixedToInt(ascent + descent)) ) ; - path->AddLineToPoint( - (int) (drawX + sin(angle/RAD2DEG) * FixedToInt(ascent + descent ) + cos(angle/RAD2DEG) * FixedToInt(textAfter)) , - (int) (drawY + cos(angle/RAD2DEG) * FixedToInt(ascent + descent) - sin(angle/RAD2DEG) * FixedToInt(textAfter)) ) ; - path->AddLineToPoint( - (int) (drawX + cos(angle/RAD2DEG) * FixedToInt(textAfter)) , - (int) (drawY - sin(angle/RAD2DEG) * FixedToInt(textAfter)) ) ; - + path->MoveToPoint( drawX , drawY ) ; + path->AddLineToPoint( + (int) (drawX + sin(angle / RAD2DEG) * FixedToInt(ascent + descent)) , + (int) (drawY + cos(angle / RAD2DEG) * FixedToInt(ascent + descent)) ) ; + path->AddLineToPoint( + (int) (drawX + sin(angle / RAD2DEG) * FixedToInt(ascent + descent ) + cos(angle / RAD2DEG) * FixedToInt(textAfter)) , + (int) (drawY + cos(angle / RAD2DEG) * FixedToInt(ascent + descent) - sin(angle / RAD2DEG) * FixedToInt(textAfter)) ) ; + path->AddLineToPoint( + (int) (drawX + cos(angle / RAD2DEG) * FixedToInt(textAfter)) , + (int) (drawY - sin(angle / RAD2DEG) * FixedToInt(textAfter)) ) ; + m_graphicContext->FillPath( path , m_textBackgroundColour ) ; delete path ; } - drawX += (int)(sin(angle/RAD2DEG) * FixedToInt(ascent)); - drawY += (int)(cos(angle/RAD2DEG) * FixedToInt(ascent)); + drawX += (int)(sin(angle / RAD2DEG) * FixedToInt(ascent)); + drawY += (int)(cos(angle / RAD2DEG) * FixedToInt(ascent)); status = ::ATSUMeasureTextImage( atsuLayout, kATSUFromTextBeginning, kATSUToTextEnd, IntToFixed(drawX) , IntToFixed(drawY) , &rect ); wxASSERT_MSG( status == noErr , wxT("couldn't measure the rotated text") ); - CGContextSaveGState(((wxMacCGContext*)(m_graphicContext))->GetNativeContext()); + CGContextSaveGState(((wxMacCGContext*)(m_graphicContext))->GetNativeContext()); CGContextTranslateCTM(((wxMacCGContext*)(m_graphicContext))->GetNativeContext(), drawX, drawY); CGContextScaleCTM(((wxMacCGContext*)(m_graphicContext))->GetNativeContext(), 1, -1); status = ::ATSUDrawText( atsuLayout, kATSUFromTextBeginning, kATSUToTextEnd, IntToFixed(0) , IntToFixed(0) ); + wxASSERT_MSG( status == noErr , wxT("couldn't draw the rotated text") ); + CGContextRestoreGState( ((wxMacCGContext*)(m_graphicContext))->GetNativeContext() ) ; CalcBoundingBox(XDEV2LOG(rect.left), YDEV2LOG(rect.top) ); @@ -1777,51 +1860,55 @@ void wxDC::DoDrawRotatedText(const wxString& str, wxCoord x, wxCoord y, #endif } -void wxDC::DoDrawText(const wxString& strtext, wxCoord x, wxCoord y) +void wxDC::DoDrawText(const wxString& strtext, wxCoord x, wxCoord y) { - wxCHECK_RET(Ok(), wxT("wxDC::DoDrawText Invalid DC")); + wxCHECK_RET( Ok(), wxT("wxDC(cg)::DoDrawText - invalid DC") ); + DoDrawRotatedText( strtext , x , y , 0.0 ) ; } -bool wxDC::CanGetTextExtent() const +bool wxDC::CanGetTextExtent() const { - wxCHECK_MSG(Ok(), false, wxT("Invalid DC")); + wxCHECK_MSG( Ok(), false, wxT("wxDC(cg)::CanGetTextExtent - invalid DC") ); + return true ; } -void wxDC::DoGetTextExtent( const wxString &str, wxCoord *width, wxCoord *height, +void wxDC::DoGetTextExtent( const wxString &str, wxCoord *width, wxCoord *height, wxCoord *descent, wxCoord *externalLeading , wxFont *theFont ) const { - wxCHECK_RET(Ok(), wxT("Invalid DC")); + wxCHECK_RET( Ok(), wxT("wxDC(cg)::DoGetTextExtent - invalid DC") ); + wxFont formerFont = m_font ; if ( theFont ) { - // work around the constness + // work around the const-ness *((wxFont*)(&m_font)) = *theFont ; - MacInstallFont() ; + MacInstallFont() ; } - if ( str.Length() == 0 ) + if ( str.empty() ) return ; - - wxCHECK_RET( m_macATSUIStyle != NULL , wxT("No valid font set") ) ; - + + wxCHECK_RET( m_macATSUIStyle != NULL, wxT("wxDC(cg)::DoGetTextExtent - no valid font set") ) ; + OSStatus status = noErr ; ATSUTextLayout atsuLayout ; - UniCharCount chars = str.Length() ; + UniCharCount chars = str.length() ; UniChar* ubuf = NULL ; + #if SIZEOF_WCHAR_T == 4 - wxMBConvUTF16 converter ; + wxMBConvUTF16 converter ; #if wxUSE_UNICODE - size_t unicharlen = converter.WC2MB( NULL , str.wc_str() , 0 ) ; - ubuf = (UniChar*) malloc( unicharlen + 2 ) ; - converter.WC2MB( (char*) ubuf , str.wc_str(), unicharlen + 2 ) ; + size_t unicharlen = converter.WC2MB( NULL , str.wc_str() , 0 ) ; + ubuf = (UniChar*) malloc( unicharlen + 2 ) ; + converter.WC2MB( (char*) ubuf , str.wc_str(), unicharlen + 2 ) ; #else const wxWCharBuffer wchar = str.wc_str( wxConvLocal ) ; - size_t unicharlen = converter.WC2MB( NULL , wchar.data() , 0 ) ; - ubuf = (UniChar*) malloc( unicharlen + 2 ) ; - converter.WC2MB( (char*) ubuf , wchar.data() , unicharlen + 2 ) ; + size_t unicharlen = converter.WC2MB( NULL , wchar.data() , 0 ) ; + ubuf = (UniChar*) malloc( unicharlen + 2 ) ; + converter.WC2MB( (char*) ubuf , wchar.data() , unicharlen + 2 ) ; #endif chars = unicharlen / 2 ; #else @@ -1838,15 +1925,13 @@ void wxDC::DoGetTextExtent( const wxString &str, wxCoord *width, wxCoord *heigh &chars , (ATSUStyle*) &m_macATSUIStyle , &atsuLayout ) ; wxASSERT_MSG( status == noErr , wxT("couldn't create the layout of the text") ); - - ATSUTextMeasurement textBefore ; - ATSUTextMeasurement textAfter ; - ATSUTextMeasurement textAscent ; - ATSUTextMeasurement textDescent ; + + ATSUTextMeasurement textBefore, textAfter ; + ATSUTextMeasurement textAscent, textDescent ; status = ::ATSUGetUnjustifiedBounds( atsuLayout, kATSUFromTextBeginning, kATSUToTextEnd, &textBefore , &textAfter, &textAscent , &textDescent ); - + if ( height ) *height = YDEV2LOGREL( FixedToInt(textAscent + textDescent) ) ; if ( descent ) @@ -1855,11 +1940,13 @@ void wxDC::DoGetTextExtent( const wxString &str, wxCoord *width, wxCoord *heigh *externalLeading = 0 ; if ( width ) *width = XDEV2LOGREL( FixedToInt(textAfter - textBefore) ) ; - + ::ATSUDisposeTextLayout(atsuLayout); + #if SIZEOF_WCHAR_T == 4 free( ubuf ) ; #endif + if ( theFont ) { // work around the constness @@ -1870,17 +1957,18 @@ void wxDC::DoGetTextExtent( const wxString &str, wxCoord *width, wxCoord *heigh bool wxDC::DoGetPartialTextExtents(const wxString& text, wxArrayInt& widths) const { - wxCHECK_MSG(Ok(), false, wxT("Invalid DC")); + wxCHECK_MSG( Ok(), false, wxT("wxDC(cg)::DoGetPartialTextExtents - invalid DC") ); widths.Empty(); - widths.Add(0, text.Length()); + widths.Add(0, text.length()); - if (text.Length() == 0) + if (text.empty()) return false; - + ATSUTextLayout atsuLayout ; - UniCharCount chars = text.Length() ; + UniCharCount chars = text.length() ; UniChar* ubuf = NULL ; + #if SIZEOF_WCHAR_T == 4 wxMBConvUTF16 converter ; #if wxUSE_UNICODE @@ -1889,7 +1977,7 @@ bool wxDC::DoGetPartialTextExtents(const wxString& text, wxArrayInt& widths) con converter.WC2MB( (char*) ubuf , text.wc_str(), unicharlen + 2 ) ; #else const wxWCharBuffer wchar = text.wc_str( wxConvLocal ) ; - size_t unicharlen = converter.WC2MB( NULL , wchar.data() , 0 ) ; + size_t unicharlen = converter.WC2MB( NULL , wchar.data() , 0 ) ; ubuf = (UniChar*) malloc( unicharlen + 2 ) ; converter.WC2MB( (char*) ubuf , wchar.data() , unicharlen + 2 ) ; #endif @@ -1907,14 +1995,14 @@ bool wxDC::DoGetPartialTextExtents(const wxString& text, wxArrayInt& widths) con OSStatus status; status = ::ATSUCreateTextLayoutWithTextPtr( (UniCharArrayPtr) ubuf , 0 , chars , chars , 1 , &chars , (ATSUStyle*) &m_macATSUIStyle , &atsuLayout ) ; - + for ( int pos = 0; pos < (int)chars; pos ++ ) { unsigned long actualNumberOfBounds = 0; ATSTrapezoid glyphBounds; // We get a single bound, since the text should only require one. If it requires more, there is an issue - OSStatus result; + OSStatus result; result = ATSUGetGlyphBounds( atsuLayout, 0, 0, kATSUFromTextBeginning, pos + 1, kATSUseDeviceOrigins, 1, &glyphBounds, &actualNumberOfBounds ); if (result != noErr || actualNumberOfBounds != 1 ) @@ -1928,29 +2016,31 @@ bool wxDC::DoGetPartialTextExtents(const wxString& text, wxArrayInt& widths) con return true; } -wxCoord wxDC::GetCharWidth(void) const +wxCoord wxDC::GetCharWidth(void) const { wxCoord width ; - DoGetTextExtent(wxT("g") , &width , NULL , NULL , NULL , NULL ) ; + DoGetTextExtent( wxT("g") , &width , NULL , NULL , NULL , NULL ) ; + return width ; } -wxCoord wxDC::GetCharHeight(void) const +wxCoord wxDC::GetCharHeight(void) const { wxCoord height ; - DoGetTextExtent(wxT("g") , NULL , &height , NULL , NULL , NULL ) ; + DoGetTextExtent( wxT("g") , NULL , &height , NULL , NULL , NULL ) ; + return height ; } -void wxDC::Clear(void) +void wxDC::Clear(void) { - wxCHECK_RET(Ok(), wxT("Invalid DC")); + wxCHECK_RET( Ok(), wxT("wxDC(cg)::Clear - invalid DC") ); - if ( m_backgroundBrush.Ok() && m_backgroundBrush.GetStyle() != wxTRANSPARENT) - { + if (m_backgroundBrush.Ok() && m_backgroundBrush.GetStyle() != wxTRANSPARENT) + { HIRect rect = CGRectMake( -10000 , -10000 , 20000 , 20000 ) ; CGContextRef cg = ((wxMacCGContext*)(m_graphicContext))->GetNativeContext() ; - switch( m_backgroundBrush.MacGetBrushKind() ) + switch ( m_backgroundBrush.MacGetBrushKind() ) { case kwxMacBrushTheme : { @@ -1964,7 +2054,7 @@ void wxDC::Clear(void) else #endif { - RGBColor color; + RGBColor color; GetThemeBrushAsColor( m_backgroundBrush.MacGetTheme(), 32, true, &color ); CGContextSetRGBFillColor( cg, (float) color.red / 65536, (float) color.green / 65536, (float) color.blue / 65536, 1 ); @@ -1980,18 +2070,19 @@ void wxDC::Clear(void) case kwxMacBrushThemeBackground : { wxFAIL_MSG( wxT("There shouldn't be theme backgrounds under Quartz") ) ; + #if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_3 if ( UMAGetSystemVersion() >= 0x1030 ) { HIThemeBackgroundDrawInfo drawInfo ; drawInfo.version = 0 ; drawInfo.state = kThemeStateActive ; - drawInfo.kind = m_backgroundBrush.MacGetThemeBackground(NULL) ; + drawInfo.kind = m_backgroundBrush.MacGetThemeBackground( NULL ) ; if ( drawInfo.kind == kThemeBackgroundMetal ) - HIThemeDrawBackground( &rect , &drawInfo, cg , - kHIThemeOrientationNormal) ; - HIThemeApplyBackground( &rect , &drawInfo, cg , - kHIThemeOrientationNormal) ; + { + HIThemeDrawBackground( &rect, &drawInfo, cg, kHIThemeOrientationNormal ) ; + HIThemeApplyBackground( &rect, &drawInfo, cg, kHIThemeOrientationNormal ) ; + } } #endif } @@ -1999,6 +2090,9 @@ void wxDC::Clear(void) case kwxMacBrushColour : { + // FIXME: doesn't correctly render stippled brushes !! + // FIXME: should this be replaced by ::SetBrush() ?? + RGBColor col = MAC_WXCOLORREF( m_backgroundBrush.GetColour().GetPixel()) ; CGContextSetRGBFillColor( cg , col.red / 65536.0 , col.green / 65536.0 , col.blue / 65536.0 , 1.0 ) ; CGContextFillRect(cg, rect); @@ -2009,7 +2103,8 @@ void wxDC::Clear(void) } break ; - default + default : + wxFAIL_MSG( wxT("unknown brush kind") ) ; break ; } } @@ -2017,7 +2112,7 @@ void wxDC::Clear(void) void wxDC::MacInstallFont() const { - wxCHECK_RET(Ok(), wxT("Invalid DC")); + wxCHECK_RET( Ok(), wxT("wxDC(cg)::MacInstallFont - invalid DC") ); if ( m_macATSUIStyle ) { @@ -2027,9 +2122,11 @@ void wxDC::MacInstallFont() const if ( m_font.Ok() ) { - OSStatus status = noErr ; + OSStatus status ; + status = ATSUCreateAndCopyStyle( (ATSUStyle) m_font.MacGetATSUStyle() , (ATSUStyle*) &m_macATSUIStyle ) ; - wxASSERT_MSG( status == noErr , wxT("couldn't set create ATSU style") ) ; + + wxASSERT_MSG( status == noErr, wxT("couldn't create ATSU style") ) ; Fixed atsuSize = IntToFixed( int(m_scaleY * m_font.MacGetFontSize()) ) ; RGBColor atsuColor = MAC_WXCOLORREF( m_textForegroundColour.GetPixel() ) ; @@ -2038,27 +2135,27 @@ void wxDC::MacInstallFont() const kATSUSizeTag , kATSUColorTag , } ; - ByteCount atsuSizes[sizeof(atsuTags)/sizeof(ATSUAttributeTag)] = + ByteCount atsuSizes[sizeof(atsuTags) / sizeof(ATSUAttributeTag)] = { sizeof( Fixed ) , sizeof( RGBColor ) , } ; - // Boolean kTrue = true ; - // Boolean kFalse = false ; - - // ATSUVerticalCharacterType kHorizontal = kATSUStronglyHorizontal; - ATSUAttributeValuePtr atsuValues[sizeof(atsuTags)/sizeof(ATSUAttributeTag)] = + ATSUAttributeValuePtr atsuValues[sizeof(atsuTags) / sizeof(ATSUAttributeTag)] = { &atsuSize , &atsuColor , } ; - status = ::ATSUSetAttributes((ATSUStyle)m_macATSUIStyle, sizeof(atsuTags)/sizeof(ATSUAttributeTag) , + + status = ::ATSUSetAttributes( + (ATSUStyle)m_macATSUIStyle, sizeof(atsuTags) / sizeof(ATSUAttributeTag) , atsuTags, atsuSizes, atsuValues); - wxASSERT_MSG( status == noErr , wxT("couldn't Modify ATSU style") ) ; + wxASSERT_MSG( status == noErr , wxT("couldn't modify ATSU style") ) ; } } +#pragma mark - + // --------------------------------------------------------------------------- // coordinates transformations // --------------------------------------------------------------------------- @@ -2104,4 +2201,3 @@ wxCoord wxDCBase::LogicalToDeviceYRel(wxCoord y) const } #endif // wxMAC_USE_CORE_GRAPHICS -