fixed IMPLEMENT_DYNAMIC_CLASS2 macro
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@31214 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -154,6 +154,7 @@ All (GUI):
|
||||
- added wxTopLevelWindow::IsActive()
|
||||
- wxSystemSettings::GetMetric now returns -1 for metrics that are not
|
||||
supported, instead of zero.
|
||||
- IMPLEMENT_DYNAMIC_CLASS2 macro compilation fixed (Serge Bakkal)
|
||||
|
||||
Unix:
|
||||
|
||||
|
@@ -183,7 +183,7 @@ inline void wxClassInfo::CleanUpClasses() {}
|
||||
// Single inheritance with one base class
|
||||
|
||||
#define IMPLEMENT_DYNAMIC_CLASS(name, basename) \
|
||||
wxObject* name::wxCreateObject() \
|
||||
wxObject* name::wxCreateObject() \
|
||||
{ return new name; } \
|
||||
wxClassInfo name::ms_classInfo(wxT(#name), \
|
||||
&basename::ms_classInfo, NULL, \
|
||||
@@ -193,12 +193,12 @@ inline void wxClassInfo::CleanUpClasses() {}
|
||||
// Multiple inheritance with two base classes
|
||||
|
||||
#define IMPLEMENT_DYNAMIC_CLASS2(name, basename1, basename2) \
|
||||
wxObject* name::wxCreateObject() \
|
||||
wxObject* name::wxCreateObject() \
|
||||
{ return new name; } \
|
||||
wxClassInfo name::ms_classInfo(wxT(#name), \
|
||||
&basename1::ms_classInfo, \
|
||||
&basename2::ms_classInfo, \
|
||||
wxT(#basename2), (int) sizeof(name), \
|
||||
(int) sizeof(name), \
|
||||
(wxObjectConstructorFn) name::wxCreateObject);
|
||||
|
||||
// -----------------------------------
|
||||
|
Reference in New Issue
Block a user