Common code for the same handling of wxSL_INVERSE.

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

diff --git a/src/mac/carbon/dataobj.cpp b/src/mac/carbon/dataobj.cpp
index bec4f2bd605d14d75b1c96f681471ddaebefa93a..33e738e0b98df5a000c8b0ad641da0545b084991 100644 (file)
--- a/src/mac/carbon/dataobj.cpp
+++ b/src/mac/carbon/dataobj.cpp
@@ -17,7 +17,7 @@
 // headers
 // ----------------------------------------------------------------------------
 
 // headers
 // ----------------------------------------------------------------------------
 

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

   #pragma implementation "dataobj.h"
 #endif
 
   #pragma implementation "dataobj.h"
 #endif
 


@@ -27,12 +27,13 @@
 #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 <Scrap.h>
 
 #include "wx/mac/private.h"
 #include <Scrap.h>
 


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

-        m_pictHandle = m_bitmap.GetPict( &m_pictCreated ) ;
+        m_pictHandle = wxMacCreatePicHandle( rBitmap ) ;
+        m_pictCreated = true ;

     }
 }
 
     }
 }
 


@@ -268,7 +270,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 = wxMacCreatePicHandle( rBitmap ) ;
+        m_pictCreated = true ;

     }
 }
 
     }
 }
 


@@ -314,11 +317,17 @@ 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();
 }