Include wx/brush.h according to precompiled headers of wx/wx.h (with other minor...

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

diff --git a/src/common/memory.cpp b/src/common/memory.cpp
index e3fd5b0551f0acc40eacec4243544625c09ce85a..acd63dcde9aa6cab2d7ff7a353f1f0adf9f99b53 100644 (file)
--- a/src/common/memory.cpp
+++ b/src/common/memory.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        memory.cpp
+// Name:        src/common/memory.cpp

 // Purpose:     Memory checking implementation
 // Author:      Arthur Seaton, Julian Smart
 // Modified by:
 // Purpose:     Memory checking implementation
 // Author:      Arthur Seaton, Julian Smart
 // Modified by:


@@ -13,26 +13,24 @@
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__

-#pragma hdrstop
-#endif
-
-#ifndef WX_PRECOMP
-#include "wx/defs.h"
+    #pragma hdrstop

 #endif
 
 #if (defined(__WXDEBUG__) && wxUSE_MEMORY_TRACING) || wxUSE_DEBUG_CONTEXT
 
 #endif
 
 #if (defined(__WXDEBUG__) && wxUSE_MEMORY_TRACING) || wxUSE_DEBUG_CONTEXT
 

+#include "wx/memory.h"
+

 #ifndef WX_PRECOMP
 #ifndef WX_PRECOMP

-#include "wx/utils.h"
-#include "wx/app.h"
-#include "wx/hash.h"
+    #include "wx/utils.h"
+    #include "wx/app.h"
+    #include "wx/hash.h"
+    #include "wx/log.h"

 #endif
 
 #if wxUSE_THREADS
 #endif
 
 #if wxUSE_THREADS

-#include "wx/thread.h"
+    #include "wx/thread.h"

 #endif
 
 #endif
 

-#include "wx/log.h"

 #include <stdlib.h>
 
 #include "wx/ioswrap.h"
 #include <stdlib.h>
 
 #include "wx/ioswrap.h"


@@ -58,8 +56,6 @@
 
 #endif
 
 
 #endif
 

-#include "wx/memory.h"
-

 #if wxUSE_THREADS && defined(__WXDEBUG__)
 #define USE_THREADSAFE_MEMORY_ALLOCATION 1
 #else
 #if wxUSE_THREADS && defined(__WXDEBUG__)
 #define USE_THREADSAFE_MEMORY_ALLOCATION 1
 #else


@@ -907,10 +903,11 @@ private:
 
 static MemoryCriticalSection memLocker;
 
 
 static MemoryCriticalSection memLocker;
 

-#endif
+#endif // USE_THREADSAFE_MEMORY_ALLOCATION
+

 
 

-#if !(defined(__WXMSW__) && (defined(WXUSINGDLL) || defined(WXMAKINGDLL_BASE)))

 #ifdef __WXDEBUG__
 #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)
 {
 #if wxUSE_GLOBAL_MEMORY_OPERATORS
 void * operator new (size_t size, wxChar * fileName, int lineNum)
 {


@@ -943,8 +940,8 @@ void operator delete[] (void * buf)
   wxDebugFree(buf, true);
 }
 #endif // wxUSE_ARRAY_MEMORY_OPERATORS
   wxDebugFree(buf, true);
 }
 #endif // wxUSE_ARRAY_MEMORY_OPERATORS

-#endif // !(defined(__WXMSW__) && (defined(WXUSINGDLL) || defined(WXMAKINGDLL_BASE)))

 #endif // wxUSE_GLOBAL_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) )
 
 // TODO: store whether this is a vector or not.
 void * wxDebugAlloc(size_t size, wxChar * fileName, int lineNum, bool isObject, bool WXUNUSED(isVect) )


@@ -1159,4 +1156,3 @@ void wxDebugContextDumpDelayCounter::DoDump()
 static wxDebugContextDumpDelayCounter wxDebugContextDumpDelayCounter_One;
 
 #endif // (defined(__WXDEBUG__) && wxUSE_MEMORY_TRACING) || wxUSE_DEBUG_CONTEXT
 static wxDebugContextDumpDelayCounter wxDebugContextDumpDelayCounter_One;
 
 #endif // (defined(__WXDEBUG__) && wxUSE_MEMORY_TRACING) || wxUSE_DEBUG_CONTEXT

-