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

implemented lazy binding detection (broken RTTI classinfo detection)

Browse Source 
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:
Gilles Depeyrot
2002-05-08 21:17:17 +00:00
parent e6a6feba84
commit 684242c6d8
1 changed files with 16 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
include/wx/object.h
View File

@@ -72,7 +72,16 @@ public:
, m_baseInfo1(0) , m_baseInfo1(0)
, m_baseInfo2(0) , m_baseInfo2(0)
, m_next(sm_first) , 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; } wxObject *CreateObject() { return m_objectConstructor ? (*m_objectConstructor)() : 0; }
@@ -132,6 +141,8 @@ public:
private: private:
// InitializeClasses() helper // InitializeClasses() helper
static wxClassInfo *GetBaseByName(const wxChar *name); static wxClassInfo *GetBaseByName(const wxChar *name);
DECLARE_NO_COPY_CLASS(wxClassInfo)
}; };
WXDLLEXPORT wxObject *wxCreateDynamicObject(const wxChar *name); WXDLLEXPORT wxObject *wxCreateDynamicObject(const wxChar *name);
@@ -366,7 +377,7 @@ inline void wxCheckCast(void *ptr)
#endif #endif
// Only VC++ 6.0 and CodeWarrior compilers get overloaded delete that matches new // 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 #define _WX_WANT_DELETE_VOID_WXCHAR_INT
#endif #endif
@@ -399,7 +410,8 @@ inline void wxCheckCast(void *ptr)
class WXDLLEXPORT wxObject class WXDLLEXPORT wxObject
{ {
DECLARE_ABSTRACT_CLASS(wxObject) DECLARE_ABSTRACT_CLASS(wxObject)
DECLARE_NO_COPY_CLASS(wxObject)
public: public:
wxObject() { m_refData = NULL; } wxObject() { m_refData = NULL; }