X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e40298d54ecd5b109222a7c60aa2ef084a304d69..a2d3a3d1d38ef64050ddcd9b2754c855167aad1f:/src/mac/carbon/dataobj.cpp

diff --git a/src/mac/carbon/dataobj.cpp b/src/mac/carbon/dataobj.cpp
index 15377f7f5b..234f49899a 100644
--- a/src/mac/carbon/dataobj.cpp
+++ b/src/mac/carbon/dataobj.cpp
@@ -1,12 +1,12 @@
 ///////////////////////////////////////////////////////////////////////////////
-// Name:        os2/dataobj.cpp
-// Purpose:     implementation of wx[I]DataObject class
-// Author:      David Webster
+// Name:        mac/dataobj.cpp
+// Purpose:     implementation of wxDataObject class
+// Author:      Stefan Csomor
 // Modified by:
 // Created:     10/21/99
 // RCS-ID:      $Id$
-// Copyright:   (c) 1999 David Webster
-// Licence:     wxWindows license
+// Copyright:   (c) 1999 Stefan Csomor
+// Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
@@ -17,7 +17,7 @@
 // headers
 // ----------------------------------------------------------------------------
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
   #pragma implementation "dataobj.h"
 #endif
 
@@ -27,13 +27,13 @@
 #ifndef WX_PRECOMP
 #include "wx/intl.h"
 #endif
-#include "wx/defs.h"
 
 #include "wx/log.h"
 #include "wx/dataobj.h"
 #include "wx/mstream.h"
 #include "wx/image.h"
 #include "wx/mac/private.h"
+#include <Scrap.h>
 
 // ----------------------------------------------------------------------------
 // functions
@@ -73,40 +73,46 @@ void wxDataFormat::SetType(  wxDataFormatId  Type )
 {
     m_type = Type;
 
-    if (m_type == wxDF_TEXT)
-        m_format = 'TEXT';
+    if (m_type == wxDF_TEXT )
+        m_format = kScrapFlavorTypeText;
+    else if (m_type == wxDF_UNICODETEXT )
+        m_format = kScrapFlavorTypeUnicode ;
     else if (m_type == wxDF_BITMAP || m_type == wxDF_METAFILE )
-        m_format = 'PICT';
+        m_format = kScrapFlavorTypePicture;
     else if (m_type == wxDF_FILENAME)
         m_format = kDragFlavorTypeHFS ;
     else
     {
        wxFAIL_MSG( wxT("invalid dataformat") );
-    }
-}
 
-wxDataFormatId wxDataFormat::GetType() const
-{
-    return m_type;
+       // this is '????' but it can't be used in the code because ??' is
+       // parsed as a trigraph!
+       m_format = 0x3f3f3f3f;
+    }
 }
 
 wxString wxDataFormat::GetId() const
 {
-    wxString sRet("");  // TODO: to name of ( m_format ) );
-    return sRet;
+    // note that m_format is not a pointer to string, it *is* itself a 4
+    // character string
+    char text[5] ;
+    strncpy( text , (char*) &m_format , 4 ) ;
+    text[4] = 0 ;
+
+    return wxString::FromAscii( text ) ;
 }
 
 void wxDataFormat::SetId(  NativeFormat  format )
 {
     m_format = format;
 
-    if (m_format == 'TEXT')
+    if (m_format == kScrapFlavorTypeText)
         m_type = wxDF_TEXT;
-    else
-    if (m_format == 'PICT')
+    else if (m_format == kScrapFlavorTypeUnicode )
+        m_type = wxDF_UNICODETEXT;
+    else if (m_format == kScrapFlavorTypePicture)
         m_type = wxDF_BITMAP;
-    else
-    if (m_format == kDragFlavorTypeHFS )
+    else if (m_format == kDragFlavorTypeHFS )
         m_type = wxDF_FILENAME;
     else
         m_type = wxDF_PRIVATE;
@@ -114,8 +120,6 @@ void wxDataFormat::SetId(  NativeFormat  format )
 
 void wxDataFormat::SetId( const wxChar* zId )
 {
-    wxString                        tmp(zId);
-
     m_type = wxDF_PRIVATE;
     m_format = 0;// TODO: get the format gdk_atom_intern( wxMBSTRINGCAST tmp.mbc_str(), FALSE );
 }
@@ -161,6 +165,19 @@ bool wxDataObject::IsSupportedFormat(
     }
 }
 
+// ----------------------------------------------------------------------------
+// wxTextDataObject
+// ----------------------------------------------------------------------------
+
+#if wxUSE_UNICODE
+void wxTextDataObject::GetAllFormats(wxDataFormat *formats, wxDataObjectBase::Direction dir) const
+{
+    *formats++ = wxDataFormat( wxDF_TEXT );
+    *formats = wxDataFormat( wxDF_UNICODETEXT );
+}
+
+#endif
+
 // ----------------------------------------------------------------------------
 // wxFileDataObject
 // ----------------------------------------------------------------------------
@@ -201,9 +218,10 @@ bool wxFileDataObject::SetData(
 {
     m_filenames.Empty();
 
-    wxString sFile( (const char *)pBuf);  /* char, not wxChar */
-
-    AddFile(sFile);
+    // only add if this is not an empty string
+    // we can therefore clear the list by just setting an empty string
+    if ( (*(char*)pBuf) != 0 )
+        AddFile(wxString::FromAscii((char*)pBuf));
 
     return TRUE;
 }
@@ -232,7 +250,9 @@ wxBitmapDataObject::wxBitmapDataObject(
     Init();
     if ( m_bitmap.Ok() )
     {
-        m_pictHandle = m_bitmap.GetPict( &m_pictCreated ) ;
+    /*
+        m_pictHandle = m_bitmap.GetBitmapData()->GetPict( &m_pictCreated ) ;
+    */
     }
 }
 
@@ -249,7 +269,9 @@ void wxBitmapDataObject::SetBitmap(
     wxBitmapDataObjectBase::SetBitmap(rBitmap);
     if ( m_bitmap.Ok() )
     {
-        m_pictHandle = m_bitmap.GetPict( &m_pictCreated ) ;
+    /*
+        m_pictHandle = m_bitmap.GetBitmapData()->GetPict( &m_pictCreated ) ;
+    */
     }
 }
 
@@ -295,11 +317,13 @@ bool wxBitmapDataObject::SetData(
     PicHandle picHandle = (PicHandle) NewHandle( nSize ) ;
     memcpy( *picHandle , pBuf , nSize ) ;
     m_pictHandle = picHandle ;
+    // ownership is transferred to the bitmap
     m_pictCreated = false ;
     Rect frame = (**picHandle).picFrame ;
-    
-    m_bitmap.SetPict( picHandle ) ;
+    /*
+    m_bitmap.GetBitmapData()->SetPict( (WXHMETAFILE) picHandle ) ;
     m_bitmap.SetWidth( frame.right - frame.left ) ;
     m_bitmap.SetHeight( frame.bottom - frame.top ) ;
+    */
     return m_bitmap.Ok();
 }