X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/aaf1bbfd62a0297da30d2ac01f6e30592a3d11e0..cb0b7b7d811356f729315fc14c7e0d311f43384d:/src/common/memory.cpp?ds=sidebyside

diff --git a/src/common/memory.cpp b/src/common/memory.cpp
index 0d67e157e0..1a6fae329d 100644
--- a/src/common/memory.cpp
+++ b/src/common/memory.cpp
@@ -9,10 +9,6 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma implementation "memory.h"
-#endif
-
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
@@ -26,10 +22,6 @@
 
 #if (defined(__WXDEBUG__) && wxUSE_MEMORY_TRACING) || wxUSE_DEBUG_CONTEXT
 
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-// #pragma implementation
-#endif
-
 #ifndef WX_PRECOMP
 #include "wx/utils.h"
 #include "wx/app.h"
@@ -892,6 +884,9 @@ public:
     MemoryCriticalSection() {
         memSectionOk = true;
     }
+    ~MemoryCriticalSection() {
+        memSectionOk = false;
+    }
 };
 
 class MemoryCriticalSectionLocker
@@ -910,10 +905,14 @@ private:
     bool m_locked;
 };
 
-    static MemoryCriticalSection memLocker;
+static MemoryCriticalSection memLocker;
+
+#endif // USE_THREADSAFE_MEMORY_ALLOCATION
 
-#endif
 
+#ifdef __WXDEBUG__
+#if !(defined(__WXMSW__) && (defined(WXUSINGDLL) || defined(WXMAKINGDLL_BASE)))
+#if wxUSE_GLOBAL_MEMORY_OPERATORS
 void * operator new (size_t size, wxChar * fileName, int lineNum)
 {
     return wxDebugAlloc(size, fileName, lineNum, false, false);
@@ -944,7 +943,9 @@ void operator delete[] (void * buf)
 {
   wxDebugFree(buf, true);
 }
-#endif
+#endif // wxUSE_ARRAY_MEMORY_OPERATORS
+#endif // wxUSE_GLOBAL_MEMORY_OPERATORS
+#endif // !(defined(__WXMSW__) && (defined(WXUSINGDLL) || defined(WXMAKINGDLL_BASE)))
 
 // TODO: store whether this is a vector or not.
 void * wxDebugAlloc(size_t size, wxChar * fileName, int lineNum, bool isObject, bool WXUNUSED(isVect) )
@@ -1056,6 +1057,8 @@ void wxDebugFree(void * buf, bool WXUNUSED(isVect) )
     free((char *)st);
 }
 
+#endif // __WXDEBUG__
+
 // Trace: send output to the current debugging stream
 void wxTrace(const wxChar * ...)
 {
@@ -1134,11 +1137,11 @@ void wxTraceLevel(int, const wxChar * ...)
 }
 
 //----------------------------------------------------------------------------
-// Final cleanup after all global objects in all files have been destructed
+// Final cleanup after all global objects in all files have been destroyed
 //----------------------------------------------------------------------------
 
 // Don't set it to 0 by dynamic initialization
-// Some compilers will realy do the asignment later
+// Some compilers will really do the assignment later
 // All global variables are initialized to 0 at the very beginning, and this is just fine.
 int wxDebugContextDumpDelayCounter::sm_count;
 
@@ -1153,7 +1156,7 @@ void wxDebugContextDumpDelayCounter::DoDump()
 }
 
 // Even if there is nothing else, make sure that there is at
-// least one clenup counter object
+// least one cleanup counter object
 static wxDebugContextDumpDelayCounter wxDebugContextDumpDelayCounter_One;
 
 #endif // (defined(__WXDEBUG__) && wxUSE_MEMORY_TRACING) || wxUSE_DEBUG_CONTEXT