porting back exact semicolon version

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

diff --git a/include/wx/defs.h b/include/wx/defs.h
index 1e31dee1ba1b14475c2a6b1a2acfc3b1970f2cd1..e3c8c9313b162eabcbed11357d3dec4140ac5f2a 100644 (file)
--- a/include/wx/defs.h
+++ b/include/wx/defs.h
@@ -1526,7 +1526,7 @@ typedef double wxDouble;
     };                                                                       \
                                                                              \
     static const_iterator begin_classinfo();                                 \
-    static const_iterator end_classinfo();
+    static const_iterator end_classinfo()
 
 /*  ---------------------------------------------------------------------------- */
 /*  Geometric flags */

diff --git a/include/wx/rtti.h b/include/wx/rtti.h
index 21deb577ab0423ccba8fc60b8cbad279455d3903..12e4461a4b0739b91ad6d8c70065449e0671cb19 100644 (file)
--- a/include/wx/rtti.h
+++ b/include/wx/rtti.h
@@ -26,6 +26,7 @@
 // ----------------------------------------------------------------------------
 
 class WXDLLIMPEXP_FWD_BASE wxObject;
+class WXDLLIMPEXP_FWD_BASE wxString;
 class WXDLLIMPEXP_FWD_BASE wxClassInfo;
 class WXDLLIMPEXP_FWD_BASE wxHashTable;
 class WXDLLIMPEXP_FWD_BASE wxObject;
@@ -91,7 +92,7 @@ public:
                  ( m_baseInfo2 && m_baseInfo2->IsKindOf(info) ) );
     }
 
-    wxDECLARE_CLASS_INFO_ITERATORS()
+    wxDECLARE_CLASS_INFO_ITERATORS();
 
 private:
     const wxChar            *m_className;
@@ -116,10 +117,10 @@ protected:
     void Register();
     void Unregister();
 
-    DECLARE_NO_COPY_CLASS(wxClassInfo)
+    wxDECLARE_NO_COPY_CLASS(wxClassInfo);
 };
 
-WXDLLIMPEXP_BASE wxObject *wxCreateDynamicObject(const wxChar *name);
+WXDLLIMPEXP_BASE wxObject *wxCreateDynamicObject(const wxString& name);
 
 // ----------------------------------------------------------------------------
 // Dynamic class macros