Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

safe destruction, even if redraws might be triggered

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26056 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Csomor
2004-03-03 10:47:57 +00:00
parent b2247ee93b
commit 21956470c7
2 changed files with 14 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/mac/carbon/listbox.cpp
View File

@@ -72,16 +72,19 @@ static pascal void wxMacListDefinition( short message, Boolean isSelected, Rect
Cell cell, short dataOffset, short dataLength, Cell cell, short dataOffset, short dataLength,
ListHandle listHandle ) ListHandle listHandle )
{ {
wxListBox* list;
list = (wxListBox*) GetControlReference( (ControlHandle) GetListRefCon(listHandle) );
if ( list == NULL )
return ;
GrafPtr savePort; GrafPtr savePort;
GrafPtr grafPtr; GrafPtr grafPtr;
RgnHandle savedClipRegion; RgnHandle savedClipRegion;
SInt32 savedPenMode; SInt32 savedPenMode;
wxListBox* list;
GetPort(&savePort); GetPort(&savePort);
SetPort((**listHandle).port); SetPort((**listHandle).port);
grafPtr = (**listHandle).port ; grafPtr = (**listHandle).port ;
// typecast our refCon // 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() wxListBox::~wxListBox()
{ {
FreeData() ; FreeData() ;
// avoid access during destruction
SetControlReference( (ControlHandle) m_macControl , NULL ) ;
if ( m_macList ) if ( m_macList )
{ {
#if !TARGET_CARBON #if !TARGET_CARBON

9
src/mac/listbox.cpp
View File

@@ -72,16 +72,19 @@ static pascal void wxMacListDefinition( short message, Boolean isSelected, Rect
Cell cell, short dataOffset, short dataLength, Cell cell, short dataOffset, short dataLength,
ListHandle listHandle ) ListHandle listHandle )
{ {
wxListBox* list;
list = (wxListBox*) GetControlReference( (ControlHandle) GetListRefCon(listHandle) );
if ( list == NULL )
return ;
GrafPtr savePort; GrafPtr savePort;
GrafPtr grafPtr; GrafPtr grafPtr;
RgnHandle savedClipRegion; RgnHandle savedClipRegion;
SInt32 savedPenMode; SInt32 savedPenMode;
wxListBox* list;
GetPort(&savePort); GetPort(&savePort);
SetPort((**listHandle).port); SetPort((**listHandle).port);
grafPtr = (**listHandle).port ; grafPtr = (**listHandle).port ;
// typecast our refCon // 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() wxListBox::~wxListBox()
{ {
FreeData() ; FreeData() ;
// avoid access during destruction
SetControlReference( (ControlHandle) m_macControl , NULL ) ;
if ( m_macList ) if ( m_macList )
{ {
#if !TARGET_CARBON #if !TARGET_CARBON