placeholder

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

diff --git a/src/mac/carbon/control.cpp b/src/mac/carbon/control.cpp
index ae57f23ab07e48b09f2b08a4ec810d27902d15a5..033c3bde05f2484bb200065133aeb910e809bf2d 100644 (file)
--- a/src/mac/carbon/control.cpp
+++ b/src/mac/carbon/control.cpp
@@ -196,6 +196,8 @@ wxControl::~wxControl()
     }
     if ( (ControlHandle) m_macControl )
     {
+        // in case the callback might be called during destruction
+        ::SetControlColorProc( (ControlHandle) m_macControl , NULL ) ;
         ::DisposeControl( (ControlHandle) m_macControl ) ;
         m_macControl = NULL ;
     }
@@ -433,7 +435,7 @@ void wxControl::MacAdjustControlRect()
         {
             if ( IsKindOf( CLASSINFO( wxButton ) ) )
             {
-                m_width = m_label.Length() * 10 + 12 ;
+                m_width = m_label.Length() * 8 + 12 ;
                 if ( m_width < 70 )
                   m_width = 70 ;
             }