speed optimizations: some functions now use wxString::Alloc, wxTextFile::Read

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

diff --git a/src/common/object.cpp b/src/common/object.cpp
index 4dc8b093b3f9a874c861f27605b466b2f116cf08..7085b9bb8bb2d291acd3773a34b748fdda69193d 100644 (file)
--- a/src/common/object.cpp
+++ b/src/common/object.cpp
@@ -25,11 +25,11 @@
 #include <string.h>
 #include <assert.h>
 
 #include <string.h>
 #include <assert.h>
 

-#if (DEBUG && USE_MEMORY_TRACING) || USE_DEBUG_CONTEXT
+#if (WXDEBUG && USE_MEMORY_TRACING) || USE_DEBUG_CONTEXT

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

-#if DEBUG || USE_DEBUG_CONTEXT
+#if WXDEBUG || USE_DEBUG_CONTEXT

   // for wxObject::Dump
   #include <iostream.h>
 #endif
   // for wxObject::Dump
   #include <iostream.h>
 #endif


@@ -69,7 +69,7 @@ bool wxObject::IsKindOf(wxClassInfo *info)
     return FALSE;
 }
 
     return FALSE;
 }
 

-#if DEBUG || USE_DEBUG_CONTEXT
+#if WXDEBUG || USE_DEBUG_CONTEXT

 void wxObject::Dump(ostream& str)
 {
   if (GetClassInfo() && GetClassInfo()->GetClassName())
 void wxObject::Dump(ostream& str)
 {
   if (GetClassInfo() && GetClassInfo()->GetClassName())


@@ -79,7 +79,7 @@ void wxObject::Dump(ostream& str)
 }
 #endif
 
 }
 #endif
 

-#if DEBUG && USE_MEMORY_TRACING
+#if WXDEBUG && USE_MEMORY_TRACING

 
 #ifdef new
 #undef new
 
 #ifdef new
 #undef new