Replaced SOCKLEN_T by WX_SOCKLEN_T to resolve conflict with AIX system headers.

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

diff --git a/src/mac/carbon/dataobj.cpp b/src/mac/carbon/dataobj.cpp
index bec4f2bd605d14d75b1c96f681471ddaebefa93a..c810f7c4188de6175c3816c9d8466f41e3acee26 100644 (file)
--- a/src/mac/carbon/dataobj.cpp
+++ b/src/mac/carbon/dataobj.cpp
@@ -17,24 +17,29 @@
 // headers
 // ----------------------------------------------------------------------------
 
 // headers
 // ----------------------------------------------------------------------------
 

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

   #pragma implementation "dataobj.h"
 #endif
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
   #pragma implementation "dataobj.h"
 #endif
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 

+#if wxUSE_DATAOBJ
+

 #ifndef WX_PRECOMP
 #include "wx/intl.h"
 #endif
 #ifndef WX_PRECOMP
 #include "wx/intl.h"
 #endif

-#include "wx/defs.h"

 
 #include "wx/log.h"
 #include "wx/dataobj.h"
 
 #include "wx/log.h"
 #include "wx/dataobj.h"

+#include "wx/dcmemory.h"

 #include "wx/mstream.h"
 #include "wx/image.h"
 #include "wx/mstream.h"
 #include "wx/image.h"

+#include "wx/metafile.h"

 #include "wx/mac/private.h"
 #include "wx/mac/private.h"

+#ifndef __DARWIN__

 #include <Scrap.h>
 #include <Scrap.h>

+#endif

 
 // ----------------------------------------------------------------------------
 // functions
 
 // ----------------------------------------------------------------------------
 // functions


@@ -94,13 +99,10 @@ void wxDataFormat::SetType(  wxDataFormatId  Type )
 
 wxString wxDataFormat::GetId() const
 {
 
 wxString wxDataFormat::GetId() const
 {

-    // 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 ;
+    wxCHECK_MSG( !IsStandard(), wxEmptyString ,
+                 wxT("name of predefined format cannot be retrieved") );

 
 

-    return wxString::FromAscii( text ) ;
+    return m_id ;

 }
 
 void wxDataFormat::SetId(  NativeFormat  format )
 }
 
 void wxDataFormat::SetId(  NativeFormat  format )


@@ -116,13 +118,32 @@ void wxDataFormat::SetId(  NativeFormat  format )
     else if (m_format == kDragFlavorTypeHFS )
         m_type = wxDF_FILENAME;
     else
     else if (m_format == kDragFlavorTypeHFS )
         m_type = wxDF_FILENAME;
     else

+    {

         m_type = wxDF_PRIVATE;
         m_type = wxDF_PRIVATE;

+        char text[5] ;
+        strncpy( text , (char*) &format , 4 ) ;
+        text[4] = 0 ;
+        m_id = wxString::FromAscii( text ) ;
+    }

 }
 
 void wxDataFormat::SetId( const wxChar* zId )
 {
     m_type = wxDF_PRIVATE;
 }
 
 void wxDataFormat::SetId( const wxChar* zId )
 {
     m_type = wxDF_PRIVATE;

-    m_format = 0;// TODO: get the format gdk_atom_intern( wxMBSTRINGCAST tmp.mbc_str(), FALSE );
+    m_id = zId ;
+    m_format = 'WXPR' ;
+}
+
+bool wxDataFormat::operator==(const wxDataFormat& format) const 
+{
+    if ( IsStandard() || format.IsStandard() )
+    {
+        return ( format.m_type == m_type ) ;
+    }
+    else
+    {
+        return ( m_id == format.m_id ) ;
+    }

 }
 
 //-------------------------------------------------------------------------
 }
 
 //-------------------------------------------------------------------------


@@ -251,7 +272,8 @@ wxBitmapDataObject::wxBitmapDataObject(
     Init();
     if ( m_bitmap.Ok() )
     {
     Init();
     if ( m_bitmap.Ok() )
     {

-        m_pictHandle = m_bitmap.GetPict( &m_pictCreated ) ;
+        m_pictHandle = m_bitmap.GetBitmapData()->GetPictHandle() ;
+        m_pictCreated = false ;

     }
 }
 
     }
 }
 


@@ -268,7 +290,8 @@ void wxBitmapDataObject::SetBitmap(
     wxBitmapDataObjectBase::SetBitmap(rBitmap);
     if ( m_bitmap.Ok() )
     {
     wxBitmapDataObjectBase::SetBitmap(rBitmap);
     if ( m_bitmap.Ok() )
     {

-        m_pictHandle = m_bitmap.GetPict( &m_pictCreated ) ;
+        m_pictHandle = m_bitmap.GetBitmapData()->GetPictHandle() ;
+        m_pictCreated = false ;

     }
 }
 
     }
 }
 


@@ -314,11 +337,19 @@ bool wxBitmapDataObject::SetData(
     PicHandle picHandle = (PicHandle) NewHandle( nSize ) ;
     memcpy( *picHandle , pBuf , nSize ) ;
     m_pictHandle = picHandle ;
     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_pictCreated = false ;
     Rect frame = (**picHandle).picFrame ;
     

-    m_bitmap.SetPict( picHandle ) ;
-    m_bitmap.SetWidth( frame.right - frame.left ) ;
-    m_bitmap.SetHeight( frame.bottom - frame.top ) ;
+    wxMetafile mf ;
+    mf.SetHMETAFILE( (WXHMETAFILE) m_pictHandle ) ;
+    wxMemoryDC mdc ;
+    m_bitmap.Create( frame.right - frame.left ,frame.bottom - frame.top ) ;
+    mdc.SelectObject(m_bitmap ) ;
+    mf.Play( &mdc ) ;
+    mdc.SelectObject( wxNullBitmap ) ;
+    

     return m_bitmap.Ok();
 }
     return m_bitmap.Ok();
 }

+
+#endif
\ No newline at end of file