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

two changes and some cleanup:

Browse Source 
1. DECLARE_ABSTRACT_CLASS() shouldn't declare wxCreateObject() (which is not
   defined by IMPLEMENT_ABSTRACT_CLASS())
2. don't make GetClassInfo() declaration inside DECLARE_CLASS inline in an
   attempt to fix linking problems with HP-UX compiler


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@31775 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2005-02-06 01:52:19 +00:00
parent 543ad8984b
commit 14ca93a0d9
2 changed files with 48 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

81
include/wx/object.h
View File

@@ -156,48 +156,59 @@ inline void wxClassInfo::CleanUpClasses() {}
// Dynamic class macros // Dynamic class macros
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
#define DECLARE_DYNAMIC_CLASS(name) \ #define DECLARE_ABSTRACT_CLASS(name) \
public: \ public: \
static wxClassInfo ms_classInfo; \ static wxClassInfo ms_classInfo; \
static wxObject* wxCreateObject(); \ virtual wxClassInfo *GetClassInfo() const;
virtual wxClassInfo *GetClassInfo() const \
{ return &name::ms_classInfo; }
#define DECLARE_DYNAMIC_CLASS_NO_ASSIGN(name) \ #define DECLARE_DYNAMIC_CLASS_NO_ASSIGN(name) \
DECLARE_NO_ASSIGN_CLASS(name) \ DECLARE_NO_ASSIGN_CLASS(name) \
DECLARE_DYNAMIC_CLASS(name) DECLARE_DYNAMIC_CLASS(name)
#define DECLARE_DYNAMIC_CLASS_NO_COPY(name) \ #define DECLARE_DYNAMIC_CLASS_NO_COPY(name) \
DECLARE_NO_COPY_CLASS(name) \ DECLARE_NO_COPY_CLASS(name) \
DECLARE_DYNAMIC_CLASS(name) DECLARE_DYNAMIC_CLASS(name)
#define DECLARE_ABSTRACT_CLASS(name) DECLARE_DYNAMIC_CLASS(name) #define DECLARE_DYNAMIC_CLASS(name) \
DECLARE_ABSTRACT_CLASS(name) \
static wxObject* wxCreateObject();
#define DECLARE_CLASS(name) DECLARE_DYNAMIC_CLASS(name) #define DECLARE_CLASS(name) DECLARE_DYNAMIC_CLASS(name)
// common part of the macros below
#define wxIMPLEMENT_CLASS_COMMON(name, basename, baseclsinfo2, func) \
wxClassInfo name::ms_classInfo(wxT(#name), \
&basename::ms_classInfo, \
baseclsinfo2, \
(int) sizeof(name), \
(wxObjectConstructorFn) func); \
\
wxClassInfo *name::GetClassInfo() const \
{ return &name::ms_classInfo; }
#define wxIMPLEMENT_CLASS_COMMON1(name, basename, func) \
wxIMPLEMENT_CLASS_COMMON(name, basename, NULL, func)
#define wxIMPLEMENT_CLASS_COMMON2(name, basename1, basename2, func) \
wxIMPLEMENT_CLASS_COMMON(name, basename1, &basename2::ms_classInfo)
// ----------------------------------- // -----------------------------------
// for concrete classes // for concrete classes
// ----------------------------------- // -----------------------------------
// Single inheritance with one base class // Single inheritance with one base class
#define IMPLEMENT_DYNAMIC_CLASS(name, basename) \
#define IMPLEMENT_DYNAMIC_CLASS(name, basename) \ wxIMPLEMENT_CLASS_COMMON1(name, basename, name::wxCreateObject) \
wxObject* name::wxCreateObject() \ wxObject* name::wxCreateObject() \
{ return new name; } \ { return new name; }
wxClassInfo name::ms_classInfo(wxT(#name), \
&basename::ms_classInfo, NULL, \
(int) sizeof(name), \
(wxObjectConstructorFn) name::wxCreateObject);
// Multiple inheritance with two base classes // Multiple inheritance with two base classes
#define IMPLEMENT_DYNAMIC_CLASS2(name, basename1, basename2) \
#define IMPLEMENT_DYNAMIC_CLASS2(name, basename1, basename2) \ wxIMPLEMENT_CLASS_COMMON2(name, basename1, basename2, \
wxObject* name::wxCreateObject() \ name::wxCreateObject) \
{ return new name; } \ wxObject* name::wxCreateObject() \
wxClassInfo name::ms_classInfo(wxT(#name), \ { return new name; }
&basename1::ms_classInfo, \
&basename2::ms_classInfo, \
(int) sizeof(name), \
(wxObjectConstructorFn) name::wxCreateObject);
// ----------------------------------- // -----------------------------------
// for abstract classes // for abstract classes
@@ -205,19 +216,13 @@ inline void wxClassInfo::CleanUpClasses() {}
// Single inheritance with one base class // Single inheritance with one base class
#define IMPLEMENT_ABSTRACT_CLASS(name, basename) \ #define IMPLEMENT_ABSTRACT_CLASS(name, basename) \
wxClassInfo name::ms_classInfo(wxT(#name), \ wxIMPLEMENT_CLASS_COMMON1(name, basename, NULL)
&basename::ms_classInfo, NULL, \
(int) sizeof(name), (wxObjectConstructorFn) 0);
// Multiple inheritance with two base classes // Multiple inheritance with two base classes
#define IMPLEMENT_ABSTRACT_CLASS2(name, basename1, basename2) \ #define IMPLEMENT_ABSTRACT_CLASS2(name, basename1, basename2) \
wxClassInfo name::ms_classInfo(wxT(#name), \ wxIMPLEMENT_CLASS_COMMON2(name, basename1, basename2, NULL)
&basename1::ms_classInfo, \
&basename2::ms_classInfo, \
(int) sizeof(name), \
(wxObjectConstructorFn) 0);
#define IMPLEMENT_CLASS IMPLEMENT_ABSTRACT_CLASS #define IMPLEMENT_CLASS IMPLEMENT_ABSTRACT_CLASS
#define IMPLEMENT_CLASS2 IMPLEMENT_ABSTRACT_CLASS2 #define IMPLEMENT_CLASS2 IMPLEMENT_ABSTRACT_CLASS2

5
src/common/object.cpp
View File

@@ -81,6 +81,11 @@ wxClassInfo wxObject::ms_classInfo( wxT("wxObject"), 0, 0,
wxClassInfo* wxClassInfo::sm_first = NULL; wxClassInfo* wxClassInfo::sm_first = NULL;
wxHashTable* wxClassInfo::sm_classTable = NULL; wxHashTable* wxClassInfo::sm_classTable = NULL;
wxClassInfo *wxObject::GetClassInfo() const
{
return &wxObject::ms_classInfo;
}
// These are here so we can avoid 'always true/false' warnings // These are here so we can avoid 'always true/false' warnings
// by referring to these instead of true/false // by referring to these instead of true/false
const bool wxTrue = true; const bool wxTrue = true;