don't create non-existing groups in HasEntry()

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

diff --git a/src/mac/carbon/clipbrd.cpp b/src/mac/carbon/clipbrd.cpp
index a569f8bb719e41ab51f0c0905028653860325028..d0ea791e8b9a7509530637a118b2b23e64473557 100644 (file)
--- a/src/mac/carbon/clipbrd.cpp
+++ b/src/mac/carbon/clipbrd.cpp
@@ -1,636 +1,444 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        clipbrd.cpp
+// Name:        src/mac/carbon/clipbrd.cpp

 // Purpose:     Clipboard functionality
 // Purpose:     Clipboard functionality

-// Author:      AUTHOR
+// Author:      Stefan Csomor;
+//              Generalized clipboard implementation by Matthew Flatt

 // Modified by:
 // Modified by:

-// Created:     ??/??/98
+// Created:     1998-01-01

 // RCS-ID:      $Id$
 // RCS-ID:      $Id$

-// Copyright:   (c) AUTHOR
-// Licence:    wxWindows licence
+// Copyright:   (c) Stefan Csomor
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 /////////////////////////////////////////////////////////////////////////////
 

-#ifdef __GNUG__
-#pragma implementation
-#pragma implementation "clipbrd.h"
-#endif
+#include "wx/wxprec.h"

 
 

-#include "wx/app.h"
-#include "wx/frame.h"
-#include "wx/bitmap.h"
-#include "wx/utils.h"
-#include "wx/metafile.h"
-#include "wx/clipbrd.h"
-#include "wx/intl.h"
+#if wxUSE_CLIPBOARD

 
 

-#define wxUSE_DATAOBJ 1
+#include "wx/clipbrd.h"

 
 

-#include <string.h>
+#ifndef WX_PRECOMP
+    #include "wx/intl.h"
+    #include "wx/log.h"
+    #include "wx/app.h"
+    #include "wx/utils.h"
+    #include "wx/frame.h"
+    #include "wx/bitmap.h"
+#endif

 
 

-// open/close
+#include "wx/metafile.h"

 
 

-bool clipboard_opened = false ;
+#ifndef __DARWIN__
+#include <Scrap.h>
+#endif

 
 

-bool wxOpenClipboard()
-{
-       clipboard_opened = true ;
-    return TRUE;
-}
+#include "wx/mac/uma.h"

 
 

-bool wxCloseClipboard()
-{
-       clipboard_opened = false ;
-    return TRUE;
-}
+#define wxUSE_DATAOBJ 1

 
 

-bool wxIsClipboardOpened()
-{
-     return clipboard_opened;
-}
+#include <string.h>

 
 

-bool wxEmptyClipboard()
-{
-       
-#if TARGET_CARBON
-       OSStatus err ;
-       err = ClearCurrentScrap( );
-#else
-       OSErr err ;
-       err = ZeroScrap( );
-#endif
-       if ( err )
-       {
-        wxLogSysError(_("Failed to empty the clipboard."));
-               return FALSE ;
-       }
-    return TRUE;
-}

 
 

-// get/set data
+// the trace mask we use with wxLogTrace() - call
+// wxLog::AddTraceMask(TRACE_CLIPBOARD) to enable the trace messages from here
+// (there will be a *lot* of them!)
+static const wxChar *TRACE_CLIPBOARD = wxT("clipboard");

 
 

-// clipboard formats

 
 

-bool wxIsClipboardFormatAvailable(wxDataFormat dataFormat)
+void * wxGetClipboardData( wxDataFormat dataFormat, long *len )

 {
 {

-#if TARGET_CARBON
-       OSStatus err = noErr;
-       ScrapRef scrapRef;
-       
-       err = GetCurrentScrap( &scrapRef );
-       if ( err != noTypeErr && err != memFullErr )    
-       {
-               ScrapFlavorFlags        flavorFlags;
-               Size                            byteCount;
-               
-               if (( err = GetScrapFlavorFlags( scrapRef, dataFormat.GetFormatId(), &flavorFlags )) == noErr)
-               {
-                       if (( err = GetScrapFlavorSize( scrapRef, dataFormat.GetFormatId(), &byteCount )) == noErr)
-                       {
-                               return TRUE ;
-                       }
-               }
-       }
-       return FALSE;
-       
-#else
-       long offset ;
-       Handle datahandle = NewHandle(0) ;
-       HLock( datahandle ) ;
-       GetScrap( datahandle , dataFormat.GetFormatId() , &offset ) ;
-       HUnlock( datahandle ) ;
-       bool hasData = GetHandleSize( datahandle ) > 0 ;
-       DisposeHandle( datahandle ) ;
-       return hasData ;
-#endif
-}
+    OSStatus err = noErr;
+    void * data = NULL;
+    Size byteCount;

 
 

-bool wxSetClipboardData(wxDataFormat dataFormat,const void *data,int width , int height)
-{
-#if !TARGET_CARBON
-       OSErr err = noErr ;
-#else
-       OSStatus err = noErr ;
-#endif
-       

     switch (dataFormat.GetType())
     {
     switch (dataFormat.GetType())
     {

-        case wxDF_BITMAP:
-            {
-               /*
-                wxBitmap *bitmap = (wxBitmap *)data;
-
-                HDC hdcMem = CreateCompatibleDC((HDC) NULL);
-                HDC hdcSrc = CreateCompatibleDC((HDC) NULL);
-                HBITMAP old = (HBITMAP)
-                    ::SelectObject(hdcSrc, (HBITMAP)bitmap->GetHBITMAP());
-                HBITMAP hBitmap = CreateCompatibleBitmap(hdcSrc,
-                                                         bitmap->GetWidth(),
-                                                         bitmap->GetHeight());
-                if (!hBitmap)
-                {
-                    SelectObject(hdcSrc, old);
-                    DeleteDC(hdcMem);
-                    DeleteDC(hdcSrc);
-                    return FALSE;
-                }
+    case wxDF_OEMTEXT:
+        dataFormat = wxDF_TEXT;
+        break;

 
 

-                HBITMAP old1 = (HBITMAP) SelectObject(hdcMem, hBitmap);
-                BitBlt(hdcMem, 0, 0, bitmap->GetWidth(), bitmap->GetHeight(),
-                       hdcSrc, 0, 0, SRCCOPY);
+    case wxDF_TEXT:
+    case wxDF_UNICODETEXT:
+        break;

 
 

-                // Select new bitmap out of memory DC
-                SelectObject(hdcMem, old1);
+    case wxDF_BITMAP:
+    case wxDF_METAFILE:
+        break;

 
 

-                // Set the data
-                handle = ::SetClipboardData(CF_BITMAP, hBitmap);
+    default:
+        // custom datatype
+        break;
+    }

 
 

-                // Clean up
-                SelectObject(hdcSrc, old);
-                DeleteDC(hdcSrc);
-                DeleteDC(hdcMem);
-                */
-                break;
-            }
+#if TARGET_CARBON
+    ScrapRef scrapRef;

 
 

-        case wxDF_DIB:
-            {
-               /*
-#if wxUSE_IMAGE_LOADING_IN_MSW
-                wxBitmap *bitmap = (wxBitmap *)data;
-                HBITMAP hBitmap = (HBITMAP)bitmap->GetHBITMAP();
-                // NULL palette means to use the system one
-                HANDLE hDIB = wxBitmapToDIB(hBitmap, (HPALETTE)NULL); 
-                handle = SetClipboardData(CF_DIB, hDIB);
-#endif // wxUSE_IMAGE_LOADING_IN_MSW
-*/
-                break;
-            }
+    err = GetCurrentScrap( &scrapRef );
+    if ( err != noTypeErr && err != memFullErr )
+    {
+        ScrapFlavorFlags    flavorFlags;

 
 

-#if wxUSE_METAFILE
-        case wxDF_METAFILE:
-            {
-                wxMetafile *wxMF = (wxMetafile *)data;
-                               PicHandle pict = wxMF->GetHMETAFILE() ;
-                               HLock( (Handle) pict ) ;
-#if !TARGET_CARBON
-                               err = PutScrap( GetHandleSize(  (Handle) pict ) , 'PICT' , *pict ) ;
-#else
-                               ScrapRef        scrap;
-                               err = GetCurrentScrap (&scrap); 
-                               if ( !err )
-                               {
-                                       err = PutScrapFlavor (scrap, 'PICT', 0, GetHandleSize((Handle) pict), *pict);
-                               }
-#endif
-                               HUnlock(  (Handle) pict ) ;
-                break;
-            }
-#endif
-        case wxDF_SYLK:
-        case wxDF_DIF:
-        case wxDF_TIFF:
-        case wxDF_PALETTE:
-        default:
+        err = GetScrapFlavorFlags( scrapRef, dataFormat.GetFormatId(), &flavorFlags );
+        if (err == noErr)
+        {
+            err = GetScrapFlavorSize( scrapRef, dataFormat.GetFormatId(), &byteCount );
+            if (err == noErr)

             {
             {

-                wxLogError(_("Unsupported clipboard format."));
-                return FALSE;
-            }
+                Size allocSize = byteCount;
+                if ( dataFormat.GetType() == wxDF_TEXT )
+                    allocSize += 1;
+                else if ( dataFormat.GetType() == wxDF_UNICODETEXT )
+                    allocSize += 2;

 
 

-        case wxDF_OEMTEXT:
-            dataFormat = wxDF_TEXT;
-            // fall through
+                data = new char[ allocSize ];

 
 

-        case wxDF_TEXT:
-            {
-               wxString mac ;
-               if ( wxApp::s_macDefaultEncodingIsPC )
-               {
-                       mac = wxMacMakeMacStringFromPC((char *)data) ;
-               }
-               else
-               {
-                       mac = (char *)data ;
-               }
-#if !TARGET_CARBON
-                               err = PutScrap( mac.Length() , 'TEXT' , mac.c_str() ) ;
-#else
-                               ScrapRef        scrap;
-                               err = GetCurrentScrap (&scrap); 
-                               if ( !err )
-                               {
-                                       err = PutScrapFlavor (scrap, 'TEXT', 0, mac.Length(), mac.c_str());
-                               }
-#endif
-                break;
+                if (( err = GetScrapFlavorData( scrapRef, dataFormat.GetFormatId(), &byteCount , data )) == noErr )
+                {
+                    *len = allocSize;
+                    if ( dataFormat.GetType() == wxDF_TEXT )
+                        ((char*)data)[ byteCount ] = 0;
+                    if ( dataFormat.GetType() == wxDF_UNICODETEXT )
+                    {
+                        // "data" format is UTF16, so 2 bytes = one character
+                        // wxChar size depends on platform, so just clear last 2 bytes
+                        ((char*)data)[ byteCount + 0 ] =
+                        ((char*)data)[ byteCount + 1 ] = 0;
+                    }
+                }
+                else
+                {
+                    delete [] (char*)data;
+                    data = NULL;
+                }

             }
             }

+        }

     }
 
     }
 

-    if ( err )
+#else
+    long offset;
+    Handle datahandle = NewHandle( 0 );
+    HLock( datahandle );
+    err = (OSStatus)GetScrap( datahandle, dataFormat.GetFormatId(), &offset );
+    HUnlock( datahandle );
+    if ( GetHandleSize( datahandle ) > 0 )

     {
     {

-        wxLogSysError(_("Failed to set clipboard data."));
-
-        return FALSE;
+        byteCount = GetHandleSize( datahandle );
+        Size allocSize = byteCount;
+        if ( dataFormat.GetType() == wxDF_TEXT )
+            allocSize += 1;
+        else if ( dataFormat.GetType() == wxDF_UNICODETEXT )
+            allocSize += 2;
+
+        data = new char[ allocSize ];
+
+        memcpy( (char*) data, (char*) *datahandle, byteCount );
+        if ( dataFormat.GetType() == wxDF_TEXT )
+            ((char*)data)[ byteCount ] = 0;
+        else if ( dataFormat.GetType() == wxDF_UNICODETEXT )
+            ((wxChar*)data)[ byteCount / 2 ] = 0;
+        *len = byteCount;

     }
 
     }
 

-    return TRUE;
-}
-
-wxDataFormat wxEnumClipboardFormats(wxDataFormat dataFormat)
-{
-    return wxDataFormat();
-}
-
-int  wxRegisterClipboardFormat(wxChar *formatName)
-{
-    return 0;
-}
-
-bool wxGetClipboardFormatName(wxDataFormat dataFormat, wxChar *formatName, int maxCount)
-{
-    return FALSE;
-}
-
-void *wxGetClipboardData(wxDataFormat dataFormat, long *len)
-{
-#if !TARGET_CARBON
-       OSErr err = noErr ;
-#else
-       OSStatus err = noErr ;
+    DisposeHandle( datahandle );

 #endif
 #endif

-  void * data = NULL ;
-       
-    switch (dataFormat.GetType())
-    {
-        case wxDF_BITMAP:
-        case wxDF_DIB:
-#if wxUSE_METAFILE
-        case wxDF_METAFILE:
-#endif
-        case wxDF_SYLK:
-        case wxDF_DIF:
-        case wxDF_TIFF:
-        case wxDF_PALETTE:
-        default:
-            {
-                wxLogError(_("Unsupported clipboard format."));
-                return NULL;
-            }

 
 

-        case wxDF_OEMTEXT:
-            dataFormat = wxDF_TEXT;
-            // fall through
+    if (err != noErr)
+    {
+        wxLogSysError(wxT("Failed to get clipboard data."));

 
 

-        case wxDF_TEXT:
-                break;
+        return NULL;

     }
 
     }
 

-#if TARGET_CARBON
-       ScrapRef scrapRef;
-       
-       err = GetCurrentScrap( &scrapRef );
-       if ( err != noTypeErr && err != memFullErr )    
-       {
-               ScrapFlavorFlags        flavorFlags;
-               Size                            byteCount;
-               
-               if (( err = GetScrapFlavorFlags( scrapRef, dataFormat.GetFormatId(), &flavorFlags )) == noErr)
-               {
-                       if (( err = GetScrapFlavorSize( scrapRef, dataFormat.GetFormatId(), &byteCount )) == noErr)
-                       {
-                         if ( dataFormat.GetType() == wxDF_TEXT )
-                           byteCount++ ;
-                           
-          data = new char[ byteCount ] ;
-          if (( err = GetScrapFlavorData( scrapRef, dataFormat.GetFormatId(), &byteCount , data )) == noErr )
-          {
-            *len = byteCount ;
-                           if ( dataFormat.GetType() == wxDF_TEXT )  
-                       ((char*)data)[byteCount] = 0 ;
-          }
-          else
-          {
-            delete[] data ;
-            data = NULL ;
-          }
-                       }
-               }
-       }
-       
-#else
-       long offset ;
-       Handle datahandle = NewHandle(0) ;
-       HLock( datahandle ) ;
-       GetScrap( datahandle , dataFormat.GetFormatId() , &offset ) ;
-       HUnlock( datahandle ) ;
-       if ( GetHandleSize( datahandle ) > 0 )
-       {
-         long byteCount = GetHandleSize( datahandle ) ;
-         if ( dataFormat.GetType() == wxDF_TEXT )  
-           data = new char[ byteCount + 1] ;
-      else
-        data = new char[ byteCount ] ;
-
-         memcpy( (char*) data , (char*) *datahandle , byteCount ) ;
-         if ( dataFormat.GetType() == wxDF_TEXT )  
-                 ((char*)data)[byteCount] = 0 ;
-         * len = byteCount ;
-       }
-       DisposeHandle( datahandle ) ;
-#endif
-    if ( err )
-    {
-        wxLogSysError(_("Failed to get clipboard data."));
+    if (dataFormat.GetType() == wxDF_TEXT)
+        wxMacConvertNewlines10To13( (char*)data );

 
 

-        return NULL ;
-    }
-    if ( dataFormat.GetType() == wxDF_TEXT && wxApp::s_macDefaultEncodingIsPC )
-    {
-      wxMacConvertToPC((char*)data) ;
-    }

     return data;
 }
 
     return data;
 }
 

-
-/*
- * Generalized clipboard implementation by Matthew Flatt
- */
-
-IMPLEMENT_DYNAMIC_CLASS(wxClipboard, wxClipboardBase)
+IMPLEMENT_DYNAMIC_CLASS(wxClipboard, wxObject)

 
 wxClipboard::wxClipboard()
 {
 
 wxClipboard::wxClipboard()
 {

-    m_clearOnExit = FALSE;
+    m_open = false;
+    m_data = NULL;

 }
 
 wxClipboard::~wxClipboard()
 {
 }
 
 wxClipboard::~wxClipboard()
 {

-    if ( m_clearOnExit )
+    if (m_data != NULL)

     {
     {

-        Clear();
+        delete m_data;
+        m_data = NULL;

     }
 }
 
 void wxClipboard::Clear()
 {
     }
 }
 
 void wxClipboard::Clear()
 {

+    if (m_data != NULL)
+    {
+        delete m_data;
+        m_data = NULL;
+    }
+
+#if TARGET_CARBON
+    OSStatus err;
+    err = ClearCurrentScrap();
+#else
+    OSErr err;
+    err = ZeroScrap();
+#endif
+
+    if (err != noErr)
+    {
+        wxLogSysError( wxT("Failed to empty the clipboard.") );
+    }

 }
 
 bool wxClipboard::Flush()
 {
 }
 
 bool wxClipboard::Flush()
 {

-    return FALSE;
+    return false;

 }
 
 bool wxClipboard::Open()
 {
 }
 
 bool wxClipboard::Open()
 {

-    return wxOpenClipboard();
-}
+    wxCHECK_MSG( !m_open, false, wxT("clipboard already open") );

 
 

-bool wxClipboard::IsOpened() const
-{
-    return wxIsClipboardOpened();
+    m_open = true;
+
+    return true;

 }
 
 }
 

-static int FormatStringToID(char *str)
+bool wxClipboard::IsOpened() const

 {
 {

-  if (!strcmp(str, "TEXT"))
-    return wxDF_TEXT;
-
-  return wxRegisterClipboardFormat(str);
+    return m_open;

 }
 
 bool wxClipboard::SetData( wxDataObject *data )
 {
 }
 
 bool wxClipboard::SetData( wxDataObject *data )
 {

-    (void)wxEmptyClipboard();
+    wxCHECK_MSG( m_open, false, wxT("clipboard not open") );
+    wxCHECK_MSG( data, false, wxT("data is invalid") );
+
+    Clear();

 
 

-    if ( data )
-        return AddData(data);
-    else
-        return TRUE;
+    // as we can only store one wxDataObject,
+    // this is the same in this implementation
+    return AddData( data );

 }
 
 bool wxClipboard::AddData( wxDataObject *data )
 {
 }
 
 bool wxClipboard::AddData( wxDataObject *data )
 {

-    wxCHECK_MSG( data, FALSE, wxT("data is invalid") );
+    wxCHECK_MSG( m_open, false, wxT("clipboard not open") );
+    wxCHECK_MSG( data, false, wxT("data is invalid") );
+
+    // we can only store one wxDataObject
+    Clear();

 
 

-#if wxUSE_DATAOBJ
-    wxCHECK_MSG( wxIsClipboardOpened(), FALSE, wxT("clipboard not open") );
+    m_data = data;

 
 

-    wxDataFormat format = data->GetPreferredFormat();
+    // get formats from wxDataObjects
+    wxDataFormat *array = new wxDataFormat[ m_data->GetFormatCount() ];
+    m_data->GetAllFormats( array );

 
 

-    switch ( format.GetType() )
+    for (size_t i = 0; i < m_data->GetFormatCount(); i++)

     {
     {

-        case wxDF_TEXT:
-        case wxDF_OEMTEXT:
+        if (array[i].IsStandard())

         {
         {

-            wxTextDataObject* textDataObject = (wxTextDataObject*) data;
-            wxString str(textDataObject->GetText());
-            return wxSetClipboardData(format, str.c_str());
+            wxLogTrace( TRACE_CLIPBOARD,
+                        wxT("wxClipboard now supports standard atom type %d"),
+                        array[i].GetType() );

         }
         }

-
-        case wxDF_BITMAP:
-        case wxDF_DIB:
+        else

         {
         {

-            wxBitmapDataObject* bitmapDataObject = (wxBitmapDataObject*) data;
-            wxBitmap bitmap(bitmapDataObject->GetBitmap());
-            return wxSetClipboardData(format, &bitmap);
+            wxLogTrace( TRACE_CLIPBOARD,
+                        wxT("wxClipboard now supports atom %s"),
+                        array[i].GetId().c_str() );

         }
 
         }
 

-#if 0 // wxUSE_METAFILE
-        case wxDF_METAFILE:
+        size_t sz = data->GetDataSize( array[ i ] );
+        void* buf = malloc( sz + 1 );
+        if ( buf != NULL )

         {
         {

-            wxMetafileDataObject* metaFileDataObject = 
-                (wxMetafileDataObject*) data;
-            wxMetafile metaFile = metaFileDataObject->GetMetafile();
-            return wxSetClipboardData(wxDF_METAFILE, &metaFile,
-                                      metaFileDataObject->GetWidth(),
-                                      metaFileDataObject->GetHeight());
-        }
-#endif // wxUSE_METAFILE
+            // empty the buffer because in some case GetDataHere does not fill buf
+            memset( buf, 0, sz + 1 );
+            data->GetDataHere( array[ i ], buf );
+            OSType mactype = 0;
+            switch ( array[i].GetType() )
+            {
+            case wxDF_TEXT:
+            case wxDF_OEMTEXT:
+                mactype = kScrapFlavorTypeText;
+                sz -= 1;
+                break;

 
 

-        default:
- //           return wxSetClipboardData(data);
-                               break ;
+#if wxUSE_UNICODE
+            case wxDF_UNICODETEXT:
+                mactype = kScrapFlavorTypeUnicode;
+                sz -= 2;
+                break;
+#endif
+
+#if wxUSE_DRAG_AND_DROP
+            case wxDF_METAFILE:
+                mactype = kScrapFlavorTypePicture;
+                break;
+#endif
+
+            case wxDF_BITMAP:
+            case wxDF_DIB:
+                mactype = kScrapFlavorTypePicture;
+                break;
+
+            default:
+                mactype = (OSType)(array[ i ].GetFormatId());
+                break;
+            }
+
+            UMAPutScrap( sz , mactype , buf );
+            free( buf );
+        }

     }
     }

-#else // !wxUSE_DATAOBJ
-#endif 
-    return FALSE;
+
+    delete [] array;
+
+    return true;

 }
 
 void wxClipboard::Close()
 {
 }
 
 void wxClipboard::Close()
 {

-    wxCloseClipboard();
-}
+    wxCHECK_RET( m_open, wxT("clipboard not open") );

 
 

-bool wxClipboard::IsSupported( const wxDataFormat &format )
-{
-    return wxIsClipboardFormatAvailable(format);
+    m_open = false;
+
+    // Get rid of cached object.
+    // If this is not done, copying data from
+    // another application will only work once
+    if (m_data)
+    {
+        delete m_data;
+        m_data = (wxDataObject*) NULL;
+    }

 }
 
 }
 

-bool wxClipboard::GetData( wxDataObject& data )
+bool wxClipboard::IsSupported( const wxDataFormat &dataFormat )

 {
 {

-#if wxUSE_DATAOBJ
-    wxCHECK_MSG( wxIsClipboardOpened(), FALSE, wxT("clipboard not open") );
+    if ( m_data )
+        return m_data->IsSupported( dataFormat );

 
 

-    wxDataFormat format = data.GetPreferredFormat();
-    switch ( format.GetType() )
-    {
-        case wxDF_TEXT:
-        case wxDF_OEMTEXT:
-        {
-            wxTextDataObject& textDataObject = (wxTextDataObject &)data;
-            char* s = (char*)wxGetClipboardData(format);
-            if ( !s )
-                return FALSE;
+    bool hasData = false;

 
 

-            textDataObject.SetText(s);
-            delete [] s;
+#if TARGET_CARBON
+    OSStatus err = noErr;
+    ScrapRef scrapRef;

 
 

-            return TRUE;
-        }
+    err = GetCurrentScrap( &scrapRef );
+    if ( err != noTypeErr && err != memFullErr )
+    {
+        ScrapFlavorFlags flavorFlags;
+        Size byteCount;

 
 

-        case wxDF_BITMAP:
-        case wxDF_DIB:
+        err = GetScrapFlavorFlags( scrapRef, dataFormat.GetFormatId(), &flavorFlags );
+        if (err == noErr)

         {
         {

-            wxBitmapDataObject& bitmapDataObject = (wxBitmapDataObject &)data;
-            wxBitmap* bitmap = (wxBitmap *)wxGetClipboardData(format );
-            if ( !bitmap )
-                return FALSE;
-
-            bitmapDataObject.SetBitmap(*bitmap);
-            delete bitmap;
-
-            return TRUE;
+            err = GetScrapFlavorSize( scrapRef, dataFormat.GetFormatId(), &byteCount );
+            if (err == noErr)
+                hasData = true;

         }
         }

-#if 0 // wxUSE_METAFILE
-        case wxDF_METAFILE:
+        else if ( dataFormat.GetType() == wxDF_UNICODETEXT )

         {
         {

-            wxMetafileDataObject& metaFileDataObject = (wxMetafileDataObject &)data;
-            wxMetafile* metaFile = (wxMetafile *)wxGetClipboardData(wxDF_METAFILE);
-            if ( !metaFile )
-                return FALSE;
-
-            metaFileDataObject.SetMetafile(*metaFile);
-            delete metaFile;
-
-            return TRUE;
+            err = GetScrapFlavorFlags( scrapRef, 'TEXT', &flavorFlags );
+            if (err == noErr)
+            {
+                err = GetScrapFlavorSize( scrapRef, 'TEXT', &byteCount );
+                if (err == noErr)
+                    hasData = true;
+            }

         }
         }

-#endif // wxUSE_METAFILE

     }
     }

-#else // !wxUSE_DATAOBJ
-    wxFAIL_MSG( wxT("no clipboard implementation") );
+
+#else
+
+    long offset = 0;
+    Handle datahandle = NewHandle( 0 );
+    HLock( datahandle );
+    GetScrap( datahandle, dataFormat.GetFormatId(), &offset );
+    HUnlock( datahandle );
+    hasData = GetHandleSize( datahandle ) > 0;
+    DisposeHandle( datahandle );

 #endif
 #endif

-    return FALSE;
-}
-/*
-void wxClipboard::SetClipboardClient(wxClipboardClient *client, long time)
-{
-  bool got_selection;
-
-  if (clipOwner)
-    clipOwner->BeingReplaced();
-  clipOwner = client;
-  if (cbString) {
-    delete[] cbString;
-    cbString = NULL;
-  }
-
-  if (wxOpenClipboard()) {
-    char **formats, *data;
-         int i;
-    int ftype;
-    long size;
-
-    formats = clipOwner->formats.ListToArray(FALSE);
-    for (i = clipOwner->formats.Number(); i--; ) {
-      ftype = FormatStringToID(formats[i]);
-      data = clipOwner->GetData(formats[i], &size);
-      if (!wxSetClipboardData(ftype, (wxObject *)data, size, 1)) {
-        got_selection = FALSE;
-        break;
-      }
-    }

 
 

-    if (i < 0)
-      got_selection = wxCloseClipboard();
-  } else
-    got_selection = FALSE;
-  
-  got_selection = FALSE; // Assume another process takes over
-
-  if (!got_selection) {
-    clipOwner->BeingReplaced();
-         clipOwner = NULL;
-  }
+    return hasData;

 }
 
 }
 

-wxClipboardClient *wxClipboard::GetClipboardClient()
+bool wxClipboard::GetData( wxDataObject& data )

 {
 {

-  return clipOwner;
-}
+    wxCHECK_MSG( m_open, false, wxT("clipboard not open") );

 
 

-void wxClipboard::SetClipboardString(char *str, long time)
-{
-  bool got_selection;
-
-  if (clipOwner) {
-    clipOwner->BeingReplaced();
-    clipOwner = NULL;
-  }
-  if (cbString)
-    delete[] cbString;
-
-  cbString = str;
-
-  if (wxOpenClipboard()) {
-    if (!wxSetClipboardData(wxDF_TEXT, (wxObject *)str))
-      got_selection = FALSE;
-    else
-                got_selection = wxCloseClipboard();
-  } else
-    got_selection = FALSE;
-
-  got_selection = FALSE; // Assume another process takes over
-
-  if (!got_selection) {
-    delete[] cbString;
-    cbString = NULL;
-  }
-}
-char *wxClipboard::GetClipboardString(long time)
-{
-  char *str;
-  long length;
+    size_t formatcount = data.GetFormatCount() + 1;
+    wxDataFormat *array = new wxDataFormat[ formatcount ];
+    array[0] = data.GetPreferredFormat();
+    data.GetAllFormats( &array[1] );

 
 

-  str = GetClipboardData("TEXT", &length, time);
-  if (!str) {
-    str = new char[1];
-    *str = 0;
-  }
+    bool transferred = false;

 
 

-  return str;
-}
+    if ( m_data )
+    {
+        for (size_t i = 0; !transferred && i < formatcount; i++)
+        {
+            wxDataFormat format = array[ i ];
+            if ( m_data->IsSupported( format ) )
+            {
+                int dataSize = m_data->GetDataSize( format );
+                transferred = true;

 
 

+                if (dataSize == 0)
+                {
+                    data.SetData( format, 0, 0 );
+                }
+                else
+                {
+                    char *d = new char[ dataSize ];
+                    m_data->GetDataHere( format, (void*)d );
+                    data.SetData( format, dataSize, d );
+                    delete [] d;
+                }
+            }
+        }
+    }

 
 

-char *wxClipboard::GetClipboardData(char *format, long *length, long time)
-{
-  if (clipOwner)  {
-         if (clipOwner->formats.Member(format))
-      return clipOwner->GetData(format, length);
-    else
-      return NULL;
-  } else if (cbString) {
-    if (!strcmp(format, "TEXT"))
-      return copystring(cbString);
-    else
-      return NULL;
-  } else {
-    if (wxOpenClipboard()) {
-      receivedString = (char *)wxGetClipboardData(FormatStringToID(format), 
-                                                  length);
-      wxCloseClipboard();
-    } else
-      receivedString = NULL;
-
-    return receivedString;
-  }
+    // get formats from wxDataObjects
+    if ( !transferred )
+    {
+        for (size_t i = 0; !transferred && i < formatcount; i++)
+        {
+            wxDataFormat format = array[ i ];
+
+            switch ( format.GetType() )
+            {
+                // NOTE: this is usable for all data types
+                case wxDF_TEXT:
+                case wxDF_UNICODETEXT:
+                case wxDF_OEMTEXT:
+                case wxDF_BITMAP:
+                case wxDF_METAFILE:
+                default:
+                {
+                    long len;
+                    char* s = (char*)wxGetClipboardData( format, &len );
+                    if (s != NULL)
+                    {
+                        data.SetData( format, len, s );
+                        delete [] s;
+
+                        transferred = true;
+                    }
+                }
+                break;
+            }
+        }
+    }
+
+    delete [] array;
+
+    return transferred;

 }
 }

-*/

 
 

+#endif