conversion corrections

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

diff --git a/src/mac/carbon/clipbrd.cpp b/src/mac/carbon/clipbrd.cpp
index 8e3cd7767860f1dab040867738c5980df709b09b..91fc234410384e084ad26ce91b56f7f0d7008f5c 100644 (file)
--- a/src/mac/carbon/clipbrd.cpp
+++ b/src/mac/carbon/clipbrd.cpp
@@ -1,16 +1,15 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        clipbrd.cpp
 // Purpose:     Clipboard functionality
 /////////////////////////////////////////////////////////////////////////////
 // Name:        clipbrd.cpp
 // Purpose:     Clipboard functionality

-// Author:      AUTHOR
+// Author:      Stefan Csomor

 // 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__
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__

-#pragma implementation

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


@@ -21,8 +20,12 @@
 #include "wx/metafile.h"
 #include "wx/clipbrd.h"
 #include "wx/intl.h"
 #include "wx/metafile.h"
 #include "wx/clipbrd.h"
 #include "wx/intl.h"

+#include "wx/log.h"

 
 

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

 
 #define wxUSE_DATAOBJ 1
 
 
 #define wxUSE_DATAOBJ 1
 


@@ -36,79 +39,95 @@ static const wxChar *TRACE_CLIPBOARD = _T("clipboard");
 void *wxGetClipboardData(wxDataFormat dataFormat, long *len)
 {
 #if !TARGET_CARBON
 void *wxGetClipboardData(wxDataFormat dataFormat, long *len)
 {
 #if !TARGET_CARBON

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

 #else
 #else

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

 #endif
 #endif

-  void * data = NULL ;
-       
+    void * data = NULL ;
+    Size byteCount;
+

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

-        case wxDF_OEMTEXT:
-            dataFormat = wxDF_TEXT;
-            // fall through
+    case wxDF_OEMTEXT:
+        dataFormat = wxDF_TEXT;
+        // fall through
+
+    case wxDF_TEXT:
+        break;
+    case wxDF_UNICODETEXT:
+        break;
+    case wxDF_BITMAP :
+    case wxDF_METAFILE :
+        break ;
+    default:
+        {
+            wxLogError(_("Unsupported clipboard format."));
+            return NULL;
+        }
+    }
+
+#if TARGET_CARBON
+    ScrapRef scrapRef;
+
+    err = GetCurrentScrap( &scrapRef );
+    if ( err != noTypeErr && err != memFullErr )
+    {
+        ScrapFlavorFlags    flavorFlags;

 
 

-        case wxDF_TEXT:
-                break;
-        default:
+        if (( err = GetScrapFlavorFlags( scrapRef, dataFormat.GetFormatId(), &flavorFlags )) == noErr)
+        {
+            if (( err = GetScrapFlavorSize( scrapRef, dataFormat.GetFormatId(), &byteCount )) == noErr)

             {
             {

-                wxLogError(_("Unsupported clipboard format."));
-                return NULL;
+                Size allocSize = byteCount ;
+                if ( dataFormat.GetType() == wxDF_TEXT )
+                    allocSize += 1 ;
+                else if ( dataFormat.GetType() == wxDF_UNICODETEXT )
+                    allocSize += 2 ;
+
+                data = new char[ allocSize ] ;
+
+                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 )
+                        ((wxChar*)data)[byteCount/2] = 0 ;
+                }
+                else
+                {
+                    delete[] ((char *)data) ;
+                    data = 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[] ((char *)data) ;
-            data = NULL ;
-          }
-                       }
-               }
-       }
-       

 #else
 #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 ) ;
+    long offset ;
+    Handle datahandle = NewHandle(0) ;
+    HLock( datahandle ) ;
+    GetScrap( datahandle , dataFormat.GetFormatId() , &offset ) ;
+    HUnlock( datahandle ) ;
+    if ( GetHandleSize( datahandle ) > 0 )
+    {
+        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 ;
+        if ( dataFormat.GetType() == wxDF_UNICODETEXT )
+            ((wxChar*)data)[byteCount/2] = 0 ;
+        *len = byteCount ;
+    }
+    DisposeHandle( datahandle ) ;

 #endif
     if ( err )
     {
 #endif
     if ( err )
     {


@@ -116,10 +135,12 @@ void *wxGetClipboardData(wxDataFormat dataFormat, long *len)
 
         return NULL ;
     }
 
         return NULL ;
     }

-    if ( dataFormat.GetType() == wxDF_TEXT && wxApp::s_macDefaultEncodingIsPC )
+
+    if ( dataFormat.GetType() == wxDF_TEXT )

     {
     {

-      wxMacConvertToPC((char*)data) ;
+        wxMacConvertNewlines10To13( (char*) data ) ;

     }
     }

+

     return data;
 }
 
     return data;
 }
 


@@ -128,12 +149,12 @@ 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_open = false ;
-  m_data = NULL ;
+    m_open = false ;
+    m_data = NULL ;

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


@@ -153,16 +174,16 @@ void wxClipboard::Clear()
         m_data = (wxDataObject*) NULL;
     }
 #if TARGET_CARBON
         m_data = (wxDataObject*) NULL;
     }
 #if TARGET_CARBON

-       OSStatus err ;
-       err = ClearCurrentScrap( );
+    OSStatus err ;
+    err = ClearCurrentScrap( );

 #else
 #else

-       OSErr err ;
-       err = ZeroScrap( );
+    OSErr err ;
+    err = ZeroScrap( );

 #endif
 #endif

-       if ( err )
-       {
+    if ( err )
+    {

         wxLogSysError(_("Failed to empty the clipboard."));
         wxLogSysError(_("Failed to empty the clipboard."));

-       }
+    }

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


@@ -184,12 +205,8 @@ 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 );
 }
 
     return AddData( data );
 }
 


@@ -199,8 +216,6 @@ bool wxClipboard::AddData( wxDataObject *data )
 
     wxCHECK_MSG( data, FALSE, wxT("data is invalid") );
 
 
     wxCHECK_MSG( data, FALSE, wxT("data is invalid") );
 

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

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


@@ -217,64 +232,60 @@ bool wxClipboard::AddData( wxDataObject *data )
                     array[i].GetId().c_str() );
 
 #if !TARGET_CARBON
                     array[i].GetId().c_str() );
 
 #if !TARGET_CARBON

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

 #else
 #else

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

 #endif
 
        switch ( array[i].GetType() )
        {
            case wxDF_TEXT:
            case wxDF_OEMTEXT:
 #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());
            {
                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
+               err = UMAPutScrap( str.Length() * sizeof(wxChar) , kScrapFlavorTypeUnicode , (void*) str.wc_str()  ) ;

            }
            }

-
+           break ;
+#endif

 #if wxUSE_DRAG_AND_DROP
         case wxDF_METAFILE:
            {
 #if wxUSE_DRAG_AND_DROP
         case wxDF_METAFILE:
            {

-              wxMetafileDataObject* metaFileDataObject =
+                wxMetafileDataObject* metaFileDataObject =

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

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

-                       break ;
+                break ;

        }
 
     }
        }
 
     }


@@ -296,34 +307,34 @@ bool wxClipboard::IsSupported( const wxDataFormat &dataFormat )
     return m_data->IsSupported( dataFormat ) ;
   }
 #if TARGET_CARBON
     return m_data->IsSupported( 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;
-       
+    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
 #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 ;
+    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
 }
 
 #endif
 }
 


@@ -331,7 +342,7 @@ bool wxClipboard::GetData( wxDataObject& data )
 {
     wxCHECK_MSG( m_open, FALSE, wxT("clipboard not open") );
 
 {
     wxCHECK_MSG( m_open, FALSE, wxT("clipboard not open") );
 

-    int formatcount = data.GetFormatCount() + 1 ;
+    size_t formatcount = data.GetFormatCount() + 1 ;

     wxDataFormat *array = new wxDataFormat[ formatcount  ];
     array[0] = data.GetPreferredFormat();
     data.GetAllFormats( &array[1] );
     wxDataFormat *array = new wxDataFormat[ formatcount  ];
     array[0] = data.GetPreferredFormat();
     data.GetAllFormats( &array[1] );


@@ -343,12 +354,12 @@ bool wxClipboard::GetData( wxDataObject& data )
       for (size_t i = 0; !transferred && i < formatcount ; i++)
       {
           wxDataFormat format = array[i] ;
       for (size_t i = 0; !transferred && i < formatcount ; i++)
       {
           wxDataFormat format = array[i] ;

-          if ( m_data->IsSupported( format ) ) 
+          if ( m_data->IsSupported( format ) )

           {
             int size = m_data->GetDataSize( format );
             transferred = true ;
 
           {
             int size = m_data->GetDataSize( format );
             transferred = true ;
 

-            if (size == 0) 
+            if (size == 0)

             {
               data.SetData(format , 0 , 0 ) ;
             }
             {
               data.SetData(format , 0 , 0 ) ;
             }


@@ -363,7 +374,7 @@ bool wxClipboard::GetData( wxDataObject& data )
        }
     }
     /* get formats from wxDataObjects */
        }
     }
     /* get formats from wxDataObjects */

-    if ( !transferred ) 
+    if ( !transferred )

     {
       for (size_t i = 0; !transferred && i < formatcount ; i++)
       {
     {
       for (size_t i = 0; !transferred && i < formatcount ; i++)
       {


@@ -371,8 +382,10 @@ bool wxClipboard::GetData( wxDataObject& data )
 
           switch ( format.GetType() )
           {
 
           switch ( format.GetType() )
           {

-              case wxDF_TEXT:
-              case wxDF_OEMTEXT:
+              case wxDF_TEXT :
+              case wxDF_OEMTEXT :
+              case wxDF_BITMAP :
+              case wxDF_METAFILE :

               {
                   long len ;
                   char* s = (char*)wxGetClipboardData(format, &len );
               {
                   long len ;
                   char* s = (char*)wxGetClipboardData(format, &len );


@@ -384,6 +397,8 @@ bool wxClipboard::GetData( wxDataObject& data )
                     transferred = true ;
                   }
               }
                     transferred = true ;
                   }
               }

+                            break ;
+

               default :
                 break ;
           }
               default :
                 break ;
           }