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;
// ----------------------------------------------------------------------------
void Register();
void Unregister();
- DECLARE_NO_COPY_CLASS(wxClassInfo)
+ wxDECLARE_NO_COPY_CLASS(wxClassInfo);
};
WXDLLIMPEXP_BASE wxObject *wxCreateDynamicObject(const wxString& name);
&basename::ms_classInfo, \
baseclsinfo2, \
(int) sizeof(name), \
- (wxObjectConstructorFn) func); \
+ func); \
\
wxClassInfo *name::GetClassInfo() const \
{ return &name::ms_classInfo; }
#endif // wxUSE_NESTED_CLASSES
#define DECLARE_PLUGGABLE_CLASS(name) \
- DECLARE_DYNAMIC_CLASS(name) _DECLARE_DL_SENTINEL(name, WXDLLEXPORT)
+ DECLARE_DYNAMIC_CLASS(name) _DECLARE_DL_SENTINEL(name, WXDLLIMPEXP_CORE)
#define DECLARE_ABSTRACT_PLUGGABLE_CLASS(name) \
- DECLARE_ABSTRACT_CLASS(name) _DECLARE_DL_SENTINEL(name, WXDLLEXPORT)
+ DECLARE_ABSTRACT_CLASS(name) _DECLARE_DL_SENTINEL(name, WXDLLIMPEXP_CORE)
#define DECLARE_USER_EXPORTED_PLUGGABLE_CLASS(name, usergoo) \
DECLARE_DYNAMIC_CLASS(name) _DECLARE_DL_SENTINEL(name, usergoo)
// be replaced by it as long as there are any compilers not supporting it
#define wxDynamicCast(obj, className) \
((className *) wxCheckDynamicCast( \
- wx_const_cast(wxObject *, wx_static_cast(const wxObject *, \
- wx_const_cast(className *, wx_static_cast(const className *, obj)))), \
+ const_cast<wxObject *>(static_cast<const wxObject *>(\
+ const_cast<className *>(static_cast<const className *>(obj)))), \
&className::ms_classInfo))
// The 'this' pointer is always true, so use this version
#define wxDynamicCastThis(className) \
(IsKindOf(&className::ms_classInfo) ? (className *)(this) : (className *)0)
-#ifdef __WXDEBUG__
-inline void* wxCheckCast(void *ptr)
+// FIXME-VC6: dummy argument needed because VC6 doesn't support explicitly
+// choosing the template function to call
+template <class T>
+inline T *wxCheckCast(const void *ptr, T * = NULL)
{
- wxASSERT_MSG( ptr, _T("wxStaticCast() used incorrectly") );
- return ptr;
+ wxASSERT_MSG( wxDynamicCast(ptr, T), "wxStaticCast() used incorrectly" );
+ return const_cast<T *>(static_cast<const T *>(ptr));
}
-#define wxStaticCast(obj, className) \
- ((className *)wxCheckCast(wxDynamicCast(obj, className)))
-
-#else // !__WXDEBUG__
-#define wxStaticCast(obj, className) \
- wx_const_cast(className *, wx_static_cast(const className *, obj))
-#endif // __WXDEBUG__
+#define wxStaticCast(obj, className) wxCheckCast((obj), (className *)NULL)
// ----------------------------------------------------------------------------
// set up memory debugging macros
_WX_WANT_ARRAY_DELETE_VOID_WXCHAR_INT = void operator delete[] (void* buf, wxChar*, int )
*/
-#if defined(__WXDEBUG__) && wxUSE_MEMORY_TRACING
+#if wxUSE_MEMORY_TRACING
// All compilers get this one
#define _WX_WANT_NEW_SIZET_WXCHAR_INT
#endif // wxUSE_ARRAY_MEMORY_OPERATORS
-#endif // __WXDEBUG__ && wxUSE_MEMORY_TRACING
+#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
{
- friend class WXDLLIMPEXP_FWD_BASE wxObject;
-
public:
- wxObjectRefData() : m_count(1) { }
+ wxRefCounter() { m_count = 1; }
int GetRefCount() const { return m_count; }
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;
};
+// ----------------------------------------------------------------------------
+// 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
wxEXPLICIT wxObjectDataPtr(T *ptr = NULL) : m_ptr(ptr) {}
// copy ctor
- wxObjectDataPtr(const wxObjectDataPtr<T> &tocopy)
+ wxObjectDataPtr(const wxObjectDataPtr<T> &tocopy)
: m_ptr(tocopy.m_ptr)
- {
+ {
if (m_ptr)
- m_ptr->IncRef();
+ m_ptr->IncRef();
}
- ~wxObjectDataPtr()
- {
- if (m_ptr)
- m_ptr->DecRef();
+ ~wxObjectDataPtr()
+ {
+ if (m_ptr)
+ m_ptr->DecRef();
}
T *get() const { return m_ptr; }
-
+
+ // test for pointer validity: defining conversion to unspecified_bool_type
+ // and not more obvious bool to avoid implicit conversions to integer types
+ typedef T *(wxObjectDataPtr<T>::*unspecified_bool_type)() const;
+ operator unspecified_bool_type() const
+ {
+ return m_ptr ? &wxObjectDataPtr<T>::get : NULL;
+ }
+
+ T& operator*() const
+ {
+ wxASSERT(m_ptr != NULL);
+ return *(m_ptr);
+ }
+
T *operator->() const
- {
- wxASSERT(m_ptr != NULL);
- return get();
+ {
+ wxASSERT(m_ptr != NULL);
+ return get();
}
void reset(T *ptr)
}
wxObjectDataPtr& operator=(const wxObjectDataPtr &tocopy)
- {
- if (m_ptr)
- m_ptr->DecRef();
- m_ptr = tocopy.m_ptr;
+ {
if (m_ptr)
- m_ptr->IncRef();
+ m_ptr->DecRef();
+ m_ptr = tocopy.m_ptr;
+ if (m_ptr)
+ m_ptr->IncRef();
return *this;
}
wxObjectDataPtr& operator=(T *ptr)
- {
- if (m_ptr)
- m_ptr->DecRef();
- m_ptr = ptr;
+ {
+ if (m_ptr)
+ m_ptr->DecRef();
+ m_ptr = ptr;
return *this;
}
{
m_refData = other.m_refData;
if (m_refData)
- m_refData->m_count++;
+ m_refData->IncRef();
}
wxObject& operator=(const wxObject& other)
return *this;
}
- bool IsKindOf(wxClassInfo *info) const;
+ bool IsKindOf(const wxClassInfo *info) const;
// Turn on the correct set of new and delete operators
#ifdef _MSC_VER
return (wxClassInfo*) m_classInfo;
#else
- wxDynamicClassInfo *nonconst = wx_const_cast(wxDynamicClassInfo *, m_classInfo);
- return wx_static_cast(wxClassInfo *, nonconst);
+ wxDynamicClassInfo *nonconst = const_cast<wxDynamicClassInfo *>(m_classInfo);
+ return static_cast<wxClassInfo *>(nonconst);
#endif
}
// more debugging macros
// ----------------------------------------------------------------------------
-// Redefine new to be the debugging version. This doesn't work with all
-// compilers, in which case you need to use WXDEBUG_NEW explicitly if you wish
-// to use the debugging version.
-
-#ifdef __WXDEBUG__
+#if wxUSE_DEBUG_NEW_ALWAYS
#define WXDEBUG_NEW new(__TFILE__,__LINE__)
- #if wxUSE_DEBUG_NEW_ALWAYS
- #if wxUSE_GLOBAL_MEMORY_OPERATORS
- #define new WXDEBUG_NEW
- #elif defined(__VISUALC__)
- // Including this file redefines new and allows leak reports to
- // contain line numbers
- #include "wx/msw/msvcrt.h"
- #endif
- #endif // wxUSE_DEBUG_NEW_ALWAYS
-#else // !__WXDEBUG__
- #define WXDEBUG_NEW new
-#endif // __WXDEBUG__/!__WXDEBUG__
+ #if wxUSE_GLOBAL_MEMORY_OPERATORS
+ #define new WXDEBUG_NEW
+ #elif defined(__VISUALC__)
+ // Including this file redefines new and allows leak reports to
+ // contain line numbers
+ #include "wx/msw/msvcrt.h"
+ #endif
+#endif // wxUSE_DEBUG_NEW_ALWAYS
#endif // _WX_OBJECTH__
projects / wxWidgets.git / blobdiff