safe destruction, even if redraws might be triggered

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

diff --git a/src/mac/carbon/listbox.cpp b/src/mac/carbon/listbox.cpp
index b4dae1a156f3116585f4694a41328e8f97e7e137..8322a7a2f2e98643b062e46273b914445aa40f4c 100644 (file)
--- a/src/mac/carbon/listbox.cpp
+++ b/src/mac/carbon/listbox.cpp
@@ -72,16 +72,19 @@ static pascal void wxMacListDefinition( short message, Boolean isSelected, Rect
                                      Cell cell, short dataOffset, short dataLength,
                                      ListHandle listHandle )
 {
                                      Cell cell, short dataOffset, short dataLength,
                                      ListHandle listHandle )
 {

+    wxListBox*          list;
+    list = (wxListBox*) GetControlReference( (ControlHandle) GetListRefCon(listHandle) );
+    if ( list == NULL )
+        return ;
+    

     GrafPtr savePort;
     GrafPtr grafPtr;
     RgnHandle savedClipRegion;
     SInt32 savedPenMode;
     GrafPtr savePort;
     GrafPtr grafPtr;
     RgnHandle savedClipRegion;
     SInt32 savedPenMode;

-    wxListBox*          list;

     GetPort(&savePort);
     SetPort((**listHandle).port);
     grafPtr = (**listHandle).port ;
     // typecast our refCon
     GetPort(&savePort);
     SetPort((**listHandle).port);
     grafPtr = (**listHandle).port ;
     // typecast our refCon

-    list = (wxListBox*) GetControlReference( (ControlHandle) GetListRefCon(listHandle) );

     
     //  Calculate the cell rect.
     
     
     //  Calculate the cell rect.
     


@@ -313,6 +316,8 @@ bool wxListBox::Create(wxWindow *parent, wxWindowID id,
 wxListBox::~wxListBox()
 {
     FreeData() ;
 wxListBox::~wxListBox()
 {
     FreeData() ;

+    // avoid access during destruction
+    SetControlReference( (ControlHandle) m_macControl , NULL ) ;

     if ( m_macList )
     {
 #if !TARGET_CARBON
     if ( m_macList )
     {
 #if !TARGET_CARBON

diff --git a/src/mac/listbox.cpp b/src/mac/listbox.cpp
index b4dae1a156f3116585f4694a41328e8f97e7e137..8322a7a2f2e98643b062e46273b914445aa40f4c 100644 (file)
--- a/src/mac/listbox.cpp
+++ b/src/mac/listbox.cpp
@@ -72,16 +72,19 @@ static pascal void wxMacListDefinition( short message, Boolean isSelected, Rect
                                      Cell cell, short dataOffset, short dataLength,
                                      ListHandle listHandle )
 {
                                      Cell cell, short dataOffset, short dataLength,
                                      ListHandle listHandle )
 {

+    wxListBox*          list;
+    list = (wxListBox*) GetControlReference( (ControlHandle) GetListRefCon(listHandle) );
+    if ( list == NULL )
+        return ;
+    

     GrafPtr savePort;
     GrafPtr grafPtr;
     RgnHandle savedClipRegion;
     SInt32 savedPenMode;
     GrafPtr savePort;
     GrafPtr grafPtr;
     RgnHandle savedClipRegion;
     SInt32 savedPenMode;

-    wxListBox*          list;

     GetPort(&savePort);
     SetPort((**listHandle).port);
     grafPtr = (**listHandle).port ;
     // typecast our refCon
     GetPort(&savePort);
     SetPort((**listHandle).port);
     grafPtr = (**listHandle).port ;
     // typecast our refCon

-    list = (wxListBox*) GetControlReference( (ControlHandle) GetListRefCon(listHandle) );

     
     //  Calculate the cell rect.
     
     
     //  Calculate the cell rect.
     


@@ -313,6 +316,8 @@ bool wxListBox::Create(wxWindow *parent, wxWindowID id,
 wxListBox::~wxListBox()
 {
     FreeData() ;
 wxListBox::~wxListBox()
 {
     FreeData() ;

+    // avoid access during destruction
+    SetControlReference( (ControlHandle) m_macControl , NULL ) ;

     if ( m_macList )
     {
 #if !TARGET_CARBON
     if ( m_macList )
     {
 #if !TARGET_CARBON