fixed IMPLEMENT_DYNAMIC_CLASS2 macro

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@31214 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/docs/changes.txt b/docs/changes.txt
index 46b34a48adfcb68e0c60dcc40cae764b62e29079..c3548b2c4bc78019803793b629e026b2a3a935f5 100644 (file)
--- a/docs/changes.txt
+++ b/docs/changes.txt
@@ -154,6 +154,7 @@ All (GUI):
 - added wxTopLevelWindow::IsActive()
 - wxSystemSettings::GetMetric now returns -1 for metrics that are not
   supported, instead of zero.
 - 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:
 
 
 Unix:
 

diff --git a/include/wx/object.h b/include/wx/object.h
index 3ac8f6bf6e1037d090b5a89e74e5739eb4072876..d3081e897def0f187958db374cbd6a1bfbc1f301 100644 (file)
--- a/include/wx/object.h
+++ b/include/wx/object.h
@@ -183,7 +183,7 @@ inline void wxClassInfo::CleanUpClasses() {}
     // Single inheritance with one base class
 
 #define IMPLEMENT_DYNAMIC_CLASS(name, basename)                 \
     // 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,                      \
   { 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)    \
     // 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,                           \
   { 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);
 
 // -----------------------------------
             (wxObjectConstructorFn) name::wxCreateObject);
 
 // -----------------------------------