X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/61cca9d24ee3f935f2581e3cfb894e46181290e6..d21d2e5adf7a5acf3b496a9c4e87eab220bd75d8:/src/common/object.cpp

diff --git a/src/common/object.cpp b/src/common/object.cpp
index c07c3c3c7c..20e531a1f2 100644
--- a/src/common/object.cpp
+++ b/src/common/object.cpp
@@ -32,6 +32,11 @@
     #endif // wxUSE_SERIAL
 #endif // WX_PRECOMP
 
+#ifdef __VISAGECPP__
+        #include "wx/objstrm.h"
+        #include "wx/serbase.h"
+#endif
+
 #include <string.h>
 #include <assert.h>
 
@@ -99,24 +104,8 @@ bool wxObject::IsKindOf(wxClassInfo *info) const
         return FALSE;
 }
 
-wxObject *wxObject::Clone() const
-{
-    wxObject *object = GetClassInfo()->CreateObject();
-    CopyObject(*object);
-    return object;
-}
-
-#ifdef __WXDEBUG__
-void wxObject::CopyObject(wxObject& object_dest) const
-#else // !Debug
-void wxObject::CopyObject(wxObject& WXUNUSED(object_dest)) const
-#endif // Debug/!Debug
-{
-    wxASSERT(object_dest.GetClassInfo()->IsKindOf(GetClassInfo()));
-}
-
 #if wxUSE_STD_IOSTREAM && (defined(__WXDEBUG__) || wxUSE_DEBUG_CONTEXT)
-void wxObject::Dump(ostream& str)
+void wxObject::Dump(wxSTD ostream& str)
 {
     if (GetClassInfo() && GetClassInfo()->GetClassName())
         str << GetClassInfo()->GetClassName();
@@ -423,3 +412,26 @@ wxObjectRefData::wxObjectRefData(void) : m_count(1)
 wxObjectRefData::~wxObjectRefData()
 {
 }
+
+#if defined(__DARWIN__) && defined(DYLIB_INIT)
+
+extern "C" {
+    void __initialize_Cplusplus(void);
+    void wxWindowsDylibInit(void);
+};
+
+// Dynamic shared library (dylib) initialization routine
+//   required to initialize static C++ objects bacause of lazy dynamic linking
+//   http://developer.apple.com/techpubs/macosx/Essentials/
+//          SystemOverview/Frameworks/Dynamic_Shared_Libraries.html
+//
+void wxWindowsDylibInit()
+{
+    // The function __initialize_Cplusplus() must be called from the shared
+    // library initialization routine to cause the static C++ objects in
+    // the library to be initialized (reference number 2441683).
+
+    __initialize_Cplusplus();
+}
+
+#endif