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

make access for virtuals match base

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@56795 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Paul Cornett
2008-11-16 18:20:21 +00:00
parent a09307abba
commit 470f357fd2
7 changed files with 38 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
include/wx/weakref.h
View File

@@ -59,6 +59,13 @@ public:
}
}
virtual void OnObjectDestroy()
{
// Tracked object itself removes us from list of trackers
wxASSERT(m_pobj != NULL);
m_pobj = NULL;
}
protected:
void Assign(T* pobj)
{
@@ -82,13 +89,6 @@ protected:
Assign( wr.m_pobj );
}
virtual void OnObjectDestroy()
{
// Tracked object itself removes us from list of trackers
wxASSERT( m_pobj!=NULL );
m_pobj = NULL;
}
T *m_pobj;
};
@@ -122,6 +122,14 @@ struct wxWeakRefImpl<T, false> : public wxTrackerNode
}
}
virtual void OnObjectDestroy()
{
// Tracked object itself removes us from list of trackers
wxASSERT(m_pobj != NULL);
m_pobj = NULL;
m_ptbase = NULL;
}
protected:
wxWeakRefImpl() : m_pobj(NULL), m_ptbase(NULL) { }
@@ -177,14 +185,6 @@ protected:
}
}
virtual void OnObjectDestroy()
{
// Tracked object itself removes us from list of trackers
wxASSERT( m_pobj!=NULL );
m_pobj = NULL;
m_ptbase = NULL;
}
T *m_pobj;
wxTrackable *m_ptbase;
};
@@ -293,6 +293,13 @@ public:
}
}
virtual void OnObjectDestroy()
{
wxASSERT_MSG(m_pobj, "tracked object should have removed us itself");
m_pobj = NULL;
}
protected:
void Assign(T *pobj)
{
@@ -320,13 +327,6 @@ protected:
}
}
virtual void OnObjectDestroy()
{
wxASSERT_MSG( m_pobj, "tracked object should have removed us itself" );
m_pobj = NULL;
}
T *m_pobj;
};