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:
Vadim Zeitlin
2005-01-02 22:52:22 +00:00
parent e052a316bf
commit 9a84ce0d31
2 changed files with 4 additions and 3 deletions

View File

@@ -154,6 +154,7 @@ All (GUI):
- added wxTopLevelWindow::IsActive() - added wxTopLevelWindow::IsActive()
- wxSystemSettings::GetMetric now returns -1 for metrics that are not - wxSystemSettings::GetMetric now returns -1 for metrics that are not
supported, instead of zero. supported, instead of zero.
- IMPLEMENT_DYNAMIC_CLASS2 macro compilation fixed (Serge Bakkal)
Unix: Unix:

View File

@@ -183,7 +183,7 @@ inline void wxClassInfo::CleanUpClasses() {}
// Single inheritance with one base class // Single inheritance with one base class
#define IMPLEMENT_DYNAMIC_CLASS(name, basename) \ #define IMPLEMENT_DYNAMIC_CLASS(name, basename) \
wxObject* name::wxCreateObject() \ wxObject* name::wxCreateObject() \
{ return new name; } \ { return new name; } \
wxClassInfo name::ms_classInfo(wxT(#name), \ wxClassInfo name::ms_classInfo(wxT(#name), \
&basename::ms_classInfo, NULL, \ &basename::ms_classInfo, NULL, \
@@ -193,12 +193,12 @@ inline void wxClassInfo::CleanUpClasses() {}
// 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) \
wxObject* name::wxCreateObject() \ wxObject* name::wxCreateObject() \
{ return new name; } \ { return new name; } \
wxClassInfo name::ms_classInfo(wxT(#name), \ wxClassInfo name::ms_classInfo(wxT(#name), \
&basename1::ms_classInfo, \ &basename1::ms_classInfo, \
&basename2::ms_classInfo, \ &basename2::ms_classInfo, \
wxT(#basename2), (int) sizeof(name), \ (int) sizeof(name), \
(wxObjectConstructorFn) name::wxCreateObject); (wxObjectConstructorFn) name::wxCreateObject);
// ----------------------------------- // -----------------------------------