Hopefully fixed library names generated by wx-config for OS/2's PM port.

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

diff --git a/src/mac/carbon/clipbrd.cpp b/src/mac/carbon/clipbrd.cpp
index 7f9987f0f6093cb3871c562d9bfd7fd655d54a64..4267942472a93c7b554a03b4036936dbaaabef38 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"


@@ -45,13 +49,13 @@ 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_UNICODETEXT:
     case wxDF_TEXT:
         break;
     case wxDF_UNICODETEXT:


@@ -65,33 +69,33 @@ 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)
             {
                 Size allocSize = byteCount ;
         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 )

                     allocSize += 1 ;
                     allocSize += 1 ;

-                else if ( dataFormat.GetType() == wxDF_UNICODETEXT )  
+                else if ( dataFormat.GetType() == wxDF_UNICODETEXT )

                     allocSize += 2 ;
                     allocSize += 2 ;

-                
+

                 data = new char[ allocSize ] ;
                 data = new char[ allocSize ] ;

-                    
+

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

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

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

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

                         ((wxChar*)data)[byteCount/2] = 0 ;
                 }
                 else
                         ((wxChar*)data)[byteCount/2] = 0 ;
                 }
                 else


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

-    
+

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


@@ -113,17 +117,17 @@ void *wxGetClipboardData(wxDataFormat dataFormat, long *len)
     {
         byteCount = GetHandleSize( datahandle ) ;
         Size allocSize = byteCount ;
     {
         byteCount = GetHandleSize( datahandle ) ;
         Size allocSize = byteCount ;

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

             allocSize += 1 ;
             allocSize += 1 ;

-        else if ( dataFormat.GetType() == wxDF_UNICODETEXT )  
+        else if ( dataFormat.GetType() == wxDF_UNICODETEXT )

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

             ((wxChar*)data)[byteCount/2] = 0 ;
         *len = byteCount ;
     }
             ((wxChar*)data)[byteCount/2] = 0 ;
         *len = byteCount ;
     }


@@ -132,22 +136,13 @@ 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 )

     {
     {

-        wxString st = wxMacMakeStringFromCString( (char*) data ) ;
-#if wxUSE_UNICODE
-        wxCharBuffer buf = st.ToAscii() ;
-#else
-        const char* buf = st ;
-#endif
-        char* newdata = new char[strlen(buf)+1] ;
-        memcpy( newdata , buf , strlen(buf)+1 ) ;
-        delete[] ((char*) data ) ;
-        data = newdata ;
+        wxMacConvertNewlines10To13( (char*) data ) ;

     }
 
     return data;
     }
 
     return data;


@@ -219,7 +214,8 @@ bool wxClipboard::SetData( wxDataObject *data )
     wxCHECK_MSG( data, FALSE, wxT("data is invalid") );
 
     Clear();
     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 );
 }
 


@@ -244,64 +240,40 @@ 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;
-               wxString str(textDataObject->GetText());
-               wxCharBuffer buf = wxMacStringToCString( 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 )
+        {        
+            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;


@@ -311,7 +283,18 @@ 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 )


@@ -323,13 +306,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)


@@ -339,7 +322,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) ;


@@ -368,12 +351,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 ) ;
             }


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


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

+
+#endif