X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/cafc76a4bbbcb59f1c48d9c8f592c671238ffb51..aa43a59b912f20b67a849f40d033cc6f7f2cce55:/src/common/object.cpp

diff --git a/src/common/object.cpp b/src/common/object.cpp
index 9f6fccef06..4ebc1cc9c6 100644
--- a/src/common/object.cpp
+++ b/src/common/object.cpp
@@ -10,7 +10,7 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
 #pragma implementation "object.h"
 #endif
 
@@ -33,9 +33,6 @@
 #endif
 
 #if defined(__WXDEBUG__) || wxUSE_DEBUG_CONTEXT
-    // for wxObject::Dump
-    #include "wx/ioswrap.h"
-
     #if defined(__VISAGECPP__)
         #define DEBUG_PRINTF(NAME) { static int raz=0; \
             printf( #NAME " %i\n",raz); fflush(stdout); raz++; }
@@ -101,17 +98,6 @@ bool wxObject::IsKindOf(wxClassInfo *info) const
     return (thisInfo) ? thisInfo->IsKindOf(info) : FALSE ;
 }
 
-#if wxUSE_STD_IOSTREAM && (defined(__WXDEBUG__) || wxUSE_DEBUG_CONTEXT)
-void wxObject::Dump(wxSTD ostream& str)
-{
-    if (GetClassInfo() && GetClassInfo()->GetClassName())
-        str << GetClassInfo()->GetClassName();
-    else
-        str << _T("unknown object class");
-}
-#endif
-
-
 #if defined(__WXDEBUG__) && wxUSE_MEMORY_TRACING && defined( new )
 	#undef new
 #endif
@@ -364,34 +350,3 @@ wxObject::CloneRefData(const wxObjectRefData * WXUNUSED(data)) const
 
     return NULL;
 }
-
-// ----------------------------------------------------------------------------
-// misc
-// ----------------------------------------------------------------------------
-
-#if defined(__DARWIN__) && defined(WXMAKINGDLL)
-
-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).
-
-    // This only seems to be necessary if the library initialization routine
-    // needs to use the static C++ objects
-    __initialize_Cplusplus();
-}
-
-#endif
-
-// vi:sts=4:sw=4:et