X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e755eb67b62b608174a4efbb13bdd9fbebfa29a1..93ed8ff7707eec179cf99f2f2f3c36f27916b068:/include/wx/object.h diff --git a/include/wx/object.h b/include/wx/object.h index 43fa30553e..0b5978bf98 100644 --- a/include/wx/object.h +++ b/include/wx/object.h @@ -191,7 +191,7 @@ inline void wxClassInfo::CleanUpClasses() {} wxIMPLEMENT_CLASS_COMMON(name, basename, NULL, func) #define wxIMPLEMENT_CLASS_COMMON2(name, basename1, basename2, func) \ - wxIMPLEMENT_CLASS_COMMON(name, basename1, &basename2::ms_classInfo) + wxIMPLEMENT_CLASS_COMMON(name, basename1, &basename2::ms_classInfo, func) // ----------------------------------- // for concrete classes @@ -409,9 +409,9 @@ public: virtual ~wxObject() { UnRef(); } wxObject(const wxObject& other) - { - InitFrom(other); - } + { + InitFrom(other); + } wxObject& operator=(const wxObject& other) { @@ -468,6 +468,18 @@ public: // destroy a reference void UnRef(); + + // Reserved for future use + virtual void ReservedObjectFunc1() {} + virtual void ReservedObjectFunc2() {} + virtual void ReservedObjectFunc3() {} + virtual void ReservedObjectFunc4() {} + virtual void ReservedObjectFunc5() {} + virtual void ReservedObjectFunc6() {} + virtual void ReservedObjectFunc7() {} + virtual void ReservedObjectFunc8() {} + virtual void ReservedObjectFunc9() {} + protected: // ensure that our data is not shared with anybody else: if we have no // data, it is created using CreateRefData() below, if we have shared data