Adding GetPartialTextExtents implementation.

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

diff --git a/src/mac/carbon/bmpbuttn.cpp b/src/mac/carbon/bmpbuttn.cpp
index 2e9f9c66757e08fd05d35b5ccb8e8d8b42d4b749..84fb35b64ff542115e4f442731e010a4fc8a0a74 100644 (file)
--- a/src/mac/carbon/bmpbuttn.cpp
+++ b/src/mac/carbon/bmpbuttn.cpp
@@ -9,10 +9,14 @@
 // Licence:       wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:       wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

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

 #pragma implementation "bmpbuttn.h"
 #endif
 
 #pragma implementation "bmpbuttn.h"
 #endif
 

+#include "wx/wxprec.h"
+
+#if wxUSE_BMPBUTTON
+

 #include "wx/window.h"
 #include "wx/bmpbuttn.h"
 
 #include "wx/window.h"
 #include "wx/bmpbuttn.h"
 


@@ -63,12 +67,7 @@ bool wxBitmapButton::Create(wxWindow *parent, wxWindowID id, const wxBitmap& bit
     }
 
     m_bmpNormal = bitmap;
     }
 
     m_bmpNormal = bitmap;

-    
-    wxBitmapRefData * bmap = NULL ;
-    
-    if ( m_bmpNormal.Ok() )
-        bmap = (wxBitmapRefData*) ( m_bmpNormal.GetRefData()) ;
-    
+        

     ControlButtonContentInfo info ;
     wxMacCreateBitmapButton( &info , m_bmpNormal ) ;
 
     ControlButtonContentInfo info ;
     wxMacCreateBitmapButton( &info , m_bmpNormal ) ;
 


@@ -78,7 +77,7 @@ bool wxBitmapButton::Create(wxWindow *parent, wxWindowID id, const wxBitmap& bit
         (( style & wxBU_AUTODRAW ) ? kControlBevelButtonSmallBevel : kControlBevelButtonNormalBevel )  , 
         kControlBehaviorOffsetContents , &info , 0 , 0 , 0 , m_peer->GetControlRefAddr() ) );
     
         (( 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) ;
     wxASSERT_MSG( m_peer != NULL && m_peer->Ok() , wxT("No valid mac control") ) ;
     
     MacPostControlCreate(pos,size) ;


@@ -97,6 +96,7 @@ void wxBitmapButton::SetBitmapLabel(const wxBitmap& bitmap)
     {
         m_peer->SetData( kControlButtonPart , kControlBevelButtonContentTag , info ) ;
     }
     {
         m_peer->SetData( kControlButtonPart , kControlBevelButtonContentTag , info ) ;
     }

+    wxMacReleaseBitmapButton( &info ) ;

 }
 
 
 }
 
 


@@ -110,3 +110,5 @@ wxSize wxBitmapButton::DoGetBestSize() const
     }
     return best;
 }
     }
     return best;
 }

+
+#endif