Compilation fixes

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

diff --git a/include/wx/object.h b/include/wx/object.h
index 027d557aef7f27c53e642217bef1cee57d05cb78..ca3ade770ab82e32a00c012a8e43eaabb1ccd322 100644 (file)
--- a/include/wx/object.h
+++ b/include/wx/object.h
@@ -96,10 +96,10 @@ public:
    static wxHashTable*      sm_classTable;
 };
 
    static wxHashTable*      sm_classTable;
 };
 

-wxObject* WXDLLEXPORT wxCreateDynamicObject(const char *name);
+WXDLLEXPORT wxObject* wxCreateDynamicObject(const char *name);

 
 #ifdef wxUSE_SERIAL
 
 #ifdef wxUSE_SERIAL

-wxObject* WXDLLEXPORT wxCreateStoredObject( wxInputStream& stream );
+WXDLLEXPORT wxObject* wxCreateStoredObject( wxInputStream& stream );

 #endif
 
 #define DECLARE_DYNAMIC_CLASS(name) \
 #endif
 
 #define DECLARE_DYNAMIC_CLASS(name) \


@@ -160,7 +160,10 @@ wxObject* WXDLLEXPORT_CTORFN wxConstructorFor##name(void) \
 
 #endif
 
 
 #endif
 

-#define IS_KIND_OF(obj, className) obj->IsKindOf(&className::sm_class##className)
+#define wxIS_KIND_OF(obj, className) obj->IsKindOf(&className::sm_class##className)
+
+// Just seems a bit nicer-looking (pretend it's not a macro)
+#define wxIsKindOf(obj, className) obj->IsKindOf(&className::sm_class##className)

 
 // Unfortunately Borland seems to need this include.
 #ifdef __BORLANDC__
 
 // Unfortunately Borland seems to need this include.
 #ifdef __BORLANDC__


@@ -190,18 +193,26 @@ class WXDLLEXPORT wxObject
 #if defined(__WXDEBUG__) && wxUSE_MEMORY_TRACING
   void * operator new (size_t size, char * fileName = NULL, int lineNum = 0);
   void operator delete (void * buf);
 #if defined(__WXDEBUG__) && wxUSE_MEMORY_TRACING
   void * operator new (size_t size, char * fileName = NULL, int lineNum = 0);
   void operator delete (void * buf);

-  
+

 // VC++ 6.0
 #if _MSC_VER >= 1200
   void operator delete(void *buf, char*, int);
 #endif
 
   // Cause problems for VC++
 // VC++ 6.0
 #if _MSC_VER >= 1200
   void operator delete(void *buf, char*, int);
 #endif
 
   // Cause problems for VC++

-#ifndef _MSC_VER
+// #ifndef _MSC_VER
+#if !defined(_MSC_VER) && wxUSE_ARRAY_MEMORY_OPERATORS

   void * operator new[] (size_t size, char * fileName = NULL, int lineNum = 0);
   void operator delete[] (void * buf);
 #endif
 
   void * operator new[] (size_t size, char * fileName = NULL, int lineNum = 0);
   void operator delete[] (void * buf);
 #endif
 

+/*
+#ifdef __MWERKS__
+  void * operator new[] (size_t size, char * fileName  , int lineNum = 0);
+  void operator delete[] (void * buf);
+#endif
+*/
+

 #endif
 
 #if defined(__WXDEBUG__) || wxUSE_DEBUG_CONTEXT
 #endif
 
 #if defined(__WXDEBUG__) || wxUSE_DEBUG_CONTEXT


@@ -246,10 +257,19 @@ private:
     int m_count;
 };
 
     int m_count;
 };
 

-#if defined(__WXDEBUG__) && wxUSE_GLOBAL_MEMORY_OPERATORS
-//#ifndef WXDEBUG_NEW
-//#define WXDEBUG_NEW new(__FILE__,__LINE__)
-//#endif
+#ifdef __WXDEBUG__
+#ifndef WXDEBUG_NEW
+#define WXDEBUG_NEW new(__FILE__,__LINE__)
+#endif
+#else
+#define WXDEBUG_NEW new
+#endif
+
+// Redefine new to be the debugging version. This doesn't
+// work with all compilers, in which case you need to
+// use WXDEBUG_NEW explicitly if you wish to use the debugging version.
+
+#if defined(__WXDEBUG__) && wxUSE_GLOBAL_MEMORY_OPERATORS && wxUSE_DEBUG_NEW_ALWAYS

 #define new new(__FILE__,__LINE__)
 #endif
 
 #define new new(__FILE__,__LINE__)
 #endif