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

changing weak linking pattern

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_8_BRANCH@46436 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Csomor
2007-06-13 04:24:17 +00:00
parent 904c5051aa
commit b04e8701aa
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -169,7 +169,7 @@ public :
void StrokeLineSegments( CGContextRef ctxRef , const CGPoint pts[] , size_t count ) void StrokeLineSegments( CGContextRef ctxRef , const CGPoint pts[] , size_t count )
{ {
#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_4 #if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_4
if ( CGContextStrokeLineSegments!=NULL ) if ( &CGContextStrokeLineSegments!=NULL )
{ {
CGContextStrokeLineSegments( ctxRef , pts , count ); CGContextStrokeLineSegments( ctxRef , pts , count );
} }
@@ -541,7 +541,7 @@ wxMacCoreGraphicsBrushData::wxMacCoreGraphicsBrushData(wxGraphicsRenderer* rende
if ( brush.MacGetBrushKind() == kwxMacBrushTheme ) if ( brush.MacGetBrushKind() == kwxMacBrushTheme )
{ {
#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_4 #if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_4
if ( HIThemeBrushCreateCGColor != 0 ) if ( UMAGetSystemVersion() >= 0x1040 )
{ {
CGColorRef color ; CGColorRef color ;
HIThemeBrushCreateCGColor( brush.MacGetTheme(), &color ); HIThemeBrushCreateCGColor( brush.MacGetTheme(), &color );
@@ -853,7 +853,7 @@ bool wxMacCoreGraphicsMatrixData::IsEqual( const wxGraphicsMatrixData* t) const
{ {
const CGAffineTransform* tm = (CGAffineTransform*) t->GetNativeMatrix(); const CGAffineTransform* tm = (CGAffineTransform*) t->GetNativeMatrix();
#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_4 #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())); 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 bool wxMacCoreGraphicsPathData::Contains( wxDouble x, wxDouble y, int fillStyle) const
{ {
#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_4 #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 ); return CGPathContainsPoint( m_path, NULL, CGPointMake(x,y), fillStyle == wxODDEVEN_RULE );
} }

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

@@ -155,7 +155,7 @@ bool wxMacCarbonPrintData::TransferFrom( const wxPrintData &data )
#endif #endif
#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_4 #if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_4
if ( PMSetDuplex!=NULL ) if ( &PMSetDuplex!=NULL )
{ {
PMDuplexMode mode = 0 ; PMDuplexMode mode = 0 ;
switch( data.GetDuplex() ) switch( data.GetDuplex() )
@@ -241,7 +241,7 @@ bool wxMacCarbonPrintData::TransferTo( wxPrintData &data )
data.SetColour( !(color == kPMBlackAndWhite) ) ; data.SetColour( !(color == kPMBlackAndWhite) ) ;
#endif #endif
#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_4 #if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_4
if ( PMGetDuplex!=NULL ) if ( &PMGetDuplex!=NULL )
{ {
PMDuplexMode mode = 0 ; PMDuplexMode mode = 0 ;
PMGetDuplex( (PMPrintSettings) m_macPrintSettings, &mode ) ; PMGetDuplex( (PMPrintSettings) m_macPrintSettings, &mode ) ;