X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/7ba7c4e62f008c640f8284de3e61c63882faeb9a..aa3310b88de52e7b7d6fe3432e42707ae92d4af8:/src/mac/carbon/utils.cpp diff --git a/src/mac/carbon/utils.cpp b/src/mac/carbon/utils.cpp index c874c4131e..24cf97cdd4 100644 --- a/src/mac/carbon/utils.cpp +++ b/src/mac/carbon/utils.cpp @@ -1554,10 +1554,6 @@ CMProfileRef wxMacOpenGenericProfile() return it whenever this function is called. */ -#if MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_4 -#define kCGColorSpaceGenericRGB CFSTR("kCGColorSpaceGenericRGB") -#endif - CGColorSpaceRef wxMacGetGenericRGBColorSpace() { static wxMacCFRefHolder genericRGBColorSpace ; @@ -1566,7 +1562,7 @@ CGColorSpaceRef wxMacGetGenericRGBColorSpace() { if ( UMAGetSystemVersion() >= 0x1040 ) { - genericRGBColorSpace.Set( CGColorSpaceCreateWithName( kCGColorSpaceGenericRGB ) ) ; + genericRGBColorSpace.Set( CGColorSpaceCreateWithName( CFSTR("kCGColorSpaceGenericRGB") ) ) ; } else { @@ -1588,4 +1584,15 @@ CGColorSpaceRef wxMacGetGenericRGBColorSpace() } #endif +wxMacPortSaver::wxMacPortSaver( GrafPtr port ) +{ + ::GetPort( &m_port ) ; + ::SetPort( port ) ; +} + +wxMacPortSaver::~wxMacPortSaver() +{ + ::SetPort( m_port ) ; +} + #endif // wxUSE_GUI