removed unneeded wxWeakRefDynamic::AssignCopy() (last part of patch 1870445)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@51234 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -59,7 +59,7 @@ protected:
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void AssignCopy( const wxWeakRefStatic& wr )
|
void AssignCopy(const wxWeakRefStatic& wr)
|
||||||
{
|
{
|
||||||
Assign( wr.m_pobj );
|
Assign( wr.m_pobj );
|
||||||
}
|
}
|
||||||
@@ -139,7 +139,7 @@ protected:
|
|||||||
|
|
||||||
void AssignCopy(const wxWeakRefImpl& wr)
|
void AssignCopy(const wxWeakRefImpl& wr)
|
||||||
{
|
{
|
||||||
DoAssign( wr.m_pobj, wr.m_ptbase );
|
DoAssign(wr.m_pobj, wr.m_ptbase);
|
||||||
}
|
}
|
||||||
|
|
||||||
void DoAssign( T* pobj, wxTrackable *ptbase ) {
|
void DoAssign( T* pobj, wxTrackable *ptbase ) {
|
||||||
@@ -220,7 +220,7 @@ public:
|
|||||||
|
|
||||||
// Weak ref implementation assign objects are queried for wxTrackable
|
// Weak ref implementation assign objects are queried for wxTrackable
|
||||||
// using dynamic_cast<>
|
// using dynamic_cast<>
|
||||||
template<class T>
|
template <class T>
|
||||||
class wxWeakRefDynamic : public wxTrackerNode
|
class wxWeakRefDynamic : public wxTrackerNode
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
@@ -293,11 +293,6 @@ protected:
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void AssignCopy(const wxWeakRefDynamic& wr)
|
|
||||||
{
|
|
||||||
Assign(wr.m_pobj);
|
|
||||||
}
|
|
||||||
|
|
||||||
virtual void OnObjectDestroy()
|
virtual void OnObjectDestroy()
|
||||||
{
|
{
|
||||||
wxASSERT_MSG( m_pobj, "tracked object should have removed us itself" );
|
wxASSERT_MSG( m_pobj, "tracked object should have removed us itself" );
|
||||||
|
Reference in New Issue
Block a user