Include wx/memory.h according to precompiled headers of wx/wx.h (with other minor cleaning).

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@39634 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Włodzimierz Skiba
2006-06-08 12:51:01 +00:00
parent 9a6384ca1e
commit 5b56bffb33
9 changed files with 16 additions and 20 deletions

View File

@@ -1,6 +1,6 @@
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
// Name: memory.h // Name: wx/memory.h
// Purpose: MDI classes // Purpose: Memory operations
// Author: Arthur Seaton, Julian Smart // Author: Arthur Seaton, Julian Smart
// Modified by: // Modified by:
// Created: 29/01/98 // Created: 29/01/98
@@ -70,33 +70,33 @@ WXDLLIMPEXP_BASE void wxDebugFree(void * buf, bool isVect = false);
#if defined(__WXMSW__) && (defined(WXUSINGDLL) || defined(WXMAKINGDLL_BASE)) #if defined(__WXMSW__) && (defined(WXUSINGDLL) || defined(WXMAKINGDLL_BASE))
inline void * operator new (size_t size, wxChar * fileName, int lineNum) inline void * operator new (size_t size, wxChar * fileName, int lineNum)
{ {
return wxDebugAlloc(size, fileName, lineNum, FALSE, FALSE); return wxDebugAlloc(size, fileName, lineNum, false, false);
} }
inline void * operator new (size_t size) inline void * operator new (size_t size)
{ {
return wxDebugAlloc(size, NULL, 0, FALSE); return wxDebugAlloc(size, NULL, 0, false);
} }
inline void operator delete (void * buf) inline void operator delete (void * buf)
{ {
wxDebugFree(buf, FALSE); wxDebugFree(buf, false);
} }
#if wxUSE_ARRAY_MEMORY_OPERATORS #if wxUSE_ARRAY_MEMORY_OPERATORS
inline void * operator new[] (size_t size) inline void * operator new[] (size_t size)
{ {
return wxDebugAlloc(size, NULL, 0, FALSE, TRUE); return wxDebugAlloc(size, NULL, 0, false, true);
} }
inline void * operator new[] (size_t size, wxChar * fileName, int lineNum) inline void * operator new[] (size_t size, wxChar * fileName, int lineNum)
{ {
return wxDebugAlloc(size, fileName, lineNum, FALSE, TRUE); return wxDebugAlloc(size, fileName, lineNum, false, true);
} }
inline void operator delete[] (void * buf) inline void operator delete[] (void * buf)
{ {
wxDebugFree(buf, TRUE); wxDebugFree(buf, true);
} }
#endif // wxUSE_ARRAY_MEMORY_OPERATORS #endif // wxUSE_ARRAY_MEMORY_OPERATORS
@@ -371,4 +371,3 @@ void WXDLLIMPEXP_BASE wxTraceLevel(int level, const wxChar *fmt ...) ATTRIBUTE_P
#endif #endif
// _WX_MEMORYH__ // _WX_MEMORYH__

View File

@@ -24,6 +24,7 @@
#include "wx/app.h" #include "wx/app.h"
#include "wx/utils.h" #include "wx/utils.h"
#include "wx/stream.h" #include "wx/stream.h"
#include "wx/memory.h"
#if wxUSE_GUI #if wxUSE_GUI
@@ -70,7 +71,6 @@
#include "wx/combobox.h" #include "wx/combobox.h"
#include "wx/layout.h" #include "wx/layout.h"
#include "wx/sizer.h" #include "wx/sizer.h"
#include "wx/memory.h"
#include "wx/mdi.h" #include "wx/mdi.h"
#include "wx/statusbr.h" #include "wx/statusbr.h"
#include "wx/scrolbar.h" #include "wx/scrolbar.h"

View File

@@ -20,14 +20,11 @@
#ifndef WX_PRECOMP #ifndef WX_PRECOMP
#include "wx/object.h" #include "wx/object.h"
#include "wx/hash.h" #include "wx/hash.h"
#include "wx/memory.h"
#endif #endif
#include <string.h> #include <string.h>
#if (defined(__WXDEBUG__) && wxUSE_MEMORY_TRACING) || wxUSE_DEBUG_CONTEXT
#include "wx/memory.h"
#endif
#if defined(__WXDEBUG__) || wxUSE_DEBUG_CONTEXT #if defined(__WXDEBUG__) || wxUSE_DEBUG_CONTEXT
#if defined(__VISAGECPP__) #if defined(__VISAGECPP__)
#define DEBUG_PRINTF(NAME) { static int raz=0; \ #define DEBUG_PRINTF(NAME) { static int raz=0; \

View File

@@ -25,10 +25,10 @@
#include "wx/dialog.h" #include "wx/dialog.h"
#include "wx/settings.h" #include "wx/settings.h"
#include "wx/msgdlg.h" #include "wx/msgdlg.h"
#include "wx/memory.h"
#endif #endif
#include "wx/gdicmn.h" #include "wx/gdicmn.h"
#include "wx/memory.h"
#include "wx/font.h" #include "wx/font.h"
#include "wx/file.h" #include "wx/file.h"
#include "wx/filename.h" #include "wx/filename.h"

View File

@@ -25,10 +25,10 @@
#include "wx/dialog.h" #include "wx/dialog.h"
#include "wx/settings.h" #include "wx/settings.h"
#include "wx/msgdlg.h" #include "wx/msgdlg.h"
#include "wx/memory.h"
#endif #endif
#include "wx/gdicmn.h" #include "wx/gdicmn.h"
#include "wx/memory.h"
#include "wx/font.h" #include "wx/font.h"
#include "wx/file.h" #include "wx/file.h"
#include "wx/filename.h" #include "wx/filename.h"

View File

@@ -30,11 +30,11 @@
#include "wx/dialog.h" #include "wx/dialog.h"
#include "wx/msgdlg.h" #include "wx/msgdlg.h"
#include "wx/textctrl.h" #include "wx/textctrl.h"
#include "wx/memory.h"
#endif #endif
#include "wx/gdicmn.h" #include "wx/gdicmn.h"
#include "wx/module.h" #include "wx/module.h"
#include "wx/memory.h"
#include "wx/tooltip.h" #include "wx/tooltip.h"
#include "wx/docview.h" #include "wx/docview.h"
#include "wx/filename.h" #include "wx/filename.h"

View File

@@ -34,11 +34,11 @@
#include "wx/dialog.h" #include "wx/dialog.h"
#include "wx/msgdlg.h" #include "wx/msgdlg.h"
#include "wx/textctrl.h" #include "wx/textctrl.h"
#include "wx/memory.h"
#endif #endif
#include "wx/gdicmn.h" #include "wx/gdicmn.h"
#include "wx/module.h" #include "wx/module.h"
#include "wx/memory.h"
#include "wx/tooltip.h" #include "wx/tooltip.h"
#include "wx/docview.h" #include "wx/docview.h"
#include "wx/filename.h" #include "wx/filename.h"

View File

@@ -24,10 +24,10 @@
#include "wx/intl.h" #include "wx/intl.h"
#include "wx/log.h" #include "wx/log.h"
#include "wx/utils.h" #include "wx/utils.h"
#include "wx/memory.h"
#endif #endif
#include "wx/module.h" #include "wx/module.h"
#include "wx/memory.h"
#include "wx/evtloop.h" #include "wx/evtloop.h"
#if wxUSE_THREADS #if wxUSE_THREADS

View File

@@ -23,11 +23,11 @@
#include "wx/icon.h" #include "wx/icon.h"
#include "wx/dialog.h" #include "wx/dialog.h"
#include "wx/timer.h" #include "wx/timer.h"
#include "wx/memory.h"
#endif #endif
#include "wx/gdicmn.h" #include "wx/gdicmn.h"
#include "wx/module.h" #include "wx/module.h"
#include "wx/memory.h"
#include "wx/evtloop.h" #include "wx/evtloop.h"
#include "wx/filename.h" #include "wx/filename.h"