From: Vadim Zeitlin Date: Tue, 7 Jun 2011 13:06:17 +0000 (+0000) Subject: Make wxDECLARE_CLASS synonym of wxDECLARE_ABSTRACT_CLASS. X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/ffc13495b2d4911b1c7ad686b2be1ad4a9bce388?ds=sidebyside Make wxDECLARE_CLASS synonym of wxDECLARE_ABSTRACT_CLASS. Previously wxDECLARE_CLASS was a synonym for wxDECLARE_DYNAMIC_CLASS which was inconsistent with its documentation and wxIMPLEMENT_CLASS that was the same as wxIMPLEMENT_ABSTRACT_CLASS. Resolve this in the most backwards compatible and also arguably logical way. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67879 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- diff --git a/include/wx/rtti.h b/include/wx/rtti.h index 565667879c..fcd463e869 100644 --- a/include/wx/rtti.h +++ b/include/wx/rtti.h @@ -144,7 +144,7 @@ WXDLLIMPEXP_BASE wxObject *wxCreateDynamicObject(const wxString& name); static wxObject* wxCreateObject() #define wxDECLARE_CLASS(name) \ - wxDECLARE_DYNAMIC_CLASS(name) + wxDECLARE_ABSTRACT_CLASS(name) // common part of the macros below diff --git a/interface/wx/object.h b/interface/wx/object.h index 90435866f2..dbe8a5bfba 100644 --- a/interface/wx/object.h +++ b/interface/wx/object.h @@ -708,7 +708,9 @@ public: /** Used inside a class declaration to declare that the class should be made known to the class hierarchy, but objects of this class cannot be created - dynamically. The same as wxDECLARE_DYNAMIC_CLASS(). + dynamically. + + The same as wxDECLARE_ABSTRACT_CLASS(). @header{wx/object.h} */