adding a peer pointing back to wxWindow

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

diff --git a/src/mac/carbon/icon.cpp b/src/mac/carbon/icon.cpp
index 796a5c8cdebcc435012f12117f8f5066234322f9..2317c911e58f29dda7934f37e9b2aaec853ab780 100644 (file)
--- a/src/mac/carbon/icon.cpp
+++ b/src/mac/carbon/icon.cpp
@@ -83,6 +83,22 @@ int wxIcon::GetHeight() const
    return M_ICONDATA->GetHeight();
 }
 
+int wxIcon::GetDepth() const{
+       return 32; 
+}
+
+void wxIcon::SetDepth(int depth){
+       
+}
+
+void wxIcon::SetWidth(int width){
+       
+}
+
+void wxIcon::SetHeight(int height){
+       
+}
+
 bool wxIcon::Ok() const
 {
     return m_refData != NULL ;
@@ -176,7 +192,10 @@ void wxIcon::CopyFromBitmap(const wxBitmap& bmp)
 {
     UnRef() ;
     
-    m_refData = new wxIconRefData( (WXHICON) wxMacCreateIconRef( bmp ) ) ;
+    // as the bitmap owns that ref, we have to acquire it as well
+    IconRef iconRef = bmp.GetBitmapData()->GetIconRef() ;
+    AcquireIconRef( iconRef ) ;
+    m_refData = new wxIconRefData( (WXHICON) iconRef ) ;
     M_ICONDATA->SetWidth( bmp.GetWidth() ) ;
     M_ICONDATA->SetHeight( bmp.GetHeight() ) ;
 }