From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Sun, 2 Jan 2005 22:52:22 +0000 (+0000)
Subject: fixed IMPLEMENT_DYNAMIC_CLASS2 macro
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/9a84ce0d31574582d626c4e44d85fe75b4d7aacd

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 46b34a48ad..c3548b2c4b 100644
--- 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.
+- IMPLEMENT_DYNAMIC_CLASS2 macro compilation fixed (Serge Bakkal)
 
 Unix:
 
diff --git a/include/wx/object.h b/include/wx/object.h
index 3ac8f6bf6e..d3081e897d 100644
--- 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)                 \
- 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);
 
 // -----------------------------------