Changed wxStat, wxAccess and wxOpen to no longer

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

diff --git a/src/mac/clipbrd.cpp b/src/mac/clipbrd.cpp
index ca5b79339632c428ac59338d65addc48cbb23b22..a85398f27f7bd4d52636da640d74f26dfe9d826d 100644 (file)
--- a/src/mac/clipbrd.cpp
+++ b/src/mac/clipbrd.cpp
@@ -6,7 +6,7 @@
 // Created:     ??/??/98
 // RCS-ID:      $Id$
 // Copyright:   (c) AUTHOR
 // Created:     ??/??/98
 // RCS-ID:      $Id$
 // Copyright:   (c) AUTHOR

-// Licence:    wxWindows licence
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__


@@ -20,235 +20,110 @@
 #include "wx/utils.h"
 #include "wx/metafile.h"
 #include "wx/clipbrd.h"
 #include "wx/utils.h"
 #include "wx/metafile.h"
 #include "wx/clipbrd.h"

+#include "wx/intl.h"
+
+#include "wx/mac/private.h"
+#ifndef __DARWIN__
+#include <Scrap.h>
+#endif

 
 #define wxUSE_DATAOBJ 1
 
 #include <string.h>
 
 
 #define wxUSE_DATAOBJ 1
 
 #include <string.h>
 

-// open/close
-
-bool clipboard_opened = false ;
-
-bool wxOpenClipboard()
-{
-       clipboard_opened = true ;
-    return TRUE;
-}
-
-bool wxCloseClipboard()
-{
-       clipboard_opened = false ;
-    return TRUE;
-}
-
-bool wxIsClipboardOpened()
-{
-     return clipboard_opened;
-}
-
-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
-
-// clipboard formats
+// 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 = _T("clipboard");

 
 

-bool wxIsClipboardFormatAvailable(wxDataFormat dataFormat)
-{
-#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 ;
-       if ( GetScrap( NULL , dataFormat.GetFormatId() , &offset ) > 0 )
-       {
-               return TRUE ;
-       }
-     return FALSE;
-#endif
-}
-
-bool wxSetClipboardData(wxDataFormat dataFormat,const void *data,int width , int height)
+void *wxGetClipboardData(wxDataFormat dataFormat, long *len)

 {
 #if !TARGET_CARBON
 {
 #if !TARGET_CARBON

-       OSErr err = noErr ;
+    OSErr err = noErr ;

 #else
 #else

-       OSStatus err = noErr ;
+    OSStatus err = noErr ;

 #endif
 #endif

-       
+  void * data = NULL ;
+    

     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;
-                }
-
-                HBITMAP old1 = (HBITMAP) SelectObject(hdcMem, hBitmap);
-                BitBlt(hdcMem, 0, 0, bitmap->GetWidth(), bitmap->GetHeight(),
-                       hdcSrc, 0, 0, SRCCOPY);
-
-                // Select new bitmap out of memory DC
-                SelectObject(hdcMem, old1);
-
-                // Set the data
-                handle = ::SetClipboardData(CF_BITMAP, hBitmap);
-
-                // Clean up
-                SelectObject(hdcSrc, old);
-                DeleteDC(hdcSrc);
-                DeleteDC(hdcMem);
-                */
-                break;
-            }
-
-        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;
-            }
+        case wxDF_OEMTEXT:
+            dataFormat = wxDF_TEXT;
+            // fall through

 
 

-#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 ) ;
+        case wxDF_TEXT:

                 break;
                 break;

-            }
-#endif
-        case wxDF_SYLK:
-        case wxDF_DIF:
-        case wxDF_TIFF:
-        case wxDF_PALETTE:

         default:
             {
                 wxLogError(_("Unsupported clipboard format."));
         default:
             {
                 wxLogError(_("Unsupported clipboard format."));

-                return FALSE;
+                return NULL;

             }
             }

+    }

 
 

-        case wxDF_OEMTEXT:
-            dataFormat = wxDF_TEXT;
-            // fall through
-
-        case wxDF_TEXT:
+#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)

             {
             {

-               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 ( 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[] ((char *)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 )
     {
     if ( err )
     {

-        wxLogSysError(_("Failed to set clipboard data."));
+        wxLogSysError(_("Failed to get clipboard data."));

 
 

-        return FALSE;
+        return NULL ;

     }
     }

-
-    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)
-{
-    return NULL;
+    if ( dataFormat.GetType() == wxDF_TEXT && wxApp::s_macDefaultEncodingIsPC )
+    {
+      wxMacConvertToPC((char*)data) ;
+    }
+    return data;

 }
 
 
 }
 
 


@@ -256,23 +131,41 @@ void *wxGetClipboardData(wxDataFormat dataFormat, long *len)
  * Generalized clipboard implementation by Matthew Flatt
  */
 
  * 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)

     {
     {

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

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

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

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


@@ -282,257 +175,228 @@ bool wxClipboard::Flush()
 
 bool wxClipboard::Open()
 {
 
 bool wxClipboard::Open()
 {

-    return wxOpenClipboard();
+    wxCHECK_MSG( !m_open, FALSE, wxT("clipboard already open") );
+    m_open = true ;
+    return true ;

 }
 
 bool wxClipboard::IsOpened() const
 {
 }
 
 bool wxClipboard::IsOpened() const
 {

-    return wxIsClipboardOpened();
+    return m_open;

 }
 
 }
 

-static int FormatStringToID(char *str)
+bool wxClipboard::SetData( wxDataObject *data )

 {
 {

-  if (!strcmp(str, "TEXT"))
-    return wxDF_TEXT;
+    wxCHECK_MSG( m_open, FALSE, wxT("clipboard not open") );

 
 

-  return wxRegisterClipboardFormat(str);
-}
+    wxCHECK_MSG( data, FALSE, wxT("data is invalid") );

 
 

-bool wxClipboard::SetData( wxDataObject *data )
-{
-    (void)wxEmptyClipboard();
+    Clear();

 
 

-    if ( data )
-        return AddData(data);
-    else
-        return TRUE;
+    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") );

 
 

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

 
     wxDataFormat format = data->GetPreferredFormat();
 
 
     wxDataFormat format = data->GetPreferredFormat();
 

-    switch ( format.GetType() )
+    /* we can only store one wxDataObject */
+    Clear();
+
+    m_data = data;
+
+    /* get formats from wxDataObjects */
+    wxDataFormat *array = new wxDataFormat[ m_data->GetFormatCount() ];
+    m_data->GetAllFormats( array );
+
+    for (size_t i = 0; i < m_data->GetFormatCount(); i++)

     {
     {

-        case wxDF_TEXT:
-        case wxDF_OEMTEXT:
-        {
-            wxTextDataObject* textDataObject = (wxTextDataObject*) data;
-            wxString str(textDataObject->GetText());
-            return wxSetClipboardData(format, str.c_str());
-        }
+        wxLogTrace( TRACE_CLIPBOARD,
+                    wxT("wxClipboard now supports atom %s"),
+                    array[i].GetId().c_str() );

 
 

-        case wxDF_BITMAP:
-        case wxDF_DIB:
-        {
-            wxBitmapDataObject* bitmapDataObject = (wxBitmapDataObject*) data;
-            wxBitmap bitmap(bitmapDataObject->GetBitmap());
-            return wxSetClipboardData(format, &bitmap);
-        }
+#if !TARGET_CARBON
+        OSErr err = noErr ;
+#else
+        OSStatus err = noErr ;
+#endif

 
 

-#if 0 // wxUSE_METAFILE
+       switch ( array[i].GetType() )
+       {
+           case wxDF_TEXT:
+           case wxDF_OEMTEXT:
+           {
+               wxTextDataObject* textDataObject = (wxTextDataObject*) data;
+               wxString str(textDataObject->GetText());
+                wxString mac ;
+                if ( wxApp::s_macDefaultEncodingIsPC )
+                {
+                    mac = wxMacMakeMacStringFromPC(textDataObject->GetText()) ;
+                }
+                else
+                {
+                    mac = textDataObject->GetText() ;
+                }
+        #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 wxUSE_DRAG_AND_DROP

         case wxDF_METAFILE:
         case wxDF_METAFILE:

-        {
-            wxMetafileDataObject* metaFileDataObject = 
+           {
+              wxMetafileDataObject* metaFileDataObject =

                 (wxMetafileDataObject*) data;
                 (wxMetafileDataObject*) data;

-            wxMetafile metaFile = metaFileDataObject->GetMetafile();
-            return wxSetClipboardData(wxDF_METAFILE, &metaFile,
-                                      metaFileDataObject->GetWidth(),
-                                      metaFileDataObject->GetHeight());
-        }
-#endif // wxUSE_METAFILE
+              wxMetafile metaFile = metaFileDataObject->GetMetafile();
+                    PicHandle pict = (PicHandle) metaFile.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_BITMAP:
+           case wxDF_DIB:
+           default:
+                break ;
+       }

 
 

-        default:
- //           return wxSetClipboardData(data);
-                               break ;

     }
     }

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

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

-    wxCloseClipboard();
+    m_open = false ;

 }
 
 }
 

-bool wxClipboard::IsSupported( const wxDataFormat &format )
+bool wxClipboard::IsSupported( const wxDataFormat &dataFormat )

 {
 {

-    return wxIsClipboardFormatAvailable(format);
-}
-
-bool wxClipboard::GetData( wxDataObject& data )
-{
-#if wxUSE_DATAOBJ
-    wxCHECK_MSG( wxIsClipboardOpened(), FALSE, wxT("clipboard not open") );
-
-    wxDataFormat format = data.GetPreferredFormat();
-    switch ( format )
+  if ( m_data )
+  {
+    return m_data->IsSupported( dataFormat ) ;
+  }
+#if TARGET_CARBON
+    OSStatus err = noErr;
+    ScrapRef scrapRef;
+    
+    err = GetCurrentScrap( &scrapRef );
+    if ( err != noTypeErr && err != memFullErr )    

     {
     {

-        case wxDF_TEXT:
-        case wxDF_OEMTEXT:
-        {
-            wxTextDataObject& textDataObject = (wxTextDataObject &)data;
-            char* s = (char*)wxGetClipboardData(format);
-            if ( !s )
-                return FALSE;
-
-            textDataObject.SetText(s);
-            delete [] s;
-
-            return TRUE;
-        }
-
-        case wxDF_BITMAP:
-        case wxDF_DIB:
+        ScrapFlavorFlags    flavorFlags;
+        Size                byteCount;
+        
+        if (( err = GetScrapFlavorFlags( scrapRef, dataFormat.GetFormatId(), &flavorFlags )) == noErr)

         {
         {

-            wxBitmapDataObject& bitmapDataObject = (wxBitmapDataObject &)data;
-            wxBitmap* bitmap = (wxBitmap *)wxGetClipboardData(format );
-            if ( !bitmap )
-                return FALSE;
-
-            bitmapDataObject.SetBitmap(*bitmap);
-            delete bitmap;
-
-            return TRUE;
-        }
-#if 0 // wxUSE_METAFILE
-        case wxDF_METAFILE:
-        {
-            wxMetafileDataObject& metaFileDataObject = (wxMetafileDataObject &)data;
-            wxMetafile* metaFile = (wxMetafile *)wxGetClipboardData(wxDF_METAFILE);
-            if ( !metaFile )
-                return FALSE;
-
-            metaFileDataObject.SetMetafile(*metaFile);
-            delete metaFile;
-
-            return TRUE;
+            if (( err = GetScrapFlavorSize( scrapRef, dataFormat.GetFormatId(), &byteCount )) == noErr)
+            {
+                return TRUE ;
+            }

         }
         }

-#endif // wxUSE_METAFILE

     }
     }

-#else // !wxUSE_DATAOBJ
-    wxFAIL_MSG( wxT("no clipboard implementation") );
-#endif

     return FALSE;
     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;
-  }
-}
-
-wxClipboardClient *wxClipboard::GetClipboardClient()
-{
-  return clipOwner;
+    
+#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

 }
 
 }
 

-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)
+bool wxClipboard::GetData( wxDataObject& data )

 {
 {

-  char *str;
-  long length;
+    wxCHECK_MSG( m_open, FALSE, wxT("clipboard not open") );

 
 

-  str = GetClipboardData("TEXT", &length, time);
-  if (!str) {
-    str = new char[1];
-    *str = 0;
-  }
+    int formatcount = data.GetFormatCount() + 1 ;
+    wxDataFormat *array = new wxDataFormat[ formatcount  ];
+    array[0] = data.GetPreferredFormat();
+    data.GetAllFormats( &array[1] );

 
 

-  return str;
-}
+    bool transferred = false ;

 
 

+    if ( m_data )
+    {
+      for (size_t i = 0; !transferred && i < formatcount ; i++)
+      {
+          wxDataFormat format = array[i] ;
+          if ( m_data->IsSupported( format ) ) 
+          {
+            int size = m_data->GetDataSize( format );
+            transferred = true ;
+
+            if (size == 0) 
+            {
+              data.SetData(format , 0 , 0 ) ;
+            }
+            else
+            {
+              char *d = new char[size];
+              m_data->GetDataHere( format , (void*) d );
+              data.SetData( format , size , d ) ;
+              delete[] d ;
+            }
+          }
+       }
+    }
+    /* get formats from wxDataObjects */
+    if ( !transferred ) 
+    {
+      for (size_t i = 0; !transferred && i < formatcount ; i++)
+      {
+          wxDataFormat format = array[i] ;
+
+          switch ( format.GetType() )
+          {
+              case wxDF_TEXT:
+              case wxDF_OEMTEXT:
+              {
+                  long len ;
+                  char* s = (char*)wxGetClipboardData(format, &len );
+                  if ( s )
+                  {
+                    data.SetData( format , len , s ) ;
+                    delete [] s;
+
+                    transferred = true ;
+                  }
+              }
+                                                       break ;
+
+              default :
+                break ;
+          }
+       }
+    }

 
 

-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;
-  }
+    delete[] array ;
+    return transferred ;

 }
 }

-*/
-