AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Rename wxObjectDataRef wxRefCounter, use it in wxVariant

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@61034 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robert Roebling 2009-06-12 20:16:07 +00:00
parent f76c075805
commit 6d37c1b773
2 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
include/wx/object.h
View File

@ -69,7 +69,6 @@ class WXDLLIMPEXP_FWD_BASE wxClassInfo;
class WXDLLIMPEXP_FWD_BASE wxHashTable;
class WXDLLIMPEXP_FWD_BASE wxObject;
class WXDLLIMPEXP_FWD_BASE wxPluginLibrary;
class WXDLLIMPEXP_FWD_BASE wxObjectRefData;
class WXDLLIMPEXP_FWD_BASE wxHashTable_Node;
// ----------------------------------------------------------------------------
@ -399,13 +398,13 @@ inline T *wxCheckCast(const void *ptr, T * = NULL)
#endif // wxUSE_MEMORY_TRACING
// ----------------------------------------------------------------------------
// wxObjectRefData: ref counted data meant to be stored in wxObject
// wxRefCounter: ref counted data "manager"
// ----------------------------------------------------------------------------
class WXDLLIMPEXP_BASE wxObjectRefData
class WXDLLIMPEXP_BASE wxRefCounter
{
public:
wxObjectRefData() { m_count = 1; }
wxRefCounter() { m_count = 1; }
int GetRefCount() const { return m_count; }
@ -415,15 +414,20 @@ public:
protected:
// this object should never be destroyed directly but only as a
// result of a DecRef() call:
virtual ~wxObjectRefData() { }
virtual ~wxRefCounter() { }
private:
// our refcount:
int m_count;
friend class WXDLLIMPEXP_FWD_BASE wxObject;
};
// ----------------------------------------------------------------------------
// wxObjectRefData: ref counted data meant to be stored in wxObject
// ----------------------------------------------------------------------------
typedef wxRefCounter wxObjectRefData;
// ----------------------------------------------------------------------------
// wxObjectDataPtr: helper class to avoid memleaks because of missing calls
// to wxObjectRefData::DecRef
@ -518,7 +522,7 @@ public:
{
m_refData = other.m_refData;
if (m_refData)
m_refData->m_count++;
m_refData->IncRef();
}
wxObject& operator=(const wxObject& other)

2
include/wx/variant.h
View File

@ -55,7 +55,7 @@
* overloading wxVariant with unnecessary functionality.
*/
class WXDLLIMPEXP_BASE wxVariantData : public wxObjectRefData
class WXDLLIMPEXP_BASE wxVariantData : public wxRefCounter
{
friend class wxVariant;
public: