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

no changes, just wrap long lines

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@42753 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2006-10-30 19:30:53 +00:00
parent 55ccdb93e4
commit 4e124582c4
1 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
include/wx/object.h
View File

@@ -64,7 +64,8 @@ public:
~wxClassInfo(); ~wxClassInfo();
wxObject *CreateObject() const { return m_objectConstructor ? (*m_objectConstructor)() : 0; } wxObject *CreateObject() const
{ return m_objectConstructor ? (*m_objectConstructor)() : 0; }
bool IsDynamic() const { return (NULL != m_objectConstructor); } bool IsDynamic() const { return (NULL != m_objectConstructor); }
const wxChar *GetClassName() const { return m_className; } const wxChar *GetClassName() const { return m_className; }
@@ -76,7 +77,8 @@ public:
const wxClassInfo *GetBaseClass2() const { return m_baseInfo2; } const wxClassInfo *GetBaseClass2() const { return m_baseInfo2; }
int GetSize() const { return m_objectSize; } int GetSize() const { return m_objectSize; }
wxObjectConstructorFn GetConstructor() const { return m_objectConstructor; } wxObjectConstructorFn GetConstructor() const
{ return m_objectConstructor; }
static const wxClassInfo *GetFirst() { return sm_first; } static const wxClassInfo *GetFirst() { return sm_first; }
const wxClassInfo *GetNext() const { return m_next; } const wxClassInfo *GetNext() const { return m_next; }
static wxClassInfo *FindClass(const wxChar *className); static wxClassInfo *FindClass(const wxChar *className);
@@ -352,8 +354,9 @@ inline void* wxCheckCast(void *ptr)
#define _WX_WANT_DELETE_VOID_CONSTCHAR_SIZET #define _WX_WANT_DELETE_VOID_CONSTCHAR_SIZET
#endif #endif
// Only VC++ 6.0 and CodeWarrior compilers get overloaded delete that matches new // Only VC++ 6 and CodeWarrior get overloaded delete that matches new
#if ( defined(__VISUALC__) && (__VISUALC__ >= 1200) ) || (defined(__MWERKS__) && (__MWERKS__ >= 0x2400)) #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
@@ -473,7 +476,8 @@ public:
// Make sure this object has only one reference // Make sure this object has only one reference
void UnShare() { AllocExclusive(); } void UnShare() { AllocExclusive(); }
// Do a shallow comparison of our referenced data with the given object's refdata // Do a shallow comparison of our referenced data with the given object's
// refdata
bool IsRefTo(const wxObject *p) const { return m_refData == p->m_refData; } bool IsRefTo(const wxObject *p) const { return m_refData == p->m_refData; }
protected: protected:
@@ -482,8 +486,8 @@ protected:
// it is copied using CloneRefData(), otherwise nothing is done // it is copied using CloneRefData(), otherwise nothing is done
void AllocExclusive(); void AllocExclusive();
// both methods must be implemented if AllocExclusive() is used, not pure virtual // both methods must be implemented if AllocExclusive() is used, not pure
// only because of the backwards compatibility reasons // virtual only because of the backwards compatibility reasons
// create a new m_refData // create a new m_refData
virtual wxObjectRefData *CreateRefData() const; virtual wxObjectRefData *CreateRefData() const;