0.1.6-1

[wxWidgets.git] / include / wx / object.h

diff --git a/include/wx/object.h b/include/wx/object.h
index 38f714596ca7379be0857ee663d4e7a542aa5c8a..0b5978bf984fbad76fd0bd04bc63c8fdcf15cff8 100644 (file)
--- a/include/wx/object.h
+++ b/include/wx/object.h
@@ -191,7 +191,7 @@ inline void wxClassInfo::CleanUpClasses() {}
     wxIMPLEMENT_CLASS_COMMON(name, basename, NULL, func)
 
 #define wxIMPLEMENT_CLASS_COMMON2(name, basename1, basename2, func)           \
-    wxIMPLEMENT_CLASS_COMMON(name, basename1, &basename2::ms_classInfo)
+    wxIMPLEMENT_CLASS_COMMON(name, basename1, &basename2::ms_classInfo, func)
 
 // -----------------------------------
 // for concrete classes
@@ -409,9 +409,9 @@ public:
     virtual ~wxObject() { UnRef(); }
 
     wxObject(const wxObject& other)
-        {
-            InitFrom(other);
-        }
+    {
+        InitFrom(other);
+    }
 
     wxObject& operator=(const wxObject& other)
     {