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

[wxWidgets.git] / include / wx / object.h

diff --git a/include/wx/object.h b/include/wx/object.h
index 1a787a3f71f19d8e0f76073259567f5ef914ea84..8da110ce980ad5448735c5efa2125c5b8297b9a6 100644 (file)
--- a/include/wx/object.h
+++ b/include/wx/object.h
@@ -13,7 +13,7 @@
 #define __OBJECTH__
 
 #ifdef __GNUG__
-#pragma interface
+#pragma interface "object.h"
 #endif
 
 #include "wx/defs.h"
@@ -206,7 +206,7 @@ class WXDLLEXPORT wxObject
 
   bool IsKindOf(wxClassInfo *info);
 
-#if DEBUG && USE_MEMORY_TRACING
+#if WXDEBUG && USE_MEMORY_TRACING
   void * operator new (size_t size, char * fileName = NULL, int lineNum = 0);
   void operator delete (void * buf);
   
@@ -218,7 +218,7 @@ class WXDLLEXPORT wxObject
 
 #endif
 
-#if DEBUG || USE_DEBUG_CONTEXT
+#if WXDEBUG || USE_DEBUG_CONTEXT
   virtual void Dump(ostream& str);
 #endif
 
@@ -256,7 +256,7 @@ private:
     int m_count;
 };
 
-#if DEBUG && USE_GLOBAL_MEMORY_OPERATORS
+#if WXDEBUG && USE_GLOBAL_MEMORY_OPERATORS
 #ifndef WXDEBUG_NEW
 #define WXDEBUG_NEW new(__FILE__,__LINE__)
 #endif