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

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@39634 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/memory.h b/include/wx/memory.h
index eb4cbc29aeaf24e5c4ba23859835d56aaa7d5a5e..b5e224be248fa1a30caa0f089920de991ce3de9e 100644 (file)
--- a/include/wx/memory.h
+++ b/include/wx/memory.h
@@ -1,6 +1,6 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        memory.h
-// Purpose:     MDI classes
+// Name:        wx/memory.h
+// Purpose:     Memory operations

 // Author:      Arthur Seaton, Julian Smart
 // Modified by:
 // Created:     29/01/98
 // Author:      Arthur Seaton, Julian Smart
 // Modified by:
 // 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))
 inline void * operator new (size_t size, wxChar * fileName, int lineNum)
 {
 #if defined(__WXMSW__) && (defined(WXUSINGDLL) || defined(WXMAKINGDLL_BASE))
 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
 inline void * operator new[] (size_t size)
 {
 }
 
 #if wxUSE_ARRAY_MEMORY_OPERATORS
 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
     // _WX_MEMORYH__
 
 #endif
     // _WX_MEMORYH__

-

diff --git a/include/wx/wx.h b/include/wx/wx.h
index 46af2cd1dd4d02a8f26ba89f6461a3bf960e0f18..71942250fec0c1d29168c0eb14a99ceeb15f2e46 100644 (file)
--- a/include/wx/wx.h
+++ b/include/wx/wx.h
@@ -24,6 +24,7 @@
 #include "wx/app.h"
 #include "wx/utils.h"
 #include "wx/stream.h"
 #include "wx/app.h"
 #include "wx/utils.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/layout.h"
 #include "wx/sizer.h"
 #include "wx/combobox.h"
 #include "wx/layout.h"
 #include "wx/sizer.h"

-#include "wx/memory.h"

 #include "wx/mdi.h"
 #include "wx/statusbr.h"
 #include "wx/scrolbar.h"
 #include "wx/mdi.h"
 #include "wx/statusbr.h"
 #include "wx/scrolbar.h"

diff --git a/src/common/object.cpp b/src/common/object.cpp
index 4d9cf5574526cb8b627fe484df02dced6c9b6aa7..1c74d57dbd452d4817cdd2241d580eda7bbc2eb7 100644 (file)
--- a/src/common/object.cpp
+++ b/src/common/object.cpp
@@ -20,14 +20,11 @@
 #ifndef WX_PRECOMP
     #include "wx/object.h"
     #include "wx/hash.h"
 #ifndef WX_PRECOMP
     #include "wx/object.h"
     #include "wx/hash.h"

+    #include "wx/memory.h"

 #endif
 
 #include <string.h>
 
 #endif
 
 #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(__VISAGECPP__)
         #define DEBUG_PRINTF(NAME) { static int raz=0; \
 #if defined(__WXDEBUG__) || wxUSE_DEBUG_CONTEXT
     #if defined(__VISAGECPP__)
         #define DEBUG_PRINTF(NAME) { static int raz=0; \

diff --git a/src/gtk/app.cpp b/src/gtk/app.cpp
index 8f26e090f756e345107c0a1932634eb867d6e062..462ea4940e3f62016eeb02502ff2d36962179ae6 100644 (file)
--- a/src/gtk/app.cpp
+++ b/src/gtk/app.cpp
@@ -25,10 +25,10 @@
     #include "wx/dialog.h"
     #include "wx/settings.h"
     #include "wx/msgdlg.h"
     #include "wx/dialog.h"
     #include "wx/settings.h"
     #include "wx/msgdlg.h"

+    #include "wx/memory.h"

 #endif
 
 #include "wx/gdicmn.h"
 #endif
 
 #include "wx/gdicmn.h"

-#include "wx/memory.h"

 #include "wx/font.h"
 #include "wx/file.h"
 #include "wx/filename.h"
 #include "wx/font.h"
 #include "wx/file.h"
 #include "wx/filename.h"

diff --git a/src/gtk1/app.cpp b/src/gtk1/app.cpp
index 9981f60a5a262de8e4e50a6a091d58a4918cf17d..06a16e3fc0972f10f134bc4d0e58a60568a1d50e 100644 (file)
--- a/src/gtk1/app.cpp
+++ b/src/gtk1/app.cpp
@@ -25,10 +25,10 @@
     #include "wx/dialog.h"
     #include "wx/settings.h"
     #include "wx/msgdlg.h"
     #include "wx/dialog.h"
     #include "wx/settings.h"
     #include "wx/msgdlg.h"

+    #include "wx/memory.h"

 #endif
 
 #include "wx/gdicmn.h"
 #endif
 
 #include "wx/gdicmn.h"

-#include "wx/memory.h"

 #include "wx/font.h"
 #include "wx/file.h"
 #include "wx/filename.h"
 #include "wx/font.h"
 #include "wx/file.h"
 #include "wx/filename.h"

diff --git a/src/mac/carbon/app.cpp b/src/mac/carbon/app.cpp
index 46e8d6fdc5f1e1e9c2ee72991db3cd9e269f441b..97ba0f25e5fa4922811da6d802f7cf121c93a11f 100644 (file)
--- a/src/mac/carbon/app.cpp
+++ b/src/mac/carbon/app.cpp
@@ -30,11 +30,11 @@
     #include "wx/dialog.h"
     #include "wx/msgdlg.h"
     #include "wx/textctrl.h"
     #include "wx/dialog.h"
     #include "wx/msgdlg.h"
     #include "wx/textctrl.h"

+    #include "wx/memory.h"

 #endif
 
 #include "wx/gdicmn.h"
 #include "wx/module.h"
 #endif
 
 #include "wx/gdicmn.h"
 #include "wx/module.h"

-#include "wx/memory.h"

 #include "wx/tooltip.h"
 #include "wx/docview.h"
 #include "wx/filename.h"
 #include "wx/tooltip.h"
 #include "wx/docview.h"
 #include "wx/filename.h"

diff --git a/src/mac/classic/app.cpp b/src/mac/classic/app.cpp
index 5c8cf06992ab033724af267e571944e02f26bb57..9e8ea08601decb91982ea215b831155e08d95cc8 100644 (file)
--- a/src/mac/classic/app.cpp
+++ b/src/mac/classic/app.cpp
@@ -34,11 +34,11 @@
     #include "wx/dialog.h"
     #include "wx/msgdlg.h"
     #include "wx/textctrl.h"
     #include "wx/dialog.h"
     #include "wx/msgdlg.h"
     #include "wx/textctrl.h"

+    #include "wx/memory.h"

 #endif
 
 #include "wx/gdicmn.h"
 #include "wx/module.h"
 #endif
 
 #include "wx/gdicmn.h"
 #include "wx/module.h"

-#include "wx/memory.h"

 #include "wx/tooltip.h"
 #include "wx/docview.h"
 #include "wx/filename.h"
 #include "wx/tooltip.h"
 #include "wx/docview.h"
 #include "wx/filename.h"

diff --git a/src/motif/app.cpp b/src/motif/app.cpp
index 0f86cbcbafb16514471f233f95765919336b4d64..8e4db93daa596f1f0285f0784ec84d8e9a76fa22 100644 (file)
--- a/src/motif/app.cpp
+++ b/src/motif/app.cpp
@@ -24,10 +24,10 @@
     #include "wx/intl.h"
     #include "wx/log.h"
     #include "wx/utils.h"
     #include "wx/intl.h"
     #include "wx/log.h"
     #include "wx/utils.h"

+    #include "wx/memory.h"

 #endif
 
 #include "wx/module.h"
 #endif
 
 #include "wx/module.h"

-#include "wx/memory.h"

 #include "wx/evtloop.h"
 
 #if wxUSE_THREADS
 #include "wx/evtloop.h"
 
 #if wxUSE_THREADS

diff --git a/src/x11/app.cpp b/src/x11/app.cpp
index afe3bb92a701374a5beeec2dd425a9888fc59c37..094bfdddbba778daa89c5f07e9e61ba34898be4b 100644 (file)
--- a/src/x11/app.cpp
+++ b/src/x11/app.cpp
@@ -23,11 +23,11 @@
     #include "wx/icon.h"
     #include "wx/dialog.h"
     #include "wx/timer.h"
     #include "wx/icon.h"
     #include "wx/dialog.h"
     #include "wx/timer.h"

+    #include "wx/memory.h"

 #endif
 
 #include "wx/gdicmn.h"
 #include "wx/module.h"
 #endif
 
 #include "wx/gdicmn.h"
 #include "wx/module.h"

-#include "wx/memory.h"

 #include "wx/evtloop.h"
 #include "wx/filename.h"
 
 #include "wx/evtloop.h"
 #include "wx/filename.h"