X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a8e9860d9fa86d3cf354b0b05739da379d3e9ae1..aacd14428971b5e199f88597f76a895c68dd298f:/src/mac/carbon/bmpbuttn.cpp?ds=sidebyside

diff --git a/src/mac/carbon/bmpbuttn.cpp b/src/mac/carbon/bmpbuttn.cpp
index 6f8bd14088..727df6679c 100644
--- a/src/mac/carbon/bmpbuttn.cpp
+++ b/src/mac/carbon/bmpbuttn.cpp
@@ -15,6 +15,8 @@
 
 #include "wx/wxprec.h"
 
+#if wxUSE_BMPBUTTON
+
 #include "wx/window.h"
 #include "wx/bmpbuttn.h"
 
@@ -65,22 +67,17 @@ bool wxBitmapButton::Create(wxWindow *parent, wxWindowID id, const wxBitmap& bit
     }
 
     m_bmpNormal = bitmap;
-    
-    wxBitmapRefData * bmap = NULL ;
-    
-    if ( m_bmpNormal.Ok() )
-        bmap = (wxBitmapRefData*) ( m_bmpNormal.GetRefData()) ;
-    
+        
     ControlButtonContentInfo info ;
     wxMacCreateBitmapButton( &info , m_bmpNormal ) ;
 
     Rect bounds = wxMacGetBoundsForControl( this , pos , size ) ;
-    m_peer = new wxMacControl() ;
+    m_peer = new wxMacControl( this ) ;
     verify_noerr ( CreateBevelButtonControl( MAC_WXHWND(parent->MacGetTopLevelWindowRef()) , &bounds , CFSTR("") , 
         (( style & wxBU_AUTODRAW ) ? kControlBevelButtonSmallBevel : kControlBevelButtonNormalBevel )  , 
         kControlBehaviorOffsetContents , &info , 0 , 0 , 0 , m_peer->GetControlRefAddr() ) );
     
-    
+    wxMacReleaseBitmapButton( &info ) ;
     wxASSERT_MSG( m_peer != NULL && m_peer->Ok() , wxT("No valid mac control") ) ;
     
     MacPostControlCreate(pos,size) ;
@@ -99,6 +96,7 @@ void wxBitmapButton::SetBitmapLabel(const wxBitmap& bitmap)
     {
         m_peer->SetData( kControlButtonPart , kControlBevelButtonContentTag , info ) ;
     }
+    wxMacReleaseBitmapButton( &info ) ;
 }
 
 
@@ -112,3 +110,5 @@ wxSize wxBitmapButton::DoGetBestSize() const
     }
     return best;
 }
+
+#endif