Committing in .

[wxWidgets.git] / src / mac / carbon / utils.cpp

diff --git a/src/mac/carbon/utils.cpp b/src/mac/carbon/utils.cpp
index c874c4131e37e63923931fdd130049dd10cbbf09..24cf97cdd40628db34fc4a9dbf893a8a75d6d98b 100644 (file)
--- 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<CGColorSpaceRef> 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