From b04e8701aa4a7ab17f0a13ed9a22d40801572d3c Mon Sep 17 00:00:00 2001 From: Stefan Csomor Date: Wed, 13 Jun 2007 04:24:17 +0000 Subject: [PATCH] changing weak linking pattern git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_8_BRANCH@46436 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/mac/carbon/graphics.cpp | 8 ++++---- src/mac/carbon/printmac.cpp | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/mac/carbon/graphics.cpp b/src/mac/carbon/graphics.cpp index d6512b17fa..5b5d46cab1 100755 --- a/src/mac/carbon/graphics.cpp +++ b/src/mac/carbon/graphics.cpp @@ -169,7 +169,7 @@ public : void StrokeLineSegments( CGContextRef ctxRef , const CGPoint pts[] , size_t count ) { #if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_4 - if ( CGContextStrokeLineSegments!=NULL ) + if ( &CGContextStrokeLineSegments!=NULL ) { CGContextStrokeLineSegments( ctxRef , pts , count ); } @@ -541,7 +541,7 @@ wxMacCoreGraphicsBrushData::wxMacCoreGraphicsBrushData(wxGraphicsRenderer* rende if ( brush.MacGetBrushKind() == kwxMacBrushTheme ) { #if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_4 - if ( HIThemeBrushCreateCGColor != 0 ) + if ( UMAGetSystemVersion() >= 0x1040 ) { CGColorRef color ; HIThemeBrushCreateCGColor( brush.MacGetTheme(), &color ); @@ -853,7 +853,7 @@ bool wxMacCoreGraphicsMatrixData::IsEqual( const wxGraphicsMatrixData* t) const { const CGAffineTransform* tm = (CGAffineTransform*) t->GetNativeMatrix(); #if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_4 - if ( CGAffineTransformEqualToTransform!=NULL ) + if ( &CGAffineTransformEqualToTransform!=NULL ) { return CGAffineTransformEqualToTransform(m_matrix, *((CGAffineTransform*) t->GetNativeMatrix())); } @@ -1107,7 +1107,7 @@ void wxMacCoreGraphicsPathData::GetBox(wxDouble *x, wxDouble *y, wxDouble *w, wx bool wxMacCoreGraphicsPathData::Contains( wxDouble x, wxDouble y, int fillStyle) const { #if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_4 - if ( CGPathContainsPoint!=NULL ) + if ( &CGPathContainsPoint!=NULL ) { return CGPathContainsPoint( m_path, NULL, CGPointMake(x,y), fillStyle == wxODDEVEN_RULE ); } diff --git a/src/mac/carbon/printmac.cpp b/src/mac/carbon/printmac.cpp index fbcae56a55..bdff5bbae1 100644 --- a/src/mac/carbon/printmac.cpp +++ b/src/mac/carbon/printmac.cpp @@ -155,7 +155,7 @@ bool wxMacCarbonPrintData::TransferFrom( const wxPrintData &data ) #endif #if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_4 - if ( PMSetDuplex!=NULL ) + if ( &PMSetDuplex!=NULL ) { PMDuplexMode mode = 0 ; switch( data.GetDuplex() ) @@ -241,7 +241,7 @@ bool wxMacCarbonPrintData::TransferTo( wxPrintData &data ) data.SetColour( !(color == kPMBlackAndWhite) ) ; #endif #if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_4 - if ( PMGetDuplex!=NULL ) + if ( &PMGetDuplex!=NULL ) { PMDuplexMode mode = 0 ; PMGetDuplex( (PMPrintSettings) m_macPrintSettings, &mode ) ;