scrap.h removal
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_8_BRANCH@46161 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -27,10 +27,6 @@
|
||||
|
||||
#include "wx/metafile.h"
|
||||
|
||||
#ifndef __DARWIN__
|
||||
#include <Scrap.h>
|
||||
#endif
|
||||
|
||||
#include "wx/mac/uma.h"
|
||||
|
||||
#define wxUSE_DATAOBJ 1
|
||||
|
@@ -29,9 +29,7 @@
|
||||
|
||||
#include "wx/mac/uma.h"
|
||||
|
||||
#ifndef __DARWIN__
|
||||
#include <Scrap.h>
|
||||
#else
|
||||
#ifdef __DARWIN__
|
||||
#include <QuickTime/QuickTime.h>
|
||||
#endif
|
||||
|
||||
|
@@ -23,11 +23,6 @@
|
||||
|
||||
#include "wx/mac/private.h"
|
||||
|
||||
#ifndef __DARWIN__
|
||||
#include <Scrap.h>
|
||||
#endif
|
||||
|
||||
|
||||
// ----------------------------------------------------------------------------
|
||||
// globals
|
||||
// ----------------------------------------------------------------------------
|
||||
|
@@ -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 ) ;
|
||||
|
Reference in New Issue
Block a user