X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/12f5e1e78fe906050ff2fee9529476db332633f0..5267aefd85739afd26bd19bfba998005119db446:/interface/wx/object.h?ds=sidebyside diff --git a/interface/wx/object.h b/interface/wx/object.h index f0818ff3f6..55814598ef 100644 --- a/interface/wx/object.h +++ b/interface/wx/object.h @@ -125,7 +125,7 @@ protected: It's declared @c protected so that wxObjectRefData instances will never be destroyed directly but only as result of a DecRef() call. */ - ~wxObjectRefData(); + virtual ~wxObjectRefData(); public: /** @@ -200,7 +200,7 @@ public: Performs dereferencing, for those objects that use reference counting. */ - wxObject(); + virtual ~wxObject(); /** A virtual function that may be redefined by derived classes to allow dumping of @@ -225,7 +225,7 @@ public: This virtual function is redefined for every class that requires run-time type information, when using the ::DECLARE_CLASS macro (or similar). */ - wxClassInfo* GetClassInfo(); + virtual wxClassInfo* GetClassInfo() const; /** Returns the wxObject::m_refData pointer, i.e. the data referenced by this object. @@ -251,7 +251,7 @@ public: @return @true if the class represented by info is the same class as this one or is derived from it. */ - bool IsKindOf(wxClassInfo* info); + bool IsKindOf(const wxClassInfo* info) const; /** Returns @true if this object has the same data pointer as @a obj. @@ -263,7 +263,7 @@ public: @see @ref overview_refcount */ - bool IsSameAs(const wxObject& obj); + bool IsSameAs(const wxObject& obj) const; /** Makes this object refer to the data in @a clone. @@ -378,17 +378,17 @@ public: /** Returns the name of the first base class (@NULL if none). */ - wxChar* GetBaseClassName1() const; + const wxChar* GetBaseClassName1() const; /** Returns the name of the second base class (@NULL if none). */ - wxChar* GetBaseClassName2() const; + const wxChar* GetBaseClassName2() const; /** Returns the string form of the class name. */ - wxChar* GetClassName() const; + const wxChar* GetClassName() const; /** Returns the size of the class. @@ -409,7 +409,7 @@ public: /** Returns @true if this class is a kind of (inherits from) the given class. */ - bool IsKindOf(wxClassInfo* info); + bool IsKindOf(const wxClassInfo* info) const; };