removed all occurences of (obsolete) wxUSE_DYNAMIC_CLASSES
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@31378 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
parent
6d1ce8685f
commit
aa1f2541b6
@ -1569,17 +1569,6 @@
|
|||||||
# endif
|
# endif
|
||||||
#endif /* wxUSE_LOG_DIALOG */
|
#endif /* wxUSE_LOG_DIALOG */
|
||||||
|
|
||||||
/* I wonder if we shouldn't just remove all occurrences of
|
|
||||||
wxUSE_DYNAMIC_CLASSES from the sources? */
|
|
||||||
#if !defined(wxUSE_DYNAMIC_CLASSES) || !wxUSE_DYNAMIC_CLASSES
|
|
||||||
# ifdef wxABORT_ON_CONFIG_ERROR
|
|
||||||
# error "wxUSE_DYNAMIC_CLASSES must be defined as 1"
|
|
||||||
# else
|
|
||||||
# undef wxUSE_DYNAMIC_CLASSES
|
|
||||||
# define wxUSE_DYNAMIC_CLASSES 1
|
|
||||||
# endif
|
|
||||||
#endif /* wxUSE_DYNAMIC_CLASSES */
|
|
||||||
|
|
||||||
#if wxUSE_CLIPBOARD && !wxUSE_DATAOBJ
|
#if wxUSE_CLIPBOARD && !wxUSE_DATAOBJ
|
||||||
# ifdef wxABORT_ON_CONFIG_ERROR
|
# ifdef wxABORT_ON_CONFIG_ERROR
|
||||||
# error "wxClipboard requires wxDataObject"
|
# error "wxClipboard requires wxDataObject"
|
||||||
|
@ -26,8 +26,6 @@
|
|||||||
|
|
||||||
class WXDLLIMPEXP_BASE wxObject;
|
class WXDLLIMPEXP_BASE wxObject;
|
||||||
|
|
||||||
#if wxUSE_DYNAMIC_CLASSES
|
|
||||||
|
|
||||||
#ifndef wxUSE_EXTENDED_RTTI
|
#ifndef wxUSE_EXTENDED_RTTI
|
||||||
#define wxUSE_EXTENDED_RTTI 0
|
#define wxUSE_EXTENDED_RTTI 0
|
||||||
#endif
|
#endif
|
||||||
@ -296,36 +294,6 @@ name##PluginSentinel m_pluginsentinel;
|
|||||||
|
|
||||||
#define CLASSINFO(name) (&name::ms_classInfo)
|
#define CLASSINFO(name) (&name::ms_classInfo)
|
||||||
|
|
||||||
#else // !wxUSE_DYNAMIC_CLASSES
|
|
||||||
|
|
||||||
// No dynamic class system: so stub out the macros
|
|
||||||
|
|
||||||
#define DECLARE_DYNAMIC_CLASS(name)
|
|
||||||
#define DECLARE_ABSTRACT_CLASS(name)
|
|
||||||
#define DECLARE_CLASS(name)
|
|
||||||
#define IMPLEMENT_DYNAMIC_CLASS(name, basename)
|
|
||||||
#define IMPLEMENT_DYNAMIC_CLASS2(name, basename1, basename2)
|
|
||||||
#define IMPLEMENT_ABSTRACT_CLASS(name, basename)
|
|
||||||
#define IMPLEMENT_ABSTRACT_CLASS2(name, basename1, basename2)
|
|
||||||
#define IMPLEMENT_CLASS IMPLEMENT_ABSTRACT_CLASS
|
|
||||||
#define IMPLEMENT_CLASS2 IMPLEMENT_ABSTRACT_CLASS2
|
|
||||||
|
|
||||||
#define DECLARE_PLUGGABLE_CLASS(name)
|
|
||||||
#define DECLARE_ABSTRACT_PLUGGABLE_CLASS(name)
|
|
||||||
#define IMPLEMENT_PLUGGABLE_CLASS(name, basename)
|
|
||||||
#define IMPLEMENT_PLUGGABLE_CLASS2(name, basename1, basename2)
|
|
||||||
#define IMPLEMENT_ABSTRACT_PLUGGABLE_CLASS(name, basename)
|
|
||||||
#define IMPLEMENT_ABSTRACT_PLUGGABLE_CLASS2(name, basename1, basename2)
|
|
||||||
|
|
||||||
#define DECLARE_USER_EXPORTED_PLUGGABLE_CLASS(name, usergoo)
|
|
||||||
#define DECLARE_USER_EXPORTED_ABSTRACT_PLUGGABLE_CLASS(name, usergoo)
|
|
||||||
#define IMPLEMENT_USER_EXPORTED_PLUGGABLE_CLASS(name, basename)
|
|
||||||
#define IMPLEMENT_USER_EXPORTED_PLUGGABLE_CLASS2(name, basename1, basename2)
|
|
||||||
#define IMPLEMENT_USER_EXPORTED_ABSTRACT_PLUGGABLE_CLASS(name, basename)
|
|
||||||
#define IMPLEMENT_USER_EXPORTED_ABSTRACT_PLUGGABLE_CLASS2(name, basename1, basename2)
|
|
||||||
|
|
||||||
#endif // wxUSE_DYNAMIC_CLASSES
|
|
||||||
|
|
||||||
#define wxIS_KIND_OF(obj, className) obj->IsKindOf(&className::ms_classInfo)
|
#define wxIS_KIND_OF(obj, className) obj->IsKindOf(&className::ms_classInfo)
|
||||||
|
|
||||||
// Just seems a bit nicer-looking (pretend it's not a macro)
|
// Just seems a bit nicer-looking (pretend it's not a macro)
|
||||||
|
Loading…
Reference in New Issue
Block a user