Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

unifying CFTypes

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@50580 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Csomor
2007-12-08 18:29:06 +00:00
parent 6fc6659da9
commit 7a7697aafe
3 changed files with 26 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/mac/carbon/aboutdlg.cpp
View File

@@ -30,10 +30,10 @@
#include "wx/mac/private.h" #include "wx/mac/private.h"
// helper class for HIAboutBox options // helper class for HIAboutBox options
class AboutBoxOptions : public wxMacCFRefHolder<CFMutableDictionaryRef> class AboutBoxOptions : public wxCFRef<CFMutableDictionaryRef>
{ {
public: public:
AboutBoxOptions() : wxMacCFRefHolder<CFMutableDictionaryRef> AboutBoxOptions() : wxCFRef<CFMutableDictionaryRef>
( (
CFDictionaryCreateMutable CFDictionaryCreateMutable
( (

45
src/mac/carbon/graphics.cpp
View File

@@ -264,8 +264,8 @@ public:
protected : protected :
CGLineCap m_cap; CGLineCap m_cap;
wxMacCFRefHolder<CGColorRef> m_color; wxCFRef<CGColorRef> m_color;
wxMacCFRefHolder<CGColorSpaceRef> m_colorSpace; wxCFRef<CGColorSpaceRef> m_colorSpace;
CGLineJoin m_join; CGLineJoin m_join;
CGFloat m_width; CGFloat m_width;
@@ -276,7 +276,7 @@ protected :
bool m_isPattern; bool m_isPattern;
wxMacCFRefHolder<CGPatternRef> m_pattern; wxCFRef<CGPatternRef> m_pattern;
CGFloat* m_patternColorComponents; CGFloat* m_patternColorComponents;
}; };
@@ -287,7 +287,7 @@ wxMacCoreGraphicsPenData::wxMacCoreGraphicsPenData( wxGraphicsRenderer* renderer
CGFloat components[4] = { pen.GetColour().Red() / 255.0 , pen.GetColour().Green() / 255.0 , CGFloat components[4] = { pen.GetColour().Red() / 255.0 , pen.GetColour().Green() / 255.0 ,
pen.GetColour().Blue() / 255.0 , pen.GetColour().Alpha() / 255.0 } ; pen.GetColour().Blue() / 255.0 , pen.GetColour().Alpha() / 255.0 } ;
m_color.Set( CGColorCreate( wxMacGetGenericRGBColorSpace() , components ) ) ; m_color.reset( CGColorCreate( wxMacGetGenericRGBColorSpace() , components ) ) ;
// TODO: * m_dc->m_scaleX // TODO: * m_dc->m_scaleX
m_width = pen.GetWidth(); m_width = pen.GetWidth();
@@ -390,8 +390,8 @@ wxMacCoreGraphicsPenData::wxMacCoreGraphicsPenData( wxGraphicsRenderer* renderer
wxBitmap* bmp = pen.GetStipple(); wxBitmap* bmp = pen.GetStipple();
if ( bmp && bmp->Ok() ) if ( bmp && bmp->Ok() )
{ {
m_colorSpace.Set( CGColorSpaceCreatePattern( NULL ) ); m_colorSpace.reset( CGColorSpaceCreatePattern( NULL ) );
m_pattern.Set( *( new ImagePattern( bmp , CGAffineTransformMakeScale( 1,-1 ) ) ) ); m_pattern.reset( (CGPatternRef) *( new ImagePattern( bmp , CGAffineTransformMakeScale( 1,-1 ) ) ) );
m_patternColorComponents = new CGFloat[1] ; m_patternColorComponents = new CGFloat[1] ;
m_patternColorComponents[0] = 1.0; m_patternColorComponents[0] = 1.0;
m_isPattern = true; m_isPattern = true;
@@ -402,8 +402,8 @@ wxMacCoreGraphicsPenData::wxMacCoreGraphicsPenData( wxGraphicsRenderer* renderer
default : default :
{ {
m_isPattern = true; m_isPattern = true;
m_colorSpace.Set( CGColorSpaceCreatePattern( wxMacGetGenericRGBColorSpace() ) ); m_colorSpace.reset( CGColorSpaceCreatePattern( wxMacGetGenericRGBColorSpace() ) );
m_pattern.Set( *( new HatchPattern( pen.GetStyle() , CGAffineTransformMakeScale( 1,-1 ) ) ) ); m_pattern.reset( (CGPatternRef) *( new HatchPattern( pen.GetStyle() , CGAffineTransformMakeScale( 1,-1 ) ) ) );
m_patternColorComponents = new CGFloat[4] ; m_patternColorComponents = new CGFloat[4] ;
m_patternColorComponents[0] = pen.GetColour().Red() / 255.0; m_patternColorComponents[0] = pen.GetColour().Red() / 255.0;
m_patternColorComponents[1] = pen.GetColour().Green() / 255.0; m_patternColorComponents[1] = pen.GetColour().Green() / 255.0;
@@ -492,11 +492,11 @@ class wxMacCoreGraphicsColour
void Apply( CGContextRef cgContext ); void Apply( CGContextRef cgContext );
protected: protected:
void Init(); void Init();
wxMacCFRefHolder<CGColorRef> m_color; wxCFRef<CGColorRef> m_color;
wxMacCFRefHolder<CGColorSpaceRef> m_colorSpace; wxCFRef<CGColorSpaceRef> m_colorSpace;
bool m_isPattern; bool m_isPattern;
wxMacCFRefHolder<CGPatternRef> m_pattern; wxCFRef<CGPatternRef> m_pattern;
CGFloat* m_patternColorComponents; CGFloat* m_patternColorComponents;
} ; } ;
@@ -536,13 +536,13 @@ wxMacCoreGraphicsColour::wxMacCoreGraphicsColour( const wxBrush &brush )
Init(); Init();
if ( brush.GetStyle() == wxSOLID ) if ( brush.GetStyle() == wxSOLID )
{ {
m_color.Set( brush.GetColour().CreateCGColor() ); m_color.reset( brush.GetColour().CreateCGColor() );
} }
else if ( brush.IsHatch() ) else if ( brush.IsHatch() )
{ {
m_isPattern = true; m_isPattern = true;
m_colorSpace.Set( CGColorSpaceCreatePattern( wxMacGetGenericRGBColorSpace() ) ); m_colorSpace.reset( CGColorSpaceCreatePattern( wxMacGetGenericRGBColorSpace() ) );
m_pattern.Set( *( new HatchPattern( brush.GetStyle() , CGAffineTransformMakeScale( 1,-1 ) ) ) ); m_pattern.reset( (CGPatternRef) *( new HatchPattern( brush.GetStyle() , CGAffineTransformMakeScale( 1,-1 ) ) ) );
m_patternColorComponents = new CGFloat[4] ; m_patternColorComponents = new CGFloat[4] ;
m_patternColorComponents[0] = brush.GetColour().Red() / 255.0; m_patternColorComponents[0] = brush.GetColour().Red() / 255.0;
@@ -559,8 +559,8 @@ wxMacCoreGraphicsColour::wxMacCoreGraphicsColour( const wxBrush &brush )
m_isPattern = true; m_isPattern = true;
m_patternColorComponents = new CGFloat[1] ; m_patternColorComponents = new CGFloat[1] ;
m_patternColorComponents[0] = 1.0; m_patternColorComponents[0] = 1.0;
m_colorSpace.Set( CGColorSpaceCreatePattern( NULL ) ); m_colorSpace.reset( CGColorSpaceCreatePattern( NULL ) );
m_pattern.Set( *( new ImagePattern( bmp , CGAffineTransformMakeScale( 1,-1 ) ) ) ); m_pattern.reset( (CGPatternRef) *( new ImagePattern( bmp , CGAffineTransformMakeScale( 1,-1 ) ) ) );
} }
} }
} }
@@ -1273,7 +1273,7 @@ private:
wxDouble m_width; wxDouble m_width;
wxDouble m_height; wxDouble m_height;
wxMacCFRefHolder<HIShapeRef> m_clipRgn; wxCFRef<HIShapeRef> m_clipRgn;
}; };
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
@@ -1323,7 +1323,7 @@ void wxMacCoreGraphicsContext::Init()
m_height = 0; m_height = 0;
HIRect r = CGRectMake(0,0,0,0); HIRect r = CGRectMake(0,0,0,0);
m_clipRgn.Set(HIShapeCreateWithRect(&r)); m_clipRgn.reset(HIShapeCreateWithRect(&r));
} }
wxMacCoreGraphicsContext::wxMacCoreGraphicsContext( wxGraphicsRenderer* renderer, CGContextRef cgcontext, wxDouble width, wxDouble height ) : wxGraphicsContext(renderer) wxMacCoreGraphicsContext::wxMacCoreGraphicsContext( wxGraphicsRenderer* renderer, CGContextRef cgcontext, wxDouble width, wxDouble height ) : wxGraphicsContext(renderer)
@@ -1422,8 +1422,7 @@ void wxMacCoreGraphicsContext::EnsureIsValid()
if ( !HIShapeIsEmpty(m_clipRgn) ) if ( !HIShapeIsEmpty(m_clipRgn) )
{ {
// the clip region is in device coordinates, so we convert this again to user coordinates // the clip region is in device coordinates, so we convert this again to user coordinates
wxMacCFRefHolder<HIMutableShapeRef> hishape ; wxCFRef<HIMutableShapeRef> hishape( HIShapeCreateMutableCopy( m_clipRgn ) );
hishape.Set( HIShapeCreateMutableCopy( m_clipRgn ) );
CGPoint transformedOrigin = CGPointApplyAffineTransform( CGPointZero,m_windowTransform); CGPoint transformedOrigin = CGPointApplyAffineTransform( CGPointZero,m_windowTransform);
HIShapeOffset( hishape, -transformedOrigin.x, -transformedOrigin.y ); HIShapeOffset( hishape, -transformedOrigin.x, -transformedOrigin.y );
HIShapeReplacePathInCGContext( hishape, m_cgContext ); HIShapeReplacePathInCGContext( hishape, m_cgContext );
@@ -1508,7 +1507,7 @@ void wxMacCoreGraphicsContext::Clip( const wxRegion &region )
CGPoint transformedOrigin = CGPointApplyAffineTransform( CGPointZero, m_windowTransform ); CGPoint transformedOrigin = CGPointApplyAffineTransform( CGPointZero, m_windowTransform );
HIShapeOffset( mutableShape, transformedOrigin.x, transformedOrigin.y ); HIShapeOffset( mutableShape, transformedOrigin.x, transformedOrigin.y );
m_clipRgn.Set(mutableShape); m_clipRgn.reset(mutableShape);
} }
} }
@@ -1525,7 +1524,7 @@ void wxMacCoreGraphicsContext::Clip( wxDouble x, wxDouble y, wxDouble w, wxDoubl
// 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 // we cannot apply it back correctly
r.origin= CGPointApplyAffineTransform( r.origin, m_windowTransform ); r.origin= CGPointApplyAffineTransform( r.origin, m_windowTransform );
m_clipRgn.Set(HIShapeCreateWithRect(&r)); m_clipRgn.reset(HIShapeCreateWithRect(&r));
} }
} }
@@ -1547,7 +1546,7 @@ void wxMacCoreGraphicsContext::ResetClip()
else else
{ {
HIRect r = CGRectMake(0,0,0,0); HIRect r = CGRectMake(0,0,0,0);
m_clipRgn.Set(HIShapeCreateWithRect(&r)); m_clipRgn.reset(HIShapeCreateWithRect(&r));
} }
} }

4
src/mac/carbon/utils.cpp
View File

@@ -1943,11 +1943,11 @@ OSStatus wxMacControl::SetTabEnabled( SInt16 tabNo , bool enable )
CGColorSpaceRef wxMacGetGenericRGBColorSpace() CGColorSpaceRef wxMacGetGenericRGBColorSpace()
{ {
static wxMacCFRefHolder<CGColorSpaceRef> genericRGBColorSpace; static wxCFRef<CGColorSpaceRef> genericRGBColorSpace;
if (genericRGBColorSpace == NULL) if (genericRGBColorSpace == NULL)
{ {
genericRGBColorSpace.Set( CGColorSpaceCreateWithName( kCGColorSpaceGenericRGB ) ); genericRGBColorSpace.reset( CGColorSpaceCreateWithName( kCGColorSpaceGenericRGB ) );
} }
return genericRGBColorSpace; return genericRGBColorSpace;