conversion corrections

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

diff --git a/src/mac/carbon/clipbrd.cpp b/src/mac/carbon/clipbrd.cpp
index 47a2b428f909abd55e8b862526c1b3b2858de434..91fc234410384e084ad26ce91b56f7f0d7008f5c 100644 (file)
--- a/src/mac/carbon/clipbrd.cpp
+++ b/src/mac/carbon/clipbrd.cpp
@@ -10,7 +10,6 @@
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__

-#pragma implementation

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


@@ -46,15 +45,17 @@ void *wxGetClipboardData(wxDataFormat dataFormat, long *len)
 #endif
     void * data = NULL ;
     Size byteCount;
 #endif
     void * data = NULL ;
     Size byteCount;

-    
+

     switch (dataFormat.GetType())
     {
     case wxDF_OEMTEXT:
         dataFormat = wxDF_TEXT;
         // fall through
     switch (dataFormat.GetType())
     {
     case wxDF_OEMTEXT:
         dataFormat = wxDF_TEXT;
         // fall through

-        
+

     case wxDF_TEXT:
         break;
     case wxDF_TEXT:
         break;

+    case wxDF_UNICODETEXT:
+        break;

     case wxDF_BITMAP :
     case wxDF_METAFILE :
         break ;
     case wxDF_BITMAP :
     case wxDF_METAFILE :
         break ;


@@ -64,28 +65,34 @@ void *wxGetClipboardData(wxDataFormat dataFormat, long *len)
             return NULL;
         }
     }
             return NULL;
         }
     }

-    
+

 #if TARGET_CARBON
     ScrapRef scrapRef;
 #if TARGET_CARBON
     ScrapRef scrapRef;

-    
+

     err = GetCurrentScrap( &scrapRef );
     err = GetCurrentScrap( &scrapRef );

-    if ( err != noTypeErr && err != memFullErr )    
+    if ( err != noTypeErr && err != memFullErr )

     {
         ScrapFlavorFlags    flavorFlags;
     {
         ScrapFlavorFlags    flavorFlags;

-        
+

         if (( err = GetScrapFlavorFlags( scrapRef, dataFormat.GetFormatId(), &flavorFlags )) == noErr)
         {
             if (( err = GetScrapFlavorSize( scrapRef, dataFormat.GetFormatId(), &byteCount )) == noErr)
             {
         if (( err = GetScrapFlavorFlags( scrapRef, dataFormat.GetFormatId(), &flavorFlags )) == noErr)
         {
             if (( err = GetScrapFlavorSize( scrapRef, dataFormat.GetFormatId(), &byteCount )) == noErr)
             {

+                Size allocSize = byteCount ;

                 if ( dataFormat.GetType() == wxDF_TEXT )
                 if ( dataFormat.GetType() == wxDF_TEXT )

-                    byteCount++ ;
-                
-                data = new char[ byteCount ] ;
+                    allocSize += 1 ;
+                else if ( dataFormat.GetType() == wxDF_UNICODETEXT )
+                    allocSize += 2 ;
+
+                data = new char[ allocSize ] ;
+

                 if (( err = GetScrapFlavorData( scrapRef, dataFormat.GetFormatId(), &byteCount , data )) == noErr )
                 {
                 if (( err = GetScrapFlavorData( scrapRef, dataFormat.GetFormatId(), &byteCount , data )) == noErr )
                 {

-                    *len = byteCount ;
-                    if ( dataFormat.GetType() == wxDF_TEXT )  
+                    *len = allocSize ;
+                    if ( dataFormat.GetType() == wxDF_TEXT )

                         ((char*)data)[byteCount] = 0 ;
                         ((char*)data)[byteCount] = 0 ;

+                    if ( dataFormat.GetType() == wxDF_UNICODETEXT )
+                        ((wxChar*)data)[byteCount/2] = 0 ;

                 }
                 else
                 {
                 }
                 else
                 {


@@ -95,7 +102,7 @@ void *wxGetClipboardData(wxDataFormat dataFormat, long *len)
             }
         }
     }
             }
         }
     }

-    
+

 #else
     long offset ;
     Handle datahandle = NewHandle(0) ;
 #else
     long offset ;
     Handle datahandle = NewHandle(0) ;


@@ -105,14 +112,19 @@ void *wxGetClipboardData(wxDataFormat dataFormat, long *len)
     if ( GetHandleSize( datahandle ) > 0 )
     {
         byteCount = GetHandleSize( datahandle ) ;
     if ( GetHandleSize( datahandle ) > 0 )
     {
         byteCount = GetHandleSize( datahandle ) ;

-        if ( dataFormat.GetType() == wxDF_TEXT )  
-            data = new char[ byteCount + 1] ;
-        else
-            data = new char[ byteCount ] ;
-        
+        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 ) ;
         memcpy( (char*) data , (char*) *datahandle , byteCount ) ;

-        if ( dataFormat.GetType() == wxDF_TEXT )  
+        if ( dataFormat.GetType() == wxDF_TEXT )

             ((char*)data)[byteCount] = 0 ;
             ((char*)data)[byteCount] = 0 ;

+        if ( dataFormat.GetType() == wxDF_UNICODETEXT )
+            ((wxChar*)data)[byteCount/2] = 0 ;

         *len = byteCount ;
     }
     DisposeHandle( datahandle ) ;
         *len = byteCount ;
     }
     DisposeHandle( datahandle ) ;


@@ -120,13 +132,15 @@ void *wxGetClipboardData(wxDataFormat dataFormat, long *len)
     if ( err )
     {
         wxLogSysError(_("Failed to get clipboard data."));
     if ( err )
     {
         wxLogSysError(_("Failed to get clipboard data."));

-        
+

         return NULL ;
     }
         return NULL ;
     }

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

     {
     {

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

     }
     }

+

     return data;
 }
 
     return data;
 }
 


@@ -191,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 );
 }
 


@@ -231,22 +241,21 @@ bool wxClipboard::AddData( wxDataObject *data )
        {
            case wxDF_TEXT:
            case wxDF_OEMTEXT:
        {
            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() ;
-                }
-                err = UMAPutScrap( mac.Length() , 'TEXT' , (void*) mac.c_str()  ) ;
+               err = UMAPutScrap( str.Length() * sizeof(wxChar) , kScrapFlavorTypeUnicode , (void*) str.wc_str()  ) ;

            }
            break ;
            }
            break ;

-
+#endif

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


@@ -255,7 +264,7 @@ bool wxClipboard::AddData( wxDataObject *data )
                   wxMetafile metaFile = metaFileDataObject->GetMetafile();
                 PicHandle pict = (PicHandle) metaFile.GetHMETAFILE() ;
                   HLock( (Handle) pict ) ;
                   wxMetafile metaFile = metaFileDataObject->GetMetafile();
                 PicHandle pict = (PicHandle) metaFile.GetHMETAFILE() ;
                   HLock( (Handle) pict ) ;

-                  err = UMAPutScrap( GetHandleSize(  (Handle) pict ) , 'PICT' , *pict ) ;
+                  err = UMAPutScrap( GetHandleSize(  (Handle) pict ) , kScrapFlavorTypePicture , *pict ) ;

                   HUnlock(  (Handle) pict ) ;
            }
            break ;
                   HUnlock(  (Handle) pict ) ;
            }
            break ;


@@ -265,12 +274,12 @@ bool wxClipboard::AddData( wxDataObject *data )
            {
                    bool created = false ;
                    PicHandle pict = NULL ;
            {
                    bool created = false ;
                    PicHandle pict = NULL ;

-                   
+

                    wxBitmapDataObject* bitmapDataObject = (wxBitmapDataObject*) data ;
                    pict = (PicHandle) bitmapDataObject->GetBitmap().GetPict( &created ) ;
 
                   HLock( (Handle) pict ) ;
                    wxBitmapDataObject* bitmapDataObject = (wxBitmapDataObject*) data ;
                    pict = (PicHandle) bitmapDataObject->GetBitmap().GetPict( &created ) ;
 
                   HLock( (Handle) pict ) ;

-                  err = UMAPutScrap( GetHandleSize(  (Handle) pict ) , 'PICT' , *pict ) ;
+                  err = UMAPutScrap( GetHandleSize(  (Handle) pict ) , kScrapFlavorTypePicture , *pict ) ;

                   HUnlock(  (Handle) pict ) ;
                   if ( created )
                       KillPicture( pict ) ;
                   HUnlock(  (Handle) pict ) ;
                   if ( created )
                       KillPicture( pict ) ;


@@ -300,13 +309,13 @@ bool wxClipboard::IsSupported( const wxDataFormat &dataFormat )
 #if TARGET_CARBON
     OSStatus err = noErr;
     ScrapRef scrapRef;
 #if TARGET_CARBON
     OSStatus err = noErr;
     ScrapRef scrapRef;

-    
+

     err = GetCurrentScrap( &scrapRef );
     err = GetCurrentScrap( &scrapRef );

-    if ( err != noTypeErr && err != memFullErr )    
+    if ( err != noTypeErr && err != memFullErr )

     {
         ScrapFlavorFlags    flavorFlags;
         Size                byteCount;
     {
         ScrapFlavorFlags    flavorFlags;
         Size                byteCount;

-        
+

         if (( err = GetScrapFlavorFlags( scrapRef, dataFormat.GetFormatId(), &flavorFlags )) == noErr)
         {
             if (( err = GetScrapFlavorSize( scrapRef, dataFormat.GetFormatId(), &byteCount )) == noErr)
         if (( err = GetScrapFlavorFlags( scrapRef, dataFormat.GetFormatId(), &flavorFlags )) == noErr)
         {
             if (( err = GetScrapFlavorSize( scrapRef, dataFormat.GetFormatId(), &byteCount )) == noErr)


@@ -316,7 +325,7 @@ bool wxClipboard::IsSupported( const wxDataFormat &dataFormat )
         }
     }
     return FALSE;
         }
     }
     return FALSE;

-    
+

 #else
     long offset ;
     Handle datahandle = NewHandle(0) ;
 #else
     long offset ;
     Handle datahandle = NewHandle(0) ;


@@ -345,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 ) ;
             }


@@ -365,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++)
       {