make methods available to all ports

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

diff --git a/src/common/memory.cpp b/src/common/memory.cpp
index a1728fca676a91280524a0f18133815d2aea0306..7480718c9bb3edd2af2b49d8994acf111236602a 100644 (file)
--- a/src/common/memory.cpp
+++ b/src/common/memory.cpp
@@ -16,12 +16,12 @@
     #pragma hdrstop
 #endif
 
     #pragma hdrstop
 #endif
 

-#if (defined(__WXDEBUG__) && wxUSE_MEMORY_TRACING) || wxUSE_DEBUG_CONTEXT
+#if wxUSE_MEMORY_TRACING || wxUSE_DEBUG_CONTEXT

 
 #include "wx/memory.h"
 
 #ifndef WX_PRECOMP
 
 #include "wx/memory.h"
 
 #ifndef WX_PRECOMP

-    #ifdef __WXMSW__
+    #ifdef __WINDOWS__

         #include "wx/msw/wrapwin.h"
     #endif
     #include "wx/utils.h"
         #include "wx/msw/wrapwin.h"
     #endif
     #include "wx/utils.h"


@@ -38,15 +38,14 @@
 
 #include "wx/ioswrap.h"
 
 
 #include "wx/ioswrap.h"
 

-#if !defined(__WATCOMC__) && !(defined(__VMS__) && ( __VMS_VER < 70000000 ) )\
-     && !defined( __MWERKS__ )
+#if !defined(__WATCOMC__) && !(defined(__VMS__) && ( __VMS_VER < 70000000 ) )

 #include <memory.h>
 #endif
 
 #include <stdarg.h>
 #include <string.h>
 
 #include <memory.h>
 #endif
 
 #include <stdarg.h>
 #include <string.h>
 

-#if wxUSE_THREADS && defined(__WXDEBUG__)
+#if wxUSE_THREADS

 #define USE_THREADSAFE_MEMORY_ALLOCATION 1
 #else
 #define USE_THREADSAFE_MEMORY_ALLOCATION 0
 #define USE_THREADSAFE_MEMORY_ALLOCATION 1
 #else
 #define USE_THREADSAFE_MEMORY_ALLOCATION 0


@@ -118,8 +117,9 @@ void wxMemStruct::ErrorMsg ()
 */
 int wxMemStruct::AssertList ()
 {
 */
 int wxMemStruct::AssertList ()
 {

-    if (wxDebugContext::GetHead () != 0 && ! (wxDebugContext::GetHead ())->AssertIt () ||
-        wxDebugContext::GetTail () != 0 && ! wxDebugContext::GetTail ()->AssertIt ()) {
+    if ((wxDebugContext::GetHead() && !wxDebugContext::GetHead()->AssertIt()) ||
+        (wxDebugContext::GetTail() && !wxDebugContext::GetTail()->AssertIt()))
+    {

         ErrorMsg ("Head or tail pointers trashed");
         return 0;
     }
         ErrorMsg ("Head or tail pointers trashed");
         return 0;
     }


@@ -575,18 +575,13 @@ void wxDebugContext::TraverseList (PmSFV func, wxMemStruct *from)
   */
 bool wxDebugContext::PrintList (void)
 {
   */
 bool wxDebugContext::PrintList (void)
 {

-#ifdef __WXDEBUG__
-  TraverseList ((PmSFV)&wxMemStruct::PrintNode, (checkPoint ? checkPoint->m_next : (wxMemStruct*)NULL));
+  TraverseList ((PmSFV)&wxMemStruct::PrintNode, (checkPoint ? checkPoint->m_next : NULL));

 
   return true;
 
   return true;

-#else
-  return false;
-#endif

 }
 
 bool wxDebugContext::Dump(void)
 {
 }
 
 bool wxDebugContext::Dump(void)
 {

-#ifdef __WXDEBUG__

   {
     const wxChar* appName = wxT("application");
     wxString appNameStr;
   {
     const wxChar* appName = wxT("application");
     wxString appNameStr;


@@ -602,18 +597,14 @@ bool wxDebugContext::Dump(void)
     }
   }
 
     }
   }
 

-  TraverseList ((PmSFV)&wxMemStruct::Dump, (checkPoint ? checkPoint->m_next : (wxMemStruct*)NULL));
+  TraverseList ((PmSFV)&wxMemStruct::Dump, (checkPoint ? checkPoint->m_next : NULL));

 
   OutputDumpLine(wxEmptyString);
   OutputDumpLine(wxEmptyString);
 
   return true;
 
   OutputDumpLine(wxEmptyString);
   OutputDumpLine(wxEmptyString);
 
   return true;

-#else
-  return false;
-#endif

 }
 
 }
 

-#ifdef __WXDEBUG__

 struct wxDebugStatsStruct
 {
   long instanceCount;
 struct wxDebugStatsStruct
 {
   long instanceCount;


@@ -638,11 +629,9 @@ static wxDebugStatsStruct *InsertStatsStruct(wxDebugStatsStruct *head, wxDebugSt
   st->next = head;
   return st;
 }
   st->next = head;
   return st;
 }

-#endif

 
 bool wxDebugContext::PrintStatistics(bool detailed)
 {
 
 bool wxDebugContext::PrintStatistics(bool detailed)
 {

-#ifdef __WXDEBUG__

   {
     const wxChar* appName = wxT("application");
     wxString appNameStr;
   {
     const wxChar* appName = wxT("application");
     wxString appNameStr;


@@ -667,7 +656,7 @@ bool wxDebugContext::PrintStatistics(bool detailed)
 
   wxDebugStatsStruct *list = NULL;
 
 
   wxDebugStatsStruct *list = NULL;
 

-  wxMemStruct *from = (checkPoint ? checkPoint->m_next : (wxMemStruct*)NULL );
+  wxMemStruct *from = (checkPoint ? checkPoint->m_next : NULL );

   if (!from)
     from = wxDebugContext::GetHead ();
 
   if (!from)
     from = wxDebugContext::GetHead ();
 


@@ -729,10 +718,6 @@ bool wxDebugContext::PrintStatistics(bool detailed)
   OutputDumpLine(wxEmptyString);
 
   return true;
   OutputDumpLine(wxEmptyString);
 
   return true;

-#else
-  (void)detailed;
-  return false;
-#endif

 }
 
 bool wxDebugContext::PrintClasses(void)
 }
 
 bool wxDebugContext::PrintClasses(void)


@@ -800,7 +785,7 @@ int wxDebugContext::Check(bool checkAll)
 {
   int nFailures = 0;
 
 {
   int nFailures = 0;
 

-  wxMemStruct *from = (checkPoint ? checkPoint->m_next : (wxMemStruct*)NULL );
+  wxMemStruct *from = (checkPoint ? checkPoint->m_next : NULL );

   if (!from || checkAll)
     from = wxDebugContext::GetHead ();
 
   if (!from || checkAll)
     from = wxDebugContext::GetHead ();
 


@@ -846,16 +831,16 @@ void wxDebugContext::OutputDumpLine(const wxChar *szFormat, ...)
     int count;
     va_list argptr;
     va_start(argptr, szFormat);
     int count;
     va_list argptr;
     va_start(argptr, szFormat);

-    buf[sizeof(buf)/sizeof(wxChar)-1] = _T('\0');
+    buf[WXSIZEOF(buf)-1] = wxT('\0');

 
     // keep 3 bytes for a \r\n\0
 
     // keep 3 bytes for a \r\n\0

-    count = wxVsnprintf(buf, sizeof(buf)/sizeof(wxChar)-3, szFormat, argptr);
+    count = wxVsnprintf(buf, WXSIZEOF(buf)-3, szFormat, argptr);

 
     if ( count < 0 )
 
     if ( count < 0 )

-        count = sizeof(buf)/sizeof(wxChar)-3;
-    buf[count]=_T('\r');
-    buf[count+1]=_T('\n');
-    buf[count+2]=_T('\0');
+        count = WXSIZEOF(buf)-3;
+    buf[count]=wxT('\r');
+    buf[count+1]=wxT('\n');
+    buf[count+2]=wxT('\0');

 
     wxMessageOutputDebug dbgout;
     dbgout.Printf(buf);
 
     wxMessageOutputDebug dbgout;
     dbgout.Printf(buf);


@@ -902,8 +887,7 @@ static MemoryCriticalSection memLocker;
 #endif // USE_THREADSAFE_MEMORY_ALLOCATION
 
 
 #endif // USE_THREADSAFE_MEMORY_ALLOCATION
 
 

-#ifdef __WXDEBUG__
-#if !(defined(__WXMSW__) && (defined(WXUSINGDLL) || defined(WXMAKINGDLL_BASE)))
+#if !(defined(__WINDOWS__) && (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)
 {


@@ -937,7 +921,7 @@ void operator delete[] (void * buf)
 }
 #endif // wxUSE_ARRAY_MEMORY_OPERATORS
 #endif // wxUSE_GLOBAL_MEMORY_OPERATORS
 }
 #endif // wxUSE_ARRAY_MEMORY_OPERATORS
 #endif // wxUSE_GLOBAL_MEMORY_OPERATORS

-#endif // !(defined(__WXMSW__) && (defined(WXUSINGDLL) || defined(WXMAKINGDLL_BASE)))
+#endif // !(defined(__WINDOWS__) && (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) )


@@ -1049,8 +1033,6 @@ void wxDebugFree(void * buf, bool WXUNUSED(isVect) )
     free((char *)st);
 }
 
     free((char *)st);
 }
 

-#endif // __WXDEBUG__
-

 // Trace: send output to the current debugging stream
 void wxTrace(const wxChar * ...)
 {
 // Trace: send output to the current debugging stream
 void wxTrace(const wxChar * ...)
 {


@@ -1062,7 +1044,7 @@ void wxTrace(const wxChar * ...)
 
   va_start(ap, fmt);
 
 
   va_start(ap, fmt);
 

-#ifdef __WXMSW__
+#ifdef __WINDOWS__

   wvsprintf(buffer,fmt,ap) ;
 #else
   vsprintf(buffer,fmt,ap) ;
   wvsprintf(buffer,fmt,ap) ;
 #else
   vsprintf(buffer,fmt,ap) ;


@@ -1076,7 +1058,7 @@ void wxTrace(const wxChar * ...)
     wxDebugContext::GetStream().flush();
   }
   else
     wxDebugContext::GetStream().flush();
   }
   else

-#ifdef __WXMSW__
+#ifdef __WINDOWS__

 #ifdef __WIN32__
     OutputDebugString((LPCTSTR)buffer) ;
 #else
 #ifdef __WIN32__
     OutputDebugString((LPCTSTR)buffer) ;
 #else


@@ -1102,7 +1084,7 @@ void wxTraceLevel(int, const wxChar * ...)
 
   va_start(ap, fmt);
 
 
   va_start(ap, fmt);
 

-#ifdef __WXMSW__
+#ifdef __WINDOWS__

   wxWvsprintf(buffer,fmt,ap) ;
 #else
   vsprintf(buffer,fmt,ap) ;
   wxWvsprintf(buffer,fmt,ap) ;
 #else
   vsprintf(buffer,fmt,ap) ;


@@ -1116,7 +1098,7 @@ void wxTraceLevel(int, const wxChar * ...)
     wxDebugContext::GetStream().flush();
   }
   else
     wxDebugContext::GetStream().flush();
   }
   else

-#ifdef __WXMSW__
+#ifdef __WINDOWS__

 #ifdef __WIN32__
     OutputDebugString((LPCTSTR)buffer) ;
 #else
 #ifdef __WIN32__
     OutputDebugString((LPCTSTR)buffer) ;
 #else


@@ -1167,4 +1149,4 @@ void wxDebugContextDumpDelayCounter::DoDump()
 // least one cleanup counter object
 static wxDebugContextDumpDelayCounter wxDebugContextDumpDelayCounter_One;
 
 // least one cleanup counter object
 static wxDebugContextDumpDelayCounter wxDebugContextDumpDelayCounter_One;
 

-#endif // (defined(__WXDEBUG__) && wxUSE_MEMORY_TRACING) || wxUSE_DEBUG_CONTEXT
+#endif // wxUSE_MEMORY_TRACING || wxUSE_DEBUG_CONTEXT