guard code for mac / quickdraw

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

diff --git a/src/mac/carbon/uma.cpp b/src/mac/carbon/uma.cpp
index 3ab477e6723e60e0d09a7b67dbb953ea4c5560c0..d62963239085980134153e2d99caf50d484ff1f2 100644 (file)
--- a/src/mac/carbon/uma.cpp
+++ b/src/mac/carbon/uma.cpp
@@ -140,7 +140,7 @@ void UMAEnableMenuItem( MenuRef inMenu , MenuItemIndex inItem , bool enable)
 void UMAAppendSubMenuItem( MenuRef menu , const wxString& title, wxFontEncoding encoding , SInt16 id )
 {
     AppendMenuItemTextWithCFString( menu,
-                                CFSTR("A"), 0, 0,NULL); 
+                                CFSTR("A"), 0, 0,NULL);
     UMASetMenuItemText( menu, (SInt16) ::CountMenuItems(menu), title , encoding );
     SetMenuItemHierarchicalID( menu , CountMenuItems( menu ) , id ) ;
 }
@@ -148,8 +148,8 @@ void UMAAppendSubMenuItem( MenuRef menu , const wxString& title, wxFontEncoding
 void UMAInsertSubMenuItem( MenuRef menu , const wxString& title, wxFontEncoding encoding , MenuItemIndex item , SInt16 id  )
 {
     InsertMenuItemTextWithCFString( menu,
-                CFSTR("A"), item, 0, 0); 
-                
+                CFSTR("A"), item, 0, 0);
+
     UMASetMenuItemText( menu, item+1, title , encoding );
     SetMenuItemHierarchicalID( menu , item+1 , id ) ;
 }
@@ -295,7 +295,7 @@ void UMASetMenuItemShortcut( MenuRef menu , MenuItemIndex item , wxAcceleratorEn
 void UMAAppendMenuItem( MenuRef menu , const wxString& title, wxFontEncoding encoding , wxAcceleratorEntry *entry )
 {
     AppendMenuItemTextWithCFString( menu,
-                                CFSTR("A"), 0, 0,NULL); 
+                                CFSTR("A"), 0, 0,NULL);
     // don't attempt to interpret metacharacters like a '-' at the beginning (would become a separator otherwise)
     ChangeMenuItemAttributes( menu , ::CountMenuItems(menu), kMenuItemAttrIgnoreMeta , 0 ) ;
     UMASetMenuItemText(menu, (SInt16) ::CountMenuItems(menu), title , encoding );
@@ -305,7 +305,7 @@ void UMAAppendMenuItem( MenuRef menu , const wxString& title, wxFontEncoding enc
 void UMAInsertMenuItem( MenuRef menu , const wxString& title, wxFontEncoding encoding , MenuItemIndex item , wxAcceleratorEntry *entry )
 {
     InsertMenuItemTextWithCFString( menu,
-                CFSTR("A"), item, 0, 0); 
+                CFSTR("A"), item, 0, 0);
 
     // don't attempt to interpret metacharacters like a '-' at the beginning (would become a separator otherwise)
     ChangeMenuItemAttributes( menu , item+1, kMenuItemAttrIgnoreMeta , 0 ) ;
@@ -558,7 +558,6 @@ Rect * UMAGetControlBoundsInWindowCoords( ControlRef theControl, Rect *bounds )
 {
     GetControlBounds( theControl , bounds ) ;
 
-#if TARGET_API_MAC_OSX
     WindowRef tlwref = GetControlOwner( theControl ) ;
 
     wxTopLevelWindowMac* tlwwx = wxFindWinFromMacWindow( tlwref ) ;
@@ -569,7 +568,6 @@ Rect * UMAGetControlBoundsInWindowCoords( ControlRef theControl, Rect *bounds )
         HIViewConvertPoint( &hiPoint , HIViewGetSuperview(theControl) , rootControl ) ;
         OffsetRect( bounds , (short) hiPoint.x , (short) hiPoint.y ) ;
     }
-#endif
 
     return bounds ;
 }
@@ -584,7 +582,9 @@ size_t UMAPutBytesCFRefCallback( void *info, const void *bytes, size_t count )
     return count;
 }
 
-void UMAReleaseCFDataProviderCallback( void *info, const void *data, size_t count )
+void UMAReleaseCFDataProviderCallback(void *info,
+                                      const void *WXUNUSED(data),
+                                      size_t WXUNUSED(count))
 {
     if ( info )
         CFRelease( (CFDataRef) info );
@@ -600,45 +600,16 @@ CGDataProviderRef UMACGDataProviderCreateWithCFData( CFDataRef data )
 {
     if ( data == NULL )
         return NULL;
-        
-#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_4
-    if( &CGDataProviderCreateWithCFData != NULL )
-    {
-        return CGDataProviderCreateWithCFData( data );
-    }
-#endif
 
-    // make sure we keep it until done
-    CFRetain( data );
-    CGDataProviderRef provider = CGDataProviderCreateWithData( (void*) data , CFDataGetBytePtr( data ) ,
-        CFDataGetLength( data ), UMAReleaseCFDataProviderCallback );
-    // if provider couldn't be created, release the data again
-    if ( provider == NULL )
-        CFRelease( data );
-    return provider;
+    return CGDataProviderCreateWithCFData( data );
 }
 
 CGDataConsumerRef UMACGDataConsumerCreateWithCFData( CFMutableDataRef data )
 {
     if ( data == NULL )
         return NULL;
-        
-#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_4
-    if( &CGDataConsumerCreateWithCFData != NULL )
-    {
-        return CGDataConsumerCreateWithCFData( data );
-    }
-#endif
-    // make sure we keep it until done
-    CFRetain( data );
-    CGDataConsumerCallbacks callbacks;
-    callbacks.putBytes = UMAPutBytesCFRefCallback;
-    callbacks.releaseConsumer = UMAReleaseCFDataConsumerCallback;
-    CGDataConsumerRef consumer = CGDataConsumerCreate( data , &callbacks );
-    // if consumer couldn't be created, release the data again
-    if ( consumer == NULL )
-        CFRelease( data );
-    return consumer;
+
+    return CGDataConsumerCreateWithCFData( data );
 }
 #endif  // wxUSE_GUI