implemented lazy binding detection (broken RTTI classinfo detection)
forbid copying of wxObject and wxClassInfo corrected conditional compilation for CodeWarrior 5.3 git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@15443 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
parent
e6a6feba84
commit
684242c6d8
@ -72,7 +72,16 @@ public:
|
||||
, m_baseInfo1(0)
|
||||
, m_baseInfo2(0)
|
||||
, m_next(sm_first)
|
||||
{ sm_first = this; }
|
||||
{
|
||||
#ifdef __WXDEBUG__
|
||||
if (sm_classTable != NULL) {
|
||||
wxString msg(_T("too late binding of class info (lazy binding) for "));
|
||||
msg += className;
|
||||
wxFAIL_MSG(msg);
|
||||
}
|
||||
#endif
|
||||
sm_first = this;
|
||||
}
|
||||
|
||||
wxObject *CreateObject() { return m_objectConstructor ? (*m_objectConstructor)() : 0; }
|
||||
|
||||
@ -132,6 +141,8 @@ public:
|
||||
private:
|
||||
// InitializeClasses() helper
|
||||
static wxClassInfo *GetBaseByName(const wxChar *name);
|
||||
|
||||
DECLARE_NO_COPY_CLASS(wxClassInfo)
|
||||
};
|
||||
|
||||
WXDLLEXPORT wxObject *wxCreateDynamicObject(const wxChar *name);
|
||||
@ -366,7 +377,7 @@ inline void wxCheckCast(void *ptr)
|
||||
#endif
|
||||
|
||||
// Only VC++ 6.0 and CodeWarrior compilers get overloaded delete that matches new
|
||||
#if ( defined(__VISUALC__) && (__VISUALC__ >= 1200) ) || defined(__MWERKS__)
|
||||
#if ( defined(__VISUALC__) && (__VISUALC__ >= 1200) ) || (defined(__MWERKS__) && (__MWERKS__ >= 0x2400))
|
||||
#define _WX_WANT_DELETE_VOID_WXCHAR_INT
|
||||
#endif
|
||||
|
||||
@ -399,12 +410,13 @@ inline void wxCheckCast(void *ptr)
|
||||
|
||||
class WXDLLEXPORT wxObject
|
||||
{
|
||||
DECLARE_ABSTRACT_CLASS(wxObject)
|
||||
DECLARE_ABSTRACT_CLASS(wxObject)
|
||||
DECLARE_NO_COPY_CLASS(wxObject)
|
||||
|
||||
public:
|
||||
wxObject() { m_refData = NULL; }
|
||||
virtual ~wxObject() { UnRef(); }
|
||||
|
||||
|
||||
bool IsKindOf(wxClassInfo *info) const;
|
||||
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user