#include "wx/icon.h"
#endif
-#include "wx/mac/uma.h"
-
#ifdef __MSL__
#if __MSL__ >= 0x6000
#include "math.h"
#endif
#endif
-#include "wx/mac/private.h"
+#ifdef __WXMAC__
+ #include "wx/mac/uma.h"
+#else
+ #include "CoreServices/CoreServices.h"
+ #include "ApplicationServices/ApplicationServices.h"
+ #include "wx/mac/corefoundation/cfstring.h"
+ #include "wx/cocoa/dcclient.h"
+#endif
+
+#ifdef __WXCOCOA__
+
+CGColorSpaceRef wxMacGetGenericRGBColorSpace()
+{
+ static wxCFRef<CGColorSpaceRef> genericRGBColorSpace;
+
+ if (genericRGBColorSpace == NULL)
+ {
+ genericRGBColorSpace.reset( CGColorSpaceCreateWithName( kCGColorSpaceGenericRGB ) );
+ }
+
+ return genericRGBColorSpace;
+}
+
+int UMAGetSystemVersion()
+{
+ return 0x1050;
+}
+
+
+#define wxMAC_USE_CORE_TEXT 1
+
+#endif
//-----------------------------------------------------------------------------
// constants
OSStatus wxMacDrawCGImage(
CGContextRef inContext,
- const HIRect * inBounds,
- CGImageRef inImage)
+ const CGRect * inBounds,
+ CGImageRef inImage)
{
-#ifdef __LP64__
+#if defined( __LP64__ ) || defined(__WXCOCOA__)
// todo flip
CGContextDrawImage(inContext, *inBounds, inImage );
return noErr;
#endif
}
+CGColorRef wxMacCreateCGColor( const wxColour& col )
+{
+ CGColorRef retval = 0;
+#ifdef __WXMAC__
+ retval = col.CreateCGColor();
+#else
+// TODO add conversion NSColor - CGColorRef (obj-c)
+#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_5
+ if ( CGColorCreateGenericRGB )
+ retval = CGColorCreateGenericRGB( col.Red() / 255.0 , col.Green() / 255.0, col.Blue() / 255.0, col.Alpha() / 255.0 );
+ else
+#endif
+ {
+ CGFloat components[4] = { col.Red() / 255.0, col.Green() / 255.0, col.Blue() / 255.0, col.Alpha() / 255.0 } ;
+ retval = CGColorCreate( wxMacGetGenericRGBColorSpace() , components ) ;
+ }
+
+#endif
+ return retval;
+}
+
+#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_5 && defined(wxMAC_USE_CORE_TEXT)
+
+CTFontRef wxMacCreateCTFont( const wxFont& font )
+{
+#ifdef __WXMAC__
+ return wxCFRetain((CTFontRef) font.MacGetCTFont());
+#else
+ return CTFontCreateWithName( wxCFStringRef( font.GetFaceName(), wxLocale::GetSystemEncoding() ) , font.GetPointSize() , NULL );
+#endif
+}
+
+#endif
+
// CGPattern wrapper class: always allocate on heap, never call destructor
class wxMacCoreGraphicsPattern
ImagePattern( const wxBitmap* bmp , const CGAffineTransform& transform )
{
wxASSERT( bmp && bmp->Ok() );
-
+#ifdef __WXMAC__
Init( (CGImageRef) bmp->CreateCGImage() , transform );
+#endif
}
// ImagePattern takes ownership of CGImageRef passed in
{
Init();
- m_color.reset( pen.GetColour().CreateCGColor() ) ;
+ m_color.reset( wxMacCreateCGColor( pen.GetColour() ) ) ;
// TODO: * m_dc->m_scaleX
m_width = pen.GetWidth();
wxMacCoreGraphicsColour();
wxMacCoreGraphicsColour(const wxBrush &brush);
~wxMacCoreGraphicsColour();
-
+
void Apply( CGContextRef cgContext );
protected:
void Init();
wxCFRef<CGColorRef> m_color;
wxCFRef<CGColorSpaceRef> m_colorSpace;
-
+
bool m_isPattern;
wxCFRef<CGPatternRef> m_pattern;
CGFloat* m_patternColorComponents;
}
}
-wxMacCoreGraphicsColour::wxMacCoreGraphicsColour()
+wxMacCoreGraphicsColour::wxMacCoreGraphicsColour()
{
Init();
}
Init();
if ( brush.GetStyle() == wxSOLID )
{
- m_color.reset( brush.GetColour().CreateCGColor() );
+ m_color.reset( wxMacCreateCGColor( brush.GetColour() ));
}
else if ( brush.IsHatch() )
{
CTFontRef GetCTFont() const { return m_ctFont ; }
#endif
wxColour GetColour() const { return m_colour ; }
-
+
bool GetUnderlined() const { return m_underlined ; }
private :
wxColour m_colour;
m_underlined = font.GetUnderlined();
#if wxMAC_USE_CORE_TEXT
- m_ctFont.reset( wxCFRetain((CTFontRef) font.MacGetCTFont()) );
+ m_ctFont.reset( wxMacCreateCTFont( font ) );
#endif
#if wxMAC_USE_ATSU_TEXT
OSStatus status = noErr;
#endif
}
+class wxMacCoreGraphicsBitmapData : public wxGraphicsObjectRefData
+{
+public:
+ wxMacCoreGraphicsBitmapData( wxGraphicsRenderer* renderer, CGImageRef bitmap );
+ ~wxMacCoreGraphicsBitmapData();
+
+ virtual CGImageRef GetBitmap() { return m_bitmap; }
+private :
+ CGImageRef m_bitmap;
+};
+
+wxMacCoreGraphicsBitmapData::wxMacCoreGraphicsBitmapData( wxGraphicsRenderer* renderer, CGImageRef bitmap ) : wxGraphicsObjectRefData( renderer )
+{
+ m_bitmap = bitmap;
+}
+
+wxMacCoreGraphicsBitmapData::~wxMacCoreGraphicsBitmapData()
+{
+ CGImageRelease( m_bitmap );
+}
+
//
// Graphics Matrix
//
// gets the component valuess of the matrix
virtual void Get(wxDouble* a=NULL, wxDouble* b=NULL, wxDouble* c=NULL,
wxDouble* d=NULL, wxDouble* tx=NULL, wxDouble* ty=NULL) const;
-
+
// makes this the inverse matrix
virtual void Invert();
virtual void GetSize( wxDouble* width, wxDouble* height);
virtual void StartPage( wxDouble width, wxDouble height );
-
+
virtual void EndPage();
virtual void Flush();
virtual void DrawPath( const wxGraphicsPath &path, int fillStyle = wxODDEVEN_RULE );
virtual bool ShouldOffset() const
- {
+ {
int penwidth = 0 ;
if ( !m_pen.IsNull() )
{
virtual void DrawBitmap( const wxBitmap &bmp, wxDouble x, wxDouble y, wxDouble w, wxDouble h );
+ virtual void DrawBitmap( const wxGraphicsBitmap &bmp, wxDouble x, wxDouble y, wxDouble w, wxDouble h );
+
virtual void DrawIcon( const wxIcon &icon, wxDouble x, wxDouble y, wxDouble w, wxDouble h );
void SetNativeContext( CGContextRef cg );
m_windowRef = NULL;
m_width = 0;
m_height = 0;
-
- HIRect r = CGRectMake(0,0,0,0);
+ CGRect r = CGRectMake(0,0,0,0);
m_clipRgn.reset(HIShapeCreateWithRect(&r));
}
wxMacCoreGraphicsContext::wxMacCoreGraphicsContext( wxGraphicsRenderer* renderer, wxWindow* window ): wxGraphicsContext(renderer)
{
Init();
- m_windowRef = (WindowRef) window->MacGetTopLevelWindowRef();
+
int originX , originY;
originX = originY = 0;
- window->MacWindowToRootWindow( &originX , &originY );
Rect bounds = { 0,0,0,0 };
-#ifdef __LP64__
+#if defined( __LP64__ ) || defined(__WXCOCOA__)
#else
+ m_windowRef = (WindowRef) window->MacGetTopLevelWindowRef();
+ window->MacWindowToRootWindow( &originX , &originY );
GetWindowBounds( m_windowRef, kWindowContentRgn, &bounds );
#endif
m_windowTransform = CGAffineTransformMakeTranslation( 0 , bounds.bottom - bounds.top );
r = CGRectMake( 0 , 0 , width , height );
else
r = CGRectMake( 0 , 0 , m_width , m_height );
-
+
CGContextBeginPage(m_cgContext, &r );
// CGContextTranslateCTM( m_cgContext , 0 , height == 0 ? m_height : height );
// CGContextScaleCTM( m_cgContext , 1 , -1 );
}
-
+
void wxMacCoreGraphicsContext::EndPage()
{
CGContextEndPage(m_cgContext);
{
if ( !m_cgContext )
{
- OSStatus status =
-#ifndef __LP64__
+ OSStatus status =
+#if ! ( defined( __LP64__ ) || defined(__WXCOCOA__) )
QDBeginCGContext( GetWindowPort( m_windowRef ) , &m_cgContext );
#else
paramErr;
#endif
- wxASSERT_MSG( status == noErr , wxT("Cannot nest wxDCs on the same window") );
+ if ( status != noErr )
+ {
+ wxFAIL_MSG("Cannot nest wxDCs on the same window");
+ }
CGContextConcatCTM( m_cgContext, m_windowTransform );
- CGContextSaveGState( m_cgContext );
- m_releaseContext = true;
- if ( !HIShapeIsEmpty(m_clipRgn) )
- {
+ CGContextSaveGState( m_cgContext );
+ m_releaseContext = true;
+ if ( !HIShapeIsEmpty(m_clipRgn) )
+ {
// the clip region is in device coordinates, so we convert this again to user coordinates
wxCFRef<HIMutableShapeRef> hishape( HIShapeCreateMutableCopy( m_clipRgn ) );
CGPoint transformedOrigin = CGPointApplyAffineTransform( CGPointZero,m_windowTransform);
HIShapeOffset( hishape, -transformedOrigin.x, -transformedOrigin.y );
- HIShapeReplacePathInCGContext( hishape, m_cgContext );
- CGContextClip( m_cgContext );
- }
- CGContextSaveGState( m_cgContext );
- }
+ HIShapeReplacePathInCGContext( hishape, m_cgContext );
+ CGContextClip( m_cgContext );
+ }
+ CGContextSaveGState( m_cgContext );
+ }
}
// TODO test whether the private CGContextSetCompositeOperation works under 10.3 (using NSCompositingModes)
return true;
EnsureIsValid();
-
+
bool retval = false;
bool shouldAntiAlias = true;
CGBlendMode mode = kCGBlendModeNormal;
-
-#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_5
+
+#if defined(__WXMAC__) && ( MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_5 )
if ( UMAGetSystemVersion() >= 0x1050 )
{
retval = true;
case wxXOR :
mode = kCGBlendModeXOR;
shouldAntiAlias = false;
- break;
+ break;
default :
retval = false;
break;
retval = true;
}
}
-
+
if (retval)
{
m_logicalFunction = function;
void wxMacCoreGraphicsContext::Clip( const wxRegion ®ion )
{
+#ifdef __WXMAC__
if( m_cgContext )
{
HIShapeReplacePathInCGContext( region.GetWXHRGN() , m_cgContext );
// this offsetting to device coords is not really correct, but since we cannot apply affine transforms
// to regions we try at least to have correct translations
HIMutableShapeRef mutableShape = HIShapeCreateMutableCopy( region.GetWXHRGN() );
-
+
CGPoint transformedOrigin = CGPointApplyAffineTransform( CGPointZero, m_windowTransform );
HIShapeOffset( mutableShape, transformedOrigin.x, transformedOrigin.y );
m_clipRgn.reset(mutableShape);
}
+#endif
}
// clips drawings to the rect
void wxMacCoreGraphicsContext::Clip( wxDouble x, wxDouble y, wxDouble w, wxDouble h )
{
- HIRect r = CGRectMake( x , y , w , h );
+ CGRect r = CGRectMake( x , y , w , h );
if ( m_cgContext )
{
CGContextClipToRect( m_cgContext, r );
}
else
{
- // the clipping itself must be stored as device coordinates, otherwise
+ // the clipping itself must be stored as device coordinates, otherwise
// we cannot apply it back correctly
r.origin= CGPointApplyAffineTransform( r.origin, m_windowTransform );
m_clipRgn.reset(HIShapeCreateWithRect(&r));
}
else
{
- HIRect r = CGRectMake(0,0,0,0);
+ CGRect r = CGRectMake(0,0,0,0);
m_clipRgn.reset(HIShapeCreateWithRect(&r));
}
}
CGContextRestoreGState( m_cgContext );
if ( m_releaseContext )
{
-#ifndef __LP64__
+#if ! ( defined( __LP64__ ) || defined(__WXCOCOA__) )
QDEndCGContext( GetWindowPort( m_windowRef ) , &m_cgContext);
#endif
}
{
CGContextRetain(m_cgContext);
CGContextSaveGState( m_cgContext );
+ CGContextSetTextMatrix( m_cgContext, CGAffineTransformIdentity );
CGContextSaveGState( m_cgContext );
m_releaseContext = false;
}
void wxMacCoreGraphicsContext::DrawBitmap( const wxBitmap &bmp, wxDouble x, wxDouble y, wxDouble w, wxDouble h )
{
- EnsureIsValid();
+ wxGraphicsBitmap bitmap = GetRenderer()->CreateBitmap(bmp);
+ DrawBitmap(bitmap, x, y, w, h);
+}
- CGImageRef image = (CGImageRef)( bmp.CreateCGImage() );
- HIRect r = CGRectMake( x , y , w , h );
- if ( bmp.GetDepth() == 1 )
+void wxMacCoreGraphicsContext::DrawBitmap( const wxGraphicsBitmap &bmp, wxDouble x, wxDouble y, wxDouble w, wxDouble h )
+{
+ EnsureIsValid();
+#ifdef __WXMAC__
+ CGImageRef image = static_cast<wxMacCoreGraphicsBitmapData*>(bmp.GetRefData())->GetBitmap();
+ CGRect r = CGRectMake( x , y , w , h );
+ // if ( bmp.GetDepth() == 1 )
{
// is is a mask, the '1' in the mask tell where to draw the current brush
if ( !m_brush.IsNull() )
}
}
}
+ /*
else
{
wxMacDrawCGImage( m_cgContext , &r , image );
}
CGImageRelease( image );
+ */
+#endif
}
void wxMacCoreGraphicsContext::DrawIcon( const wxIcon &icon, wxDouble x, wxDouble y, wxDouble w, wxDouble h )
CGContextSaveGState( m_cgContext );
CGContextTranslateCTM( m_cgContext, x , y + h );
CGContextScaleCTM( m_cgContext, 1, -1 );
+#ifdef __WXMAC__
PlotIconRefInContext( m_cgContext , &r , kAlignNone , kTransformNone ,
NULL , kPlotIconRefNormalFlags , MAC_WXHICON( icon.GetHICON() ) );
+#endif
CGContextRestoreGState( m_cgContext );
}
{
if ( m_font.IsNull() )
return;
-
+
EnsureIsValid();
#if wxMAC_USE_CORE_TEXT
if ( UMAGetSystemVersion() >= 0x1050 )
wxMacCoreGraphicsFontData* fref = (wxMacCoreGraphicsFontData*)m_font.GetRefData();
wxCFStringRef text(str, wxLocale::GetSystemEncoding() );
CTFontRef font = fref->GetCTFont();
- CGColorRef col = fref->GetColour().GetPixel();
+ CGColorRef col = wxMacCreateCGColor( fref->GetColour() );
CTUnderlineStyle ustyle = fref->GetUnderlined() ? kCTUnderlineStyleSingle : kCTUnderlineStyleNone ;
- wxCFRef<CFNumberRef> underlined( CFNumberCreate(NULL, kCFNumberSInt32Type, &ustyle) );
+ wxCFRef<CFNumberRef> underlined( CFNumberCreate(NULL, kCFNumberSInt32Type, &ustyle) );
CFStringRef keys[] = { kCTFontAttributeName , kCTForegroundColorAttributeName, kCTUnderlineStyleAttributeName };
CFTypeRef values[] = { font, col, underlined };
- wxCFRef<CFDictionaryRef> attributes( CFDictionaryCreate(kCFAllocatorDefault, (const void**) &keys, (const void**) &values,
+ wxCFRef<CFDictionaryRef> attributes( CFDictionaryCreate(kCFAllocatorDefault, (const void**) &keys, (const void**) &values,
WXSIZEOF( keys ), &kCFTypeDictionaryKeyCallBacks, &kCFTypeDictionaryValueCallBacks) );
wxCFRef<CFAttributedStringRef> attrtext( CFAttributedStringCreate(kCFAllocatorDefault, text, attributes) );
wxCFRef<CTLineRef> line( CTLineCreateWithAttributedString(attrtext) );
-
+
y += CTFontGetAscent(font);
-
+
CGContextSaveGState(m_cgContext);
CGContextTranslateCTM(m_cgContext, x, y);
CGContextScaleCTM(m_cgContext, 1, -1);
CGContextSetTextPosition(m_cgContext, 0, 0);
CTLineDraw( line, m_cgContext );
CGContextRestoreGState(m_cgContext);
+ CFRelease( col );
return;
}
#endif
ATSUStyle style = (((wxMacCoreGraphicsFontData*)m_font.GetRefData())->GetATSUStyle());
status = ::ATSUCreateTextLayoutWithTextPtr( unibuf.GetBuffer() , 0 , chars , chars , 1 ,
&chars , &style , &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 * RAD2DEG );
if ( abs(iAngle) > 0 )
{
status = ::ATSUSetLayoutControls(atsuLayout , sizeof(atsuTags) / sizeof(ATSUAttributeTag),
atsuTags, atsuSizes, atsuValues );
}
-
+
{
ATSUAttributeTag atsuTags[] =
{
status = ::ATSUSetLayoutControls(atsuLayout , sizeof(atsuTags) / sizeof(ATSUAttributeTag),
atsuTags, atsuSizes, atsuValues );
}
-
+
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;
x += (int)(sin(angle) * FixedToInt(ascent));
y += (int)(cos(angle) * FixedToInt(ascent));
-
+
status = ::ATSUMeasureTextImage( atsuLayout, kATSUFromTextBeginning, kATSUToTextEnd,
IntToFixed(x) , IntToFixed(y) , &rect );
wxASSERT_MSG( status == noErr , wxT("couldn't measure the rotated text") );
-
+
CGContextSaveGState(m_cgContext);
CGContextTranslateCTM(m_cgContext, x, y);
CGContextScaleCTM(m_cgContext, 1, -1);
status = ::ATSUDrawText( atsuLayout, kATSUFromTextBeginning, kATSUToTextEnd,
IntToFixed(0) , IntToFixed(0) );
-
+
wxASSERT_MSG( status == noErr , wxT("couldn't draw the rotated text") );
-
+
CGContextRestoreGState(m_cgContext);
-
+
::ATSUDisposeTextLayout(atsuLayout);
-
+
return;
}
#endif
*descent = 0;
if ( externalLeading )
*externalLeading = 0;
-
+
if (str.empty())
return;
wxCFStringRef text(str, wxLocale::GetSystemEncoding() );
CFStringRef keys[] = { kCTFontAttributeName };
CFTypeRef values[] = { font };
- wxCFRef<CFDictionaryRef> attributes( CFDictionaryCreate(kCFAllocatorDefault, (const void**) &keys, (const void**) &values,
+ wxCFRef<CFDictionaryRef> attributes( CFDictionaryCreate(kCFAllocatorDefault, (const void**) &keys, (const void**) &values,
WXSIZEOF( keys ), &kCFTypeDictionaryKeyCallBacks, &kCFTypeDictionaryValueCallBacks) );
wxCFRef<CFAttributedStringRef> attrtext( CFAttributedStringCreate(kCFAllocatorDefault, text, attributes) );
wxCFRef<CTLineRef> line( CTLineCreateWithAttributedString(attrtext) );
-
+
CGFloat w, a, d, l;
-
+
w = CTLineGetTypographicBounds(line, &a, &d, &l) ;
-
+
if ( height )
*height = a+d+l;
if ( descent )
#if wxMAC_USE_ATSU_TEXT
{
OSStatus status = noErr;
-
+
ATSUTextLayout atsuLayout;
wxMacUniCharBuffer unibuf( str );
UniCharCount chars = unibuf.GetChars();
-
+
ATSUStyle style = (((wxMacCoreGraphicsFontData*)m_font.GetRefData())->GetATSUStyle());
status = ::ATSUCreateTextLayoutWithTextPtr( unibuf.GetBuffer() , 0 , chars , chars , 1 ,
&chars , &style , &atsuLayout );
-
+
wxASSERT_MSG( status == noErr , wxT("couldn't create the layout of the text") );
-
+
+ status = ::ATSUSetTransientFontMatching( atsuLayout , true );
+ wxASSERT_MSG( status == noErr , wxT("couldn't setup transient font matching") );
+
ATSUTextMeasurement textBefore, textAfter;
ATSUTextMeasurement textAscent, textDescent;
-
+
status = ::ATSUGetUnjustifiedBounds( atsuLayout, kATSUFromTextBeginning, kATSUToTextEnd,
&textBefore , &textAfter, &textAscent , &textDescent );
-
+
if ( height )
*height = FixedToInt(textAscent + textDescent);
if ( descent )
*externalLeading = 0;
if ( width )
*width = FixedToInt(textAfter - textBefore);
-
+
::ATSUDisposeTextLayout(atsuLayout);
return;
{
wxMacCoreGraphicsFontData* fref = (wxMacCoreGraphicsFontData*)m_font.GetRefData();
CTFontRef font = fref->GetCTFont();
-
+
wxCFStringRef t(text, wxLocale::GetSystemEncoding() );
CFStringRef keys[] = { kCTFontAttributeName };
CFTypeRef values[] = { font };
- wxCFRef<CFDictionaryRef> attributes( CFDictionaryCreate(kCFAllocatorDefault, (const void**) &keys, (const void**) &values,
+ wxCFRef<CFDictionaryRef> attributes( CFDictionaryCreate(kCFAllocatorDefault, (const void**) &keys, (const void**) &values,
WXSIZEOF( keys ), &kCFTypeDictionaryKeyCallBacks, &kCFTypeDictionaryValueCallBacks) );
wxCFRef<CFAttributedStringRef> attrtext( CFAttributedStringCreate(kCFAllocatorDefault, t, attributes) );
wxCFRef<CTLineRef> line( CTLineCreateWithAttributedString(attrtext) );
-
+
int chars = text.length();
for ( int pos = 0; pos < (int)chars; pos ++ )
{
widths[pos] = CTLineGetOffsetForStringIndex( line, pos+1 , NULL )+0.5;
}
-
+
return;
}
#endif
#if wxMAC_USE_ATSU_TEXT
{
+ OSStatus status = noErr;
ATSUTextLayout atsuLayout;
wxMacUniCharBuffer unibuf( text );
UniCharCount chars = unibuf.GetChars();
-
+
ATSUStyle style = (((wxMacCoreGraphicsFontData*)m_font.GetRefData())->GetATSUStyle());
- ::ATSUCreateTextLayoutWithTextPtr( unibuf.GetBuffer() , 0 , chars , chars , 1 ,
+ status = ::ATSUCreateTextLayoutWithTextPtr( unibuf.GetBuffer() , 0 , chars , chars , 1 ,
&chars , &style , &atsuLayout );
-
+
+ wxASSERT_MSG( status == noErr , wxT("couldn't create the layout of the text") );
+
+ status = ::ATSUSetTransientFontMatching( atsuLayout , true );
+ wxASSERT_MSG( status == noErr , wxT("couldn't setup transient font matching") );
+
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;
result = ATSUGetGlyphBounds( atsuLayout, 0, 0, kATSUFromTextBeginning, pos + 1,
kATSUseDeviceOrigins, 1, &glyphBounds, &actualNumberOfBounds );
if (result != noErr || actualNumberOfBounds != 1 )
return;
-
+
widths[pos] = FixedToInt( glyphBounds.upperRight.x - glyphBounds.upperLeft.x );
//unsigned char uch = s[i];
}
-
+
::ATSUDisposeTextLayout(atsuLayout);
}
#endif
virtual wxGraphicsContext * CreateContextFromNativeWindow( void * window );
virtual wxGraphicsContext * CreateContext( wxWindow* window );
-
+
virtual wxGraphicsContext * CreateMeasuringContext();
// Path
// sets the font
virtual wxGraphicsFont CreateFont( const wxFont &font , const wxColour &col = *wxBLACK ) ;
+ // create a native bitmap representation
+ virtual wxGraphicsBitmap CreateBitmap( const wxBitmap &bitmap ) ;
+
+ // create a native bitmap representation
+ virtual wxGraphicsBitmap CreateSubBitmap( const wxGraphicsBitmap &bitmap, wxDouble x, wxDouble y, wxDouble w, wxDouble h ) ;
private :
DECLARE_DYNAMIC_CLASS_NO_COPY(wxMacCoreGraphicsRenderer)
} ;
return &gs_MacCoreGraphicsRenderer;
}
+#ifdef __WXCOCOA__
+extern CGContextRef wxMacGetContextFromCurrentNSContext() ;
+#endif
+
wxGraphicsContext * wxMacCoreGraphicsRenderer::CreateContext( const wxWindowDC& dc )
{
const wxDCImpl* impl = dc.GetImpl();
wxWindowDCImpl *win_impl = wxDynamicCast( impl, wxWindowDCImpl );
if (win_impl)
- return new wxMacCoreGraphicsContext( this,
- (CGContextRef)(win_impl->GetWindow()->MacGetCGContextRef()) );
-
+ {
+ int w, h;
+ win_impl->GetSize( &w, &h );
+ CGContextRef cgctx = 0;
+#ifdef __WXMAC__
+ cgctx = (CGContextRef)(win_impl->GetWindow()->MacGetCGContextRef());
+#else
+ cgctx = wxMacGetContextFromCurrentNSContext() ;
+#endif
+ return new wxMacCoreGraphicsContext( this, cgctx, (wxDouble) w, (wxDouble) h );
+ }
return NULL;
}
wxGraphicsContext * wxMacCoreGraphicsRenderer::CreateContext( const wxMemoryDC& dc )
{
+#ifdef __WXMAC__
const wxDCImpl* impl = dc.GetImpl();
wxMemoryDCImpl *mem_impl = wxDynamicCast( impl, wxMemoryDCImpl );
if (mem_impl)
- return new wxMacCoreGraphicsContext( this,
- (CGContextRef)(mem_impl->GetGraphicsContext()->GetNativeContext()) );
-
+ {
+ int w, h;
+ mem_impl->GetSize( &w, &h );
+ return new wxMacCoreGraphicsContext( this,
+ (CGContextRef)(mem_impl->GetGraphicsContext()->GetNativeContext()), (wxDouble) w, (wxDouble) h );
+ }
+#endif
return NULL;
}
}
}
+wxGraphicsBitmap wxMacCoreGraphicsRenderer::CreateBitmap( const wxBitmap& bmp )
+{
+ if ( bmp.Ok() )
+ {
+ wxGraphicsBitmap p;
+#ifdef __WXMAC__
+ p.SetRefData(new wxMacCoreGraphicsBitmapData( this , bmp.CreateCGImage() ) );
+#endif
+ return p;
+ }
+ else
+ return wxNullGraphicsBitmap;
+}
+
+wxGraphicsBitmap wxMacCoreGraphicsRenderer::CreateSubBitmap( const wxGraphicsBitmap &bmp, wxDouble x, wxDouble y, wxDouble w, wxDouble h )
+{
+ CGImageRef img = static_cast<wxMacCoreGraphicsBitmapData*>(bmp.GetRefData())->GetBitmap();
+ if ( img )
+ {
+ wxGraphicsBitmap p;
+ CGImageRef subimg = CGImageCreateWithImageInRect(img,CGRectMake( x , y , w , h ));
+ p.SetRefData(new wxMacCoreGraphicsBitmapData( this , subimg ) );
+ return p;
+ }
+ else
+ return wxNullGraphicsBitmap;
+}
+
// sets the brush to a linear gradient, starting at (x1,y1) with color c1 to (x2,y2) with color c2
wxGraphicsBrush wxMacCoreGraphicsRenderer::CreateLinearGradientBrush( wxDouble x1, wxDouble y1, wxDouble x2, wxDouble y2,
const wxColour&c1, const wxColour&c2)
return CGDataConsumerCreateWithCFData( data );
}
-void wxMacReleaseMemoryBufferProviderCallback(void *info, const void *data, size_t WXUNUSED(size))
+void
+wxMacReleaseMemoryBufferProviderCallback(void *info,
+ const void * WXUNUSED_UNLESS_DEBUG(data),
+ size_t WXUNUSED(size))
{
wxMemoryBuffer* membuf = (wxMemoryBuffer*) info ;
wxMemoryBuffer* b = new wxMemoryBuffer( buf );
if ( b->GetDataLen() == 0 )
return NULL;
-
+
return CGDataProviderCreateWithData( b , (const void *) b->GetData() , b->GetDataLen() ,
wxMacReleaseMemoryBufferProviderCallback );
-}
\ No newline at end of file
+}
projects / wxWidgets.git / blobdiff