replaced annoying wxLogDebug()s with wxLogTrace()

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

diff --git a/src/mac/carbon/clipbrd.cpp b/src/mac/carbon/clipbrd.cpp
index 91fc234410384e084ad26ce91b56f7f0d7008f5c..801a140774ec2ee4564572b6d5e7b89b16808235 100644 (file)
--- a/src/mac/carbon/clipbrd.cpp
+++ b/src/mac/carbon/clipbrd.cpp
@@ -9,10 +9,14 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

 #pragma implementation "clipbrd.h"
 #endif
 
 #pragma implementation "clipbrd.h"
 #endif
 

+#include "wx/wxprec.h"
+
+#if wxUSE_CLIPBOARD
+

 #include "wx/app.h"
 #include "wx/frame.h"
 #include "wx/bitmap.h"
 #include "wx/app.h"
 #include "wx/frame.h"
 #include "wx/bitmap.h"


@@ -92,7 +96,12 @@ void *wxGetClipboardData(wxDataFormat dataFormat, long *len)
                     if ( dataFormat.GetType() == wxDF_TEXT )
                         ((char*)data)[byteCount] = 0 ;
                     if ( dataFormat.GetType() == wxDF_UNICODETEXT )
                     if ( dataFormat.GetType() == wxDF_TEXT )
                         ((char*)data)[byteCount] = 0 ;
                     if ( dataFormat.GetType() == wxDF_UNICODETEXT )

-                        ((wxChar*)data)[byteCount/2] = 0 ;
+                    {
+                        // "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
                 {
                 }
                 else
                 {


@@ -188,12 +197,12 @@ void wxClipboard::Clear()
 
 bool wxClipboard::Flush()
 {
 
 bool wxClipboard::Flush()
 {

-    return FALSE;
+    return false;

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

-    wxCHECK_MSG( !m_open, FALSE, wxT("clipboard already open") );
+    wxCHECK_MSG( !m_open, false, wxT("clipboard already open") );

     m_open = true ;
     return true ;
 }
     m_open = true ;
     return true ;
 }


@@ -205,6 +214,11 @@ bool wxClipboard::IsOpened() const
 
 bool wxClipboard::SetData( wxDataObject *data )
 {
 
 bool wxClipboard::SetData( wxDataObject *data )
 {

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

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


@@ -212,9 +226,9 @@ bool wxClipboard::SetData( wxDataObject *data )
 
 bool wxClipboard::AddData( wxDataObject *data )
 {
 
 bool wxClipboard::AddData( wxDataObject *data )
 {

-    wxCHECK_MSG( m_open, FALSE, wxT("clipboard not open") );
+    wxCHECK_MSG( m_open, false, wxT("clipboard not open") );

 
 

-    wxCHECK_MSG( data, FALSE, wxT("data is invalid") );
+    wxCHECK_MSG( data, false, wxT("data is invalid") );

 
     /* we can only store one wxDataObject */
     Clear();
 
     /* we can only store one wxDataObject */
     Clear();


@@ -231,63 +245,42 @@ bool wxClipboard::AddData( wxDataObject *data )
                     wxT("wxClipboard now supports atom %s"),
                     array[i].GetId().c_str() );
 
                     wxT("wxClipboard now supports atom %s"),
                     array[i].GetId().c_str() );
 

-#if !TARGET_CARBON
-        OSErr err = noErr ;
-#else
-        OSStatus err = noErr ;
-#endif
-
-       switch ( array[i].GetType() )
-       {
-           case wxDF_TEXT:
-           case wxDF_OEMTEXT:
-           {
-               wxTextDataObject* textDataObject = (wxTextDataObject*) data;
-               wxCharBuffer buf = textDataObject->GetText().mb_str() ;
-               err = UMAPutScrap( strlen(buf) , kScrapFlavorTypeText , (void*) buf.data()  ) ;
-           }
-           break ;
-#if wxUSE_UNICODE
-           case wxDF_UNICODETEXT :
-           {
-               wxTextDataObject* textDataObject = (wxTextDataObject*) data;
-               wxString str(textDataObject->GetText());
-               err = UMAPutScrap( str.Length() * sizeof(wxChar) , kScrapFlavorTypeUnicode , (void*) str.wc_str()  ) ;
-           }
-           break ;
-#endif
-#if wxUSE_DRAG_AND_DROP
-        case wxDF_METAFILE:
-           {
-                wxMetafileDataObject* metaFileDataObject =
-                (wxMetafileDataObject*) data;
-                  wxMetafile metaFile = metaFileDataObject->GetMetafile();
-                PicHandle pict = (PicHandle) metaFile.GetHMETAFILE() ;
-                  HLock( (Handle) pict ) ;
-                  err = UMAPutScrap( GetHandleSize(  (Handle) pict ) , kScrapFlavorTypePicture , *pict ) ;
-                  HUnlock(  (Handle) pict ) ;
-           }
-           break ;
-#endif
-           case wxDF_BITMAP:
-           case wxDF_DIB:
-           {
-                   bool created = false ;
-                   PicHandle pict = NULL ;
-
-                   wxBitmapDataObject* bitmapDataObject = (wxBitmapDataObject*) data ;
-                   pict = (PicHandle) bitmapDataObject->GetBitmap().GetPict( &created ) ;
-
-                  HLock( (Handle) pict ) ;
-                  err = UMAPutScrap( GetHandleSize(  (Handle) pict ) , kScrapFlavorTypePicture , *pict ) ;
-                  HUnlock(  (Handle) pict ) ;
-                  if ( created )
-                      KillPicture( pict ) ;
-           }
-           default:
-                break ;
-       }
-
+        size_t sz = data->GetDataSize( array[i] ) ;
+        void* buf = malloc( sz + 1 ) ;
+        if ( buf )
+        {
+            // 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 ;
+    #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:
+                    break ;
+            }
+            UMAPutScrap( sz , mactype , buf ) ;
+            free( buf ) ;
+        }

     }
 
     delete[] array;
     }
 
     delete[] array;


@@ -297,15 +290,26 @@ bool wxClipboard::AddData( wxDataObject *data )
 
 void wxClipboard::Close()
 {
 
 void wxClipboard::Close()
 {

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

     m_open = false ;
     m_open = false ;

+
+    // Get rid of cached object.  If this is not done copying from another application will
+    // only work once
+    if (m_data)
+    {
+        delete m_data;
+        m_data = (wxDataObject*) NULL;
+    }
+

 }
 
 bool wxClipboard::IsSupported( const wxDataFormat &dataFormat )
 {
 }
 
 bool wxClipboard::IsSupported( const wxDataFormat &dataFormat )
 {

-  if ( m_data )
-  {
-    return m_data->IsSupported( dataFormat ) ;
-  }
+    if ( m_data )
+    {
+        return m_data->IsSupported( dataFormat ) ;
+    }

 #if TARGET_CARBON
     OSStatus err = noErr;
     ScrapRef scrapRef;
 #if TARGET_CARBON
     OSStatus err = noErr;
     ScrapRef scrapRef;


@@ -320,11 +324,11 @@ bool wxClipboard::IsSupported( const wxDataFormat &dataFormat )
         {
             if (( err = GetScrapFlavorSize( scrapRef, dataFormat.GetFormatId(), &byteCount )) == noErr)
             {
         {
             if (( err = GetScrapFlavorSize( scrapRef, dataFormat.GetFormatId(), &byteCount )) == noErr)
             {

-                return TRUE ;
+                return true ;

             }
         }
     }
             }
         }
     }

-    return FALSE;
+    return false;

 
 #else
     long offset ;
 
 #else
     long offset ;


@@ -340,7 +344,7 @@ bool wxClipboard::IsSupported( const wxDataFormat &dataFormat )
 
 bool wxClipboard::GetData( wxDataObject& data )
 {
 
 bool wxClipboard::GetData( wxDataObject& data )
 {

-    wxCHECK_MSG( m_open, FALSE, wxT("clipboard not open") );
+    wxCHECK_MSG( m_open, false, wxT("clipboard not open") );

 
     size_t formatcount = data.GetFormatCount() + 1 ;
     wxDataFormat *array = new wxDataFormat[ formatcount  ];
 
     size_t formatcount = data.GetFormatCount() + 1 ;
     wxDataFormat *array = new wxDataFormat[ formatcount  ];


@@ -383,6 +387,7 @@ bool wxClipboard::GetData( wxDataObject& data )
           switch ( format.GetType() )
           {
               case wxDF_TEXT :
           switch ( format.GetType() )
           {
               case wxDF_TEXT :

+              case wxDF_UNICODETEXT:

               case wxDF_OEMTEXT :
               case wxDF_BITMAP :
               case wxDF_METAFILE :
               case wxDF_OEMTEXT :
               case wxDF_BITMAP :
               case wxDF_METAFILE :


@@ -408,3 +413,5 @@ bool wxClipboard::GetData( wxDataObject& data )
     delete[] array ;
     return transferred ;
 }
     delete[] array ;
     return transferred ;
 }

+
+#endif