added GetWindowSizeForVirtualSize() virtual hook for wxScrolledWindow (cuts down...

[wxWidgets.git] / src / common / memory.cpp

diff --git a/src/common/memory.cpp b/src/common/memory.cpp
index a6a4a32d50488188dc45ce1f198f57159455eeaa..1a6fae329d6a5d0bf93258139d55457b2f399944 100644 (file)
--- 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"
@@ -915,9 +907,11 @@ private:
 
 static MemoryCriticalSection memLocker;
 
-#endif
+#endif // USE_THREADSAFE_MEMORY_ALLOCATION
+
 
 #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)
 {
@@ -949,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) )
@@ -1061,7 +1057,6 @@ void wxDebugFree(void * buf, bool WXUNUSED(isVect) )
     free((char *)st);
 }
 
-#endif // wxUSE_GLOBAL_MEMORY_OPERATORS
 #endif // __WXDEBUG__
 
 // Trace: send output to the current debugging stream