Column position changes after each delete, so always delete the 0 column.

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

diff --git a/src/mac/carbon/bitmap.cpp b/src/mac/carbon/bitmap.cpp
index 4c0a49334f344e01c6cc66a4d5ae1ee789a8ab05..1b4dca41c70c3e3084b162a0a7912047806abaea 100644 (file)
--- a/src/mac/carbon/bitmap.cpp
+++ b/src/mac/carbon/bitmap.cpp
@@ -153,6 +153,28 @@ void wxBitmapRefData::Init()
     m_hasAlpha = false;
 }
 
     m_hasAlpha = false;
 }
 

+wxBitmapRefData::wxBitmapRefData(const wxBitmapRefData &tocopy)
+{
+    Init();
+    Create(tocopy.m_width, tocopy.m_height, tocopy.m_depth); 
+    
+    if (tocopy.m_bitmapMask)
+        m_bitmapMask = new wxMask(*tocopy.m_bitmapMask);
+
+    unsigned char* dest = (unsigned char*)GetRawAccess();
+    unsigned char* source = (unsigned char*)tocopy.GetRawAccess();
+    size_t numbytes = tocopy.m_width * tocopy.m_height * 4;
+    
+    for (size_t i=0; i<numbytes; i++)
+    {
+        *dest++ = *source++;
+    }
+    
+    UseAlpha(tocopy.m_hasAlpha);
+
+    // TODO:  Copy palette?
+}
+

 wxBitmapRefData::wxBitmapRefData()
 {
     Init() ;
 wxBitmapRefData::wxBitmapRefData()
 {
     Init() ;


@@ -883,6 +905,16 @@ wxBitmap::wxBitmap(const wxString& filename, wxBitmapType type)
     LoadFile(filename, type);
 }
 
     LoadFile(filename, type);
 }
 

+wxObjectRefData* wxBitmap::CreateRefData() const
+{
+    return new wxBitmapRefData;
+}
+
+wxObjectRefData* wxBitmap::CloneRefData(const wxObjectRefData* data) const
+{
+    return new wxBitmapRefData(*wx_static_cast(const wxBitmapRefData *, data));
+}
+

 void * wxBitmap::GetRawAccess() const
 {
     wxCHECK_MSG( Ok() , NULL , wxT("invalid bitmap") ) ;
 void * wxBitmap::GetRawAccess() const
 {
     wxCHECK_MSG( Ok() , NULL , wxT("invalid bitmap") ) ;


@@ -1341,6 +1373,26 @@ wxMask::wxMask()
     Init() ;
 }
 
     Init() ;
 }
 

+wxMask::wxMask(const wxMask &tocopy)
+{
+    Init();
+
+    m_bytesPerRow = tocopy.m_bytesPerRow;
+    m_width = tocopy.m_width;
+    m_height = tocopy.m_height;
+
+    size_t size = m_bytesPerRow * m_height;
+    unsigned char* dest = (unsigned char*)m_memBuf.GetWriteBuf( size );
+    unsigned char* source = (unsigned char*)tocopy.m_memBuf.GetData();
+    for (size_t i=0; i<size; i++)
+    {
+        *dest++ = *source++;
+    }
+
+    m_memBuf.UngetWriteBuf( size ) ;
+    RealizeNative() ;
+}
+

 // Construct a mask from a bitmap and a colour indicating
 // the transparent area
 wxMask::wxMask( const wxBitmap& bitmap, const wxColour& colour )
 // Construct a mask from a bitmap and a colour indicating
 // the transparent area
 wxMask::wxMask( const wxBitmap& bitmap, const wxColour& colour )