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

fix for incorrect assert in SetClientObject

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@12705 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin 2001-11-26 11:24:14 +00:00
parent 0ae0226b1d
commit da6069e29c
1 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/common/ctrlsub.cpp
View File

@ -61,12 +61,22 @@ void wxItemContainer::SetClientObject(int n, wxClientData *data)
wxASSERT_MSG( m_clientDataItemsType != wxClientData_Void,
wxT("can't have both object and void client data") );
wxClientData *clientDataOld = DoGetItemClientObject(n);
if ( clientDataOld )
delete clientDataOld;
// when we call SetClientObject() for the first time, m_clientDataItemsType
// is still wxClientData_None and so calling DoGetItemClientObject() would
// fail (in addition to being useless) - don't do it
if ( m_clientDataItemsType == wxClientData_Object )
{
wxClientData *clientDataOld = DoGetItemClientObject(n);
if ( clientDataOld )
delete clientDataOld;
}
else // m_clientDataItemsType == wxClientData_None
{
// now we have object client data
m_clientDataItemsType = wxClientData_Object;
}
DoSetItemClientObject(n, data);
m_clientDataItemsType = wxClientData_Object;
}
wxClientData *wxItemContainer::GetClientObject(int n) const