diff --git a/src/mac/carbon/clipbrd.cpp b/src/mac/carbon/clipbrd.cpp index d3e7e847ec..af8d56719b 100644 --- a/src/mac/carbon/clipbrd.cpp +++ b/src/mac/carbon/clipbrd.cpp @@ -27,10 +27,6 @@ #include "wx/metafile.h" -#ifndef __DARWIN__ -#include -#endif - #include "wx/mac/uma.h" #define wxUSE_DATAOBJ 1 diff --git a/src/mac/carbon/dataobj.cpp b/src/mac/carbon/dataobj.cpp index e9aa12084b..ba13860125 100644 --- a/src/mac/carbon/dataobj.cpp +++ b/src/mac/carbon/dataobj.cpp @@ -29,9 +29,7 @@ #include "wx/mac/uma.h" -#ifndef __DARWIN__ -#include -#else +#ifdef __DARWIN__ #include #endif diff --git a/src/mac/carbon/dnd.cpp b/src/mac/carbon/dnd.cpp index eee4db0369..fbe209c1b1 100644 --- a/src/mac/carbon/dnd.cpp +++ b/src/mac/carbon/dnd.cpp @@ -23,11 +23,6 @@ #include "wx/mac/private.h" -#ifndef __DARWIN__ - #include -#endif - - // ---------------------------------------------------------------------------- // globals // ---------------------------------------------------------------------------- diff --git a/src/mac/carbon/uma.cpp b/src/mac/carbon/uma.cpp index 161708406b..606cfbcf03 100644 --- a/src/mac/carbon/uma.cpp +++ b/src/mac/carbon/uma.cpp @@ -726,22 +726,6 @@ wxMacPortStateHelper::~wxMacPortStateHelper() #endif -OSStatus UMAPutScrap( Size size , OSType type , void *data ) -{ - OSStatus err = noErr ; - -#if !TARGET_CARBON - err = PutScrap( size , type , data ) ; -#else - ScrapRef scrap; - err = GetCurrentScrap( &scrap ); - if ( err == noErr ) - err = PutScrapFlavor( scrap, type , 0, size, data ); -#endif - - return err ; -} - Rect * UMAGetControlBoundsInWindowCoords( ControlRef theControl, Rect *bounds ) { GetControlBounds( theControl , bounds ) ;