From f6b5742d33cbbe7f0f1ac017aeb6a9085777bf7c Mon Sep 17 00:00:00 2001
From: Stefan Csomor <csomor@advancedconcepts.ch>
Date: Tue, 22 May 2007 06:02:49 +0000
Subject: [PATCH] scrap.h removal

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_8_BRANCH@46161 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
 src/mac/carbon/clipbrd.cpp |  4 ----
 src/mac/carbon/dataobj.cpp |  4 +---
 src/mac/carbon/dnd.cpp     |  5 -----
 src/mac/carbon/uma.cpp     | 16 ----------------
 4 files changed, 1 insertion(+), 28 deletions(-)

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 <Scrap.h>
-#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 <Scrap.h>
-#else
+#ifdef __DARWIN__
     #include <QuickTime/QuickTime.h>
 #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 <Scrap.h>
-#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 ) ;