#include "wx/wxprec.h"
#include "wx/graphics.h"
+#include "wx/private/graphics.h"
#ifndef WX_PRECOMP
#include "wx/dcclient.h"
#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,
+ 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
protected :
CGLineCap m_cap;
- wxMacCFRefHolder<CGColorRef> m_color;
- wxMacCFRefHolder<CGColorSpaceRef> m_colorSpace;
+ wxCFRef<CGColorRef> m_color;
+ wxCFRef<CGColorSpaceRef> m_colorSpace;
CGLineJoin m_join;
CGFloat m_width;
bool m_isPattern;
- wxMacCFRefHolder<CGPatternRef> m_pattern;
+ wxCFRef<CGPatternRef> m_pattern;
CGFloat* m_patternColorComponents;
};
{
Init();
- CGFloat components[4] = { pen.GetColour().Red() / 255.0 , pen.GetColour().Green() / 255.0 ,
- pen.GetColour().Blue() / 255.0 , pen.GetColour().Alpha() / 255.0 } ;
- m_color.Set( CGColorCreate( wxMacGetGenericRGBColorSpace() , components ) ) ;
+ m_color.reset( wxMacCreateCGColor( pen.GetColour() ) ) ;
// TODO: * m_dc->m_scaleX
m_width = pen.GetWidth();
wxBitmap* bmp = pen.GetStipple();
if ( bmp && bmp->Ok() )
{
- m_colorSpace.Set( CGColorSpaceCreatePattern( NULL ) );
- m_pattern.Set( *( new ImagePattern( bmp , CGAffineTransformMakeScale( 1,-1 ) ) ) );
+ m_colorSpace.reset( CGColorSpaceCreatePattern( NULL ) );
+ m_pattern.reset( (CGPatternRef) *( new ImagePattern( bmp , CGAffineTransformMakeScale( 1,-1 ) ) ) );
m_patternColorComponents = new CGFloat[1] ;
m_patternColorComponents[0] = 1.0;
m_isPattern = true;
default :
{
m_isPattern = true;
- m_colorSpace.Set( CGColorSpaceCreatePattern( wxMacGetGenericRGBColorSpace() ) );
- m_pattern.Set( *( new HatchPattern( pen.GetStyle() , CGAffineTransformMakeScale( 1,-1 ) ) ) );
+ m_colorSpace.reset( CGColorSpaceCreatePattern( wxMacGetGenericRGBColorSpace() ) );
+ m_pattern.reset( (CGPatternRef) *( new HatchPattern( pen.GetStyle() , CGAffineTransformMakeScale( 1,-1 ) ) ) );
m_patternColorComponents = new CGFloat[4] ;
m_patternColorComponents[0] = pen.GetColour().Red() / 255.0;
m_patternColorComponents[1] = pen.GetColour().Green() / 255.0;
void Apply( CGContextRef cgContext );
protected:
void Init();
- wxMacCFRefHolder<CGColorRef> m_color;
- wxMacCFRefHolder<CGColorSpaceRef> m_colorSpace;
+ wxCFRef<CGColorRef> m_color;
+ wxCFRef<CGColorSpaceRef> m_colorSpace;
bool m_isPattern;
- wxMacCFRefHolder<CGPatternRef> m_pattern;
+ wxCFRef<CGPatternRef> m_pattern;
CGFloat* m_patternColorComponents;
} ;
Init();
if ( brush.GetStyle() == wxSOLID )
{
- m_color.Set( brush.GetColour().CreateCGColor() );
+ m_color.reset( wxMacCreateCGColor( brush.GetColour() ));
}
else if ( brush.IsHatch() )
{
m_isPattern = true;
- m_colorSpace.Set( CGColorSpaceCreatePattern( wxMacGetGenericRGBColorSpace() ) );
- m_pattern.Set( *( new HatchPattern( brush.GetStyle() , CGAffineTransformMakeScale( 1,-1 ) ) ) );
+ m_colorSpace.reset( CGColorSpaceCreatePattern( wxMacGetGenericRGBColorSpace() ) );
+ m_pattern.reset( (CGPatternRef) *( new HatchPattern( brush.GetStyle() , CGAffineTransformMakeScale( 1,-1 ) ) ) );
m_patternColorComponents = new CGFloat[4] ;
m_patternColorComponents[0] = brush.GetColour().Red() / 255.0;
m_isPattern = true;
m_patternColorComponents = new CGFloat[1] ;
m_patternColorComponents[0] = 1.0;
- m_colorSpace.Set( CGColorSpaceCreatePattern( NULL ) );
- m_pattern.Set( *( new ImagePattern( bmp , CGAffineTransformMakeScale( 1,-1 ) ) ) );
+ m_colorSpace.reset( CGColorSpaceCreatePattern( NULL ) );
+ m_pattern.reset( (CGPatternRef) *( new ImagePattern( bmp , CGAffineTransformMakeScale( 1,-1 ) ) ) );
}
}
}
wxMacCoreGraphicsFontData( wxGraphicsRenderer* renderer, const wxFont &font, const wxColour& col );
~wxMacCoreGraphicsFontData();
+#if wxMAC_USE_ATSU_TEXT
virtual ATSUStyle GetATSUStyle() { return m_macATSUIStyle; }
+#endif
+#if wxMAC_USE_CORE_TEXT
+ CTFontRef GetCTFont() const { return m_ctFont ; }
+#endif
+ wxColour GetColour() const { return m_colour ; }
+
+ bool GetUnderlined() const { return m_underlined ; }
private :
+ wxColour m_colour;
+ bool m_underlined;
+#if wxMAC_USE_ATSU_TEXT
ATSUStyle m_macATSUIStyle;
+#endif
+#if wxMAC_USE_CORE_TEXT
+ wxCFRef< CTFontRef > m_ctFont;
+#endif
};
wxMacCoreGraphicsFontData::wxMacCoreGraphicsFontData(wxGraphicsRenderer* renderer, const wxFont &font, const wxColour& col) : wxGraphicsObjectRefData( renderer )
{
- m_macATSUIStyle = NULL;
+ m_colour = col;
+ m_underlined = font.GetUnderlined();
-#ifdef wxMAC_USE_CORE_TEXT
-#elif defined(wxMAC_USE_ATSU_TEXT)
- OSStatus status;
+#if wxMAC_USE_CORE_TEXT
+ m_ctFont.reset( wxMacCreateCTFont( font ) );
+#endif
+#if wxMAC_USE_ATSU_TEXT
+ OSStatus status = noErr;
+ m_macATSUIStyle = NULL;
status = ATSUCreateAndCopyStyle( (ATSUStyle) font.MacGetATSUStyle() , &m_macATSUIStyle );
atsuTags, atsuSizes, atsuValues);
wxASSERT_MSG( status == noErr , wxT("couldn't modify ATSU style") );
-#elif defined(WXMAC_USE_CG_TEXT)
+#endif
+#if wxMAC_USE_CG_TEXT
#endif
}
wxMacCoreGraphicsFontData::~wxMacCoreGraphicsFontData()
{
-#ifdef wxMAC_USE_CORE_TEXT
-#elif defined(wxMAC_USE_ATSU_TEXT)
+#if wxMAC_USE_CORE_TEXT
+#endif
+#if wxMAC_USE_ATSU_TEXT
if ( m_macATSUIStyle )
{
::ATSUDisposeStyle((ATSUStyle)m_macATSUIStyle);
m_macATSUIStyle = NULL;
}
-#elif defined(WXMAC_USE_CG_TEXT)
+#endif
+#if wxMAC_USE_CG_TEXT
#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
//
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 );
wxDouble m_width;
wxDouble m_height;
- wxMacCFRefHolder<HIShapeRef> m_clipRgn;
+ wxCFRef<HIShapeRef> m_clipRgn;
};
//-----------------------------------------------------------------------------
m_windowRef = NULL;
m_width = 0;
m_height = 0;
-
- HIRect r = CGRectMake(0,0,0,0);
- m_clipRgn.Set(HIShapeCreateWithRect(&r));
+ CGRect r = CGRectMake(0,0,0,0);
+ m_clipRgn.reset(HIShapeCreateWithRect(&r));
}
wxMacCoreGraphicsContext::wxMacCoreGraphicsContext( wxGraphicsRenderer* renderer, CGContextRef cgcontext, wxDouble width, wxDouble height ) : wxGraphicsContext(renderer)
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 );
if ( !m_cgContext )
{
OSStatus status =
-#ifndef __LP64__
+#if ! ( defined( __LP64__ ) || defined(__WXCOCOA__) )
QDBeginCGContext( GetWindowPort( m_windowRef ) , &m_cgContext );
#else
paramErr;
if ( !HIShapeIsEmpty(m_clipRgn) )
{
// the clip region is in device coordinates, so we convert this again to user coordinates
- wxMacCFRefHolder<HIMutableShapeRef> hishape ;
- hishape.Set( HIShapeCreateMutableCopy( m_clipRgn ) );
+ wxCFRef<HIMutableShapeRef> hishape( HIShapeCreateMutableCopy( m_clipRgn ) );
CGPoint transformedOrigin = CGPointApplyAffineTransform( CGPointZero,m_windowTransform);
HIShapeOffset( hishape, -transformedOrigin.x, -transformedOrigin.y );
HIShapeReplacePathInCGContext( hishape, m_cgContext );
EnsureIsValid();
bool retval = false;
-
- if ( function == wxCOPY )
+ bool shouldAntiAlias = true;
+ CGBlendMode mode = kCGBlendModeNormal;
+
+#if defined(__WXMAC__) && ( MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_5 )
+ if ( UMAGetSystemVersion() >= 0x1050 )
{
retval = true;
- CGContextSetBlendMode( m_cgContext, kCGBlendModeNormal );
+ switch ( function )
+ {
+ // TODO find best corresponding porter duff modes
+ case wxCOPY :
+ mode = kCGBlendModeCopy;
+ break;
+ case wxCLEAR :
+ mode = kCGBlendModeClear;
+ break;
+ case wxXOR :
+ mode = kCGBlendModeXOR;
+ shouldAntiAlias = false;
+ break;
+ default :
+ retval = false;
+ break;
+ }
}
- else if ( function == wxINVERT || function == wxXOR )
+ else
+#endif
{
- // change color to white
- CGContextSetBlendMode( m_cgContext, kCGBlendModeExclusion );
- CGContextSetShouldAntialias( m_cgContext, false );
- retval = true;
+ if ( function == wxCOPY )
+ {
+ retval = true;
+ }
+ else if ( function == wxINVERT || function == wxXOR )
+ {
+ // change color to white
+ mode = kCGBlendModeExclusion;
+ shouldAntiAlias = false;
+ retval = true;
+ }
}
if (retval)
+ {
m_logicalFunction = function;
+ CGContextSetBlendMode( m_cgContext, mode );
+ CGContextSetShouldAntialias(m_cgContext, shouldAntiAlias);
+ }
return retval ;
}
void wxMacCoreGraphicsContext::Clip( const wxRegion ®ion )
{
+#ifdef __WXMAC__
if( m_cgContext )
{
- HIShapeRef shape = HIShapeCreateWithQDRgn( (RgnHandle) region.GetWXHRGN() );
- HIShapeReplacePathInCGContext( shape, m_cgContext );
+ HIShapeReplacePathInCGContext( region.GetWXHRGN() , m_cgContext );
CGContextClip( m_cgContext );
- CFRelease( shape );
}
else
{
// 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
- wxMacCFRefHolder<HIShapeRef> hishape ;
- hishape.Set( HIShapeCreateWithQDRgn( (RgnHandle) region.GetWXHRGN() ));
- HIMutableShapeRef mutableShape = HIShapeCreateMutableCopy( hishape );
+ HIMutableShapeRef mutableShape = HIShapeCreateMutableCopy( region.GetWXHRGN() );
CGPoint transformedOrigin = CGPointApplyAffineTransform( CGPointZero, m_windowTransform );
HIShapeOffset( mutableShape, transformedOrigin.x, transformedOrigin.y );
- m_clipRgn.Set(mutableShape);
+ 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 );
// 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.Set(HIShapeCreateWithRect(&r));
+ m_clipRgn.reset(HIShapeCreateWithRect(&r));
}
}
}
else
{
- HIRect r = CGRectMake(0,0,0,0);
- m_clipRgn.Set(HIShapeCreateWithRect(&r));
+ 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 );
}
return;
EnsureIsValid();
-#ifdef wxMAC_USE_CORE_TEXT
- // TODO core text implementation here
-#elif defined(wxMAC_USE_ATSU_TEXT)
- DrawText(str, x, y, 0.0);
-#elif defined(WXMAC_USE_CG_TEXT)
+#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 = wxMacCreateCGColor( fref->GetColour() );
+ CTUnderlineStyle ustyle = fref->GetUnderlined() ? kCTUnderlineStyleSingle : kCTUnderlineStyleNone ;
+ 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,
+ 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
+#if wxMAC_USE_ATSU_TEXT
+ {
+ DrawText(str, x, y, 0.0);
+ return;
+ }
+#endif
+#if wxMAC_USE_CG_TEXT
// TODO core graphics text implementation here
#endif
}
return;
EnsureIsValid();
-#ifdef wxMAC_USE_CORE_TEXT
- // default implementation takes care of rotation and calls non rotated DrawText afterwards
- wxGraphicsContext::DrawText( str, x, y, angle );
-#elif defined(wxMAC_USE_ATSU_TEXT)
- OSStatus status = noErr;
- ATSUTextLayout atsuLayout;
- UniCharCount chars = str.length();
- UniChar* ubuf = NULL;
-
-#if SIZEOF_WCHAR_T == 4
- 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 );
-#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 );
-#endif
- chars = unicharlen / 2;
-#else
-#if wxUSE_UNICODE
- ubuf = (UniChar*) str.wc_str();
-#else
- wxWCharBuffer wchar = str.wc_str( wxConvLocal );
- chars = wxWcslen( wchar.data() );
- ubuf = (UniChar*) wchar.data();
-#endif
-#endif
-
- ATSUStyle style = (((wxMacCoreGraphicsFontData*)m_font.GetRefData())->GetATSUStyle());
- status = ::ATSUCreateTextLayoutWithTextPtr( (UniCharArrayPtr) ubuf , 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 )
+#if wxMAC_USE_CORE_TEXT
+ if ( UMAGetSystemVersion() >= 0x1050 )
{
- Fixed atsuAngle = IntToFixed( iAngle );
- ATSUAttributeTag atsuTags[] =
- {
- kATSULineRotationTag ,
- };
- ByteCount atsuSizes[sizeof(atsuTags) / sizeof(ATSUAttributeTag)] =
- {
- sizeof( Fixed ) ,
- };
- ATSUAttributeValuePtr atsuValues[sizeof(atsuTags) / sizeof(ATSUAttributeTag)] =
- {
- &atsuAngle ,
- };
- status = ::ATSUSetLayoutControls(atsuLayout , sizeof(atsuTags) / sizeof(ATSUAttributeTag),
- atsuTags, atsuSizes, atsuValues );
+ // default implementation takes care of rotation and calls non rotated DrawText afterwards
+ wxGraphicsContext::DrawText( str, x, y, angle );
+ return;
}
-
+#endif
+#if wxMAC_USE_ATSU_TEXT
{
- ATSUAttributeTag atsuTags[] =
- {
- kATSUCGContextTag ,
- };
- ByteCount atsuSizes[sizeof(atsuTags) / sizeof(ATSUAttributeTag)] =
+ 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 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 )
{
- sizeof( CGContextRef ) ,
- };
- ATSUAttributeValuePtr atsuValues[sizeof(atsuTags) / sizeof(ATSUAttributeTag)] =
+ Fixed atsuAngle = IntToFixed( iAngle );
+ ATSUAttributeTag atsuTags[] =
+ {
+ kATSULineRotationTag ,
+ };
+ ByteCount atsuSizes[sizeof(atsuTags) / sizeof(ATSUAttributeTag)] =
+ {
+ sizeof( Fixed ) ,
+ };
+ ATSUAttributeValuePtr atsuValues[sizeof(atsuTags) / sizeof(ATSUAttributeTag)] =
+ {
+ &atsuAngle ,
+ };
+ status = ::ATSUSetLayoutControls(atsuLayout , sizeof(atsuTags) / sizeof(ATSUAttributeTag),
+ atsuTags, atsuSizes, atsuValues );
+ }
+
{
- &m_cgContext ,
- };
- status = ::ATSUSetLayoutControls(atsuLayout , sizeof(atsuTags) / sizeof(ATSUAttributeTag),
- atsuTags, atsuSizes, atsuValues );
+ ATSUAttributeTag atsuTags[] =
+ {
+ kATSUCGContextTag ,
+ };
+ ByteCount atsuSizes[sizeof(atsuTags) / sizeof(ATSUAttributeTag)] =
+ {
+ sizeof( CGContextRef ) ,
+ };
+ ATSUAttributeValuePtr atsuValues[sizeof(atsuTags) / sizeof(ATSUAttributeTag)] =
+ {
+ &m_cgContext ,
+ };
+ 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;
}
-
- 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);
-
-#if SIZEOF_WCHAR_T == 4
- free( ubuf );
#endif
-#elif defined(WXMAC_USE_CG_TEXT)
+#if wxMAC_USE_CG_TEXT
// default implementation takes care of rotation and calls non rotated DrawText afterwards
wxGraphicsContext::DrawText( str, x, y, angle );
#endif
if (str.empty())
return;
-#ifdef wxMAC_USE_CORE_TEXT
- // TODO core text implementation here
-#elif defined(wxMAC_USE_ATSU_TEXT)
- OSStatus status = noErr;
-
- ATSUTextLayout atsuLayout;
- UniCharCount chars = str.length();
- UniChar* ubuf = NULL;
-
-#if SIZEOF_WCHAR_T == 4
- 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 );
-#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 );
-#endif
- chars = unicharlen / 2;
-#else
-#if wxUSE_UNICODE
- ubuf = (UniChar*) str.wc_str();
-#else
- wxWCharBuffer wchar = str.wc_str( wxConvLocal );
- chars = wxWcslen( wchar.data() );
- ubuf = (UniChar*) wchar.data();
-#endif
+#if wxMAC_USE_CORE_TEXT
+ if ( UMAGetSystemVersion() >= 0x1050 )
+ {
+ wxMacCoreGraphicsFontData* fref = (wxMacCoreGraphicsFontData*)m_font.GetRefData();
+ CTFontRef font = fref->GetCTFont();
+
+ wxCFStringRef text(str, wxLocale::GetSystemEncoding() );
+ CFStringRef keys[] = { kCTFontAttributeName };
+ CFTypeRef values[] = { font };
+ 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 )
+ *descent = d;
+ if ( externalLeading )
+ *externalLeading = l;
+ if ( width )
+ *width = w;
+ return;
+ }
#endif
+#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") );
- ATSUStyle style = (((wxMacCoreGraphicsFontData*)m_font.GetRefData())->GetATSUStyle());
- status = ::ATSUCreateTextLayoutWithTextPtr( (UniCharArrayPtr) ubuf , 0 , chars , chars , 1 ,
- &chars , &style , &atsuLayout );
-
- wxASSERT_MSG( status == noErr , wxT("couldn't create the layout of the text") );
-
- ATSUTextMeasurement textBefore, textAfter;
- ATSUTextMeasurement textAscent, textDescent;
-
- status = ::ATSUGetUnjustifiedBounds( atsuLayout, kATSUFromTextBeginning, kATSUToTextEnd,
- &textBefore , &textAfter, &textAscent , &textDescent );
-
- if ( height )
- *height = FixedToInt(textAscent + textDescent);
- if ( descent )
- *descent = FixedToInt(textDescent);
- if ( externalLeading )
- *externalLeading = 0;
- if ( width )
- *width = FixedToInt(textAfter - textBefore);
+ ATSUTextMeasurement textBefore, textAfter;
+ ATSUTextMeasurement textAscent, textDescent;
+
+ status = ::ATSUGetUnjustifiedBounds( atsuLayout, kATSUFromTextBeginning, kATSUToTextEnd,
+ &textBefore , &textAfter, &textAscent , &textDescent );
+
+ if ( height )
+ *height = FixedToInt(textAscent + textDescent);
+ if ( descent )
+ *descent = FixedToInt(textDescent);
+ if ( externalLeading )
+ *externalLeading = 0;
+ if ( width )
+ *width = FixedToInt(textAfter - textBefore);
+
+ ::ATSUDisposeTextLayout(atsuLayout);
- ::ATSUDisposeTextLayout(atsuLayout);
-#if SIZEOF_WCHAR_T == 4
- free( ubuf ) ;
+ return;
+ }
#endif
-#elif defined(WXMAC_USE_CG_TEXT)
+#if wxMAC_USE_CG_TEXT
// TODO core graphics text implementation here
#endif
}
if (text.empty())
return;
-#ifdef wxMAC_USE_CORE_TEXT
- // TODO core text implementation here
-#elif defined(wxMAC_USE_ATSU_TEXT)
- ATSUTextLayout atsuLayout;
- UniCharCount chars = text.length();
- UniChar* ubuf = NULL;
-
-#if SIZEOF_WCHAR_T == 4
- wxMBConvUTF16 converter;
-#if wxUSE_UNICODE
- size_t unicharlen = converter.WC2MB( NULL , text.wc_str() , 0 );
- ubuf = (UniChar*) malloc( unicharlen + 2 );
- 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 );
- ubuf = (UniChar*) malloc( unicharlen + 2 );
- converter.WC2MB( (char*) ubuf , wchar.data() , unicharlen + 2 );
-#endif
- chars = unicharlen / 2;
-#else
-#if wxUSE_UNICODE
- ubuf = (UniChar*) text.wc_str();
-#else
- wxWCharBuffer wchar = text.wc_str( wxConvLocal );
- chars = wxWcslen( wchar.data() );
- ubuf = (UniChar*) wchar.data();
-#endif
+#if wxMAC_USE_CORE_TEXT
+ {
+ 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,
+ 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
-
- ATSUStyle style = (((wxMacCoreGraphicsFontData*)m_font.GetRefData())->GetATSUStyle());
- ::ATSUCreateTextLayoutWithTextPtr( (UniCharArrayPtr) ubuf , 0 , chars , chars , 1 ,
- &chars , &style , &atsuLayout );
-
- for ( int pos = 0; pos < (int)chars; pos ++ )
+#if wxMAC_USE_ATSU_TEXT
{
- 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;
+ OSStatus status = noErr;
+ ATSUTextLayout atsuLayout;
+ wxMacUniCharBuffer unibuf( text );
+ 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") );
- widths[pos] = FixedToInt( glyphBounds.upperRight.x - glyphBounds.upperLeft.x );
- //unsigned char uch = s[i];
+ 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);
}
-
- ::ATSUDisposeTextLayout(atsuLayout);
-#if SIZEOF_WCHAR_T == 4
- free( ubuf ) ;
#endif
-#elif defined(WXMAC_USE_CG_TEXT)
+#if wxMAC_USE_CG_TEXT
// TODO core graphics text implementation here
#endif
}
// Context
virtual wxGraphicsContext * CreateContext( const wxWindowDC& dc);
+ virtual wxGraphicsContext * CreateContext( const wxMemoryDC& dc);
virtual wxGraphicsContext * CreateContextFromNativeContext( void * context );
// 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;
}
-wxGraphicsContext * wxMacCoreGraphicsRenderer::CreateContext( const wxWindowDC& dc)
+#ifdef __WXCOCOA__
+extern CGContextRef wxMacGetContextFromCurrentNSContext() ;
+#endif
+
+wxGraphicsContext * wxMacCoreGraphicsRenderer::CreateContext( const wxWindowDC& dc )
{
- wxMemoryDC* mdc = wxDynamicCast(&dc, wxMemoryDC);
- if ( mdc )
+ const wxDCImpl* impl = dc.GetImpl();
+ wxWindowDCImpl *win_impl = wxDynamicCast( impl, wxWindowDCImpl );
+ if (win_impl)
{
- return new wxMacCoreGraphicsContext(this,
- (CGContextRef)mdc->GetGraphicsContext()->GetNativeContext());
+ 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 );
}
- else
+ 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)dc.GetWindow()->MacGetCGContextRef() );
+ int w, h;
+ mem_impl->GetSize( &w, &h );
+ return new wxMacCoreGraphicsContext( this,
+ (CGContextRef)(mem_impl->GetGraphicsContext()->GetNativeContext()), (wxDouble) w, (wxDouble) h );
}
+#endif
+ return NULL;
}
wxGraphicsContext * wxMacCoreGraphicsRenderer::CreateContextFromNativeContext( void * context )
}
}
+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 wxNullGraphicsFont;
}
+//
+// CoreGraphics Helper Methods
+//
+
+// Data Providers and Consumers
+
+size_t UMAPutBytesCFRefCallback( void *info, const void *bytes, size_t count )
+{
+ CFMutableDataRef data = (CFMutableDataRef) info;
+ if ( data )
+ {
+ CFDataAppendBytes( data, (const UInt8*) bytes, count );
+ }
+ return count;
+}
+
+void wxMacReleaseCFDataProviderCallback(void *info,
+ const void *WXUNUSED(data),
+ size_t WXUNUSED(count))
+{
+ if ( info )
+ CFRelease( (CFDataRef) info );
+}
+
+void wxMacReleaseCFDataConsumerCallback( void *info )
+{
+ if ( info )
+ CFRelease( (CFDataRef) info );
+}
+
+CGDataProviderRef wxMacCGDataProviderCreateWithCFData( CFDataRef data )
+{
+ if ( data == NULL )
+ return NULL;
+
+ return CGDataProviderCreateWithCFData( data );
+}
+
+CGDataConsumerRef wxMacCGDataConsumerCreateWithCFData( CFMutableDataRef data )
+{
+ if ( data == NULL )
+ return NULL;
+
+ return CGDataConsumerCreateWithCFData( data );
+}
+
+void wxMacReleaseMemoryBufferProviderCallback(void *info, const void *data, size_t WXUNUSED(size))
+{
+ wxMemoryBuffer* membuf = (wxMemoryBuffer*) info ;
+
+ wxASSERT( data == membuf->GetData() ) ;
+
+ delete membuf ;
+}
+
+CGDataProviderRef wxMacCGDataProviderCreateWithMemoryBuffer( const wxMemoryBuffer& buf )
+{
+ 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