tentative fix for http://sourceforge.net/tracker/index.php?func=detail&aid=908712...

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26053 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/mac/carbon/control.cpp b/src/mac/carbon/control.cpp
index 49be26a16ccb9fd5cdc6e6332803eae751ad824a..a2ad5d4e163911281492fa5417b84bd2cca7b017 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( m_macControl , NULL ) ;
         ::DisposeControl( (ControlHandle) m_macControl ) ;
         m_macControl = NULL ;
     }

diff --git a/src/mac/control.cpp b/src/mac/control.cpp
index 49be26a16ccb9fd5cdc6e6332803eae751ad824a..a2ad5d4e163911281492fa5417b84bd2cca7b017 100644 (file)
--- a/src/mac/control.cpp
+++ b/src/mac/control.cpp
@@ -196,6 +196,8 @@ wxControl::~wxControl()
     }
     if ( (ControlHandle) m_macControl )
     {
+        // in case the callback might be called during destruction
+        ::SetControlColorProc( m_macControl , NULL ) ;
         ::DisposeControl( (ControlHandle) m_macControl ) ;
         m_macControl = NULL ;
     }