Now possible to compile with wxURL disabled

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

diff --git a/src/common/memory.cpp b/src/common/memory.cpp
index f12eb3ae5f7c955f02a0d6a305cb2a7a89a5fc24..5ca71ac6cf345b4018cc3114dbcf2d1fbbd92f90 100644 (file)
--- a/src/common/memory.cpp
+++ b/src/common/memory.cpp
@@ -68,7 +68,7 @@
 
 #include "wx/memory.h"
 
 
 #include "wx/memory.h"
 

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

 #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


@@ -117,7 +117,7 @@
 */
 void wxMemStruct::ErrorMsg (const char * mesg)
 {
 */
 void wxMemStruct::ErrorMsg (const char * mesg)
 {

-  wxLogMessage(wxT("wxWindows memory checking error: %s"), mesg);
+  wxLogMessage(wxT("wxWidgets memory checking error: %s"), mesg);

   PrintNode ();
 }
 
   PrintNode ();
 }
 


@@ -126,7 +126,7 @@ void wxMemStruct::ErrorMsg (const char * mesg)
 */
 void wxMemStruct::ErrorMsg ()
 {
 */
 void wxMemStruct::ErrorMsg ()
 {

-  wxLogMessage(wxT("wxWindows over/underwrite memory error:"));
+  wxLogMessage(wxT("wxWidgets over/underwrite memory error:"));

   PrintNode ();
 }
 
   PrintNode ();
 }
 


@@ -867,13 +867,13 @@ 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)-1] = _T('\0');
+    buf[sizeof(buf)/sizeof(wxChar)-1] = _T('\0');

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

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

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

-        count = sizeof(buf)-3;
+        count = sizeof(buf)/sizeof(wxChar)-3;

     buf[count]=_T('\r');
     buf[count+1]=_T('\n');
     buf[count+2]=_T('\0');
     buf[count]=_T('\r');
     buf[count+1]=_T('\n');
     buf[count+2]=_T('\0');