#if wxUSE_DYNAMIC_CLASSES
-#ifdef __GNUWIN32__
+// #ifdef __GNUWIN32__
#ifdef GetClassName
#undef GetClassName
#endif
+#ifdef GetClassInfo
+#undef GetClassInfo
#endif
+// #endif
class WXDLLEXPORT wxClassInfo;
class WXDLLEXPORT wxInputStream;
class WXDLLEXPORT wxObject_Serialize;
#if wxUSE_IOSTREAMH
-# include <ostream.h>
+// N.B. BC++ doesn't have istream.h, ostream.h
+# include <iostream.h>
#else
# include <ostream>
# ifdef _MSC_VER
static wxHashTable* sm_classTable;
};
-wxObject* WXDLLEXPORT wxCreateDynamicObject(const char *name);
+WXDLLEXPORT wxObject* wxCreateDynamicObject(const char *name);
-#ifdef wxUSE_SERIAL
-wxObject* WXDLLEXPORT wxCreateStoredObject( wxInputStream& stream );
+#if wxUSE_SERIAL
+WXDLLEXPORT wxObject* wxCreateStoredObject( wxInputStream& stream );
#endif
#define DECLARE_DYNAMIC_CLASS(name) \
#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__
bool IsKindOf(wxClassInfo *info) const;
-#if WXDEBUG && wxUSE_MEMORY_TRACING
+#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++
-#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
+/*
+#ifdef __MWERKS__
+ void * operator new[] (size_t size, char * fileName , int lineNum = 0);
+ void operator delete[] (void * buf);
+#endif
+*/
+
#endif
-#if WXDEBUG || wxUSE_DEBUG_CONTEXT
+#if defined(__WXDEBUG__) || wxUSE_DEBUG_CONTEXT
virtual void Dump(ostream& str);
#endif
-#ifdef wxUSE_SERIAL
+#if wxUSE_SERIAL
virtual void StoreObject( wxObjectOutputStream &stream );
virtual void LoadObject( wxObjectInputStream &stream );
#endif
protected:
wxObjectRefData* m_refData;
-#ifdef wxUSE_SERIAL
+#if wxUSE_SERIAL
wxObject_Serialize* m_serialObj;
#endif
};
int m_count;
};
-#if 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