Added a few files; fixed some warnings and wxMotif compile problems

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

diff --git a/include/wx/object.h b/include/wx/object.h
index b8051a90a3aa7cd94a9af8b5bf4e7beef26b5313..b914b190dc62031c0d9abc305f9e2cfb074a2889 100644 (file)
--- a/include/wx/object.h
+++ b/include/wx/object.h
@@ -23,11 +23,14 @@ class WXDLLEXPORT wxObject;
 
 #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;
@@ -98,7 +101,7 @@ public:
 
 WXDLLEXPORT wxObject* wxCreateDynamicObject(const char *name);
 
-#ifdef wxUSE_SERIAL
+#if wxUSE_SERIAL
 WXDLLEXPORT wxObject* wxCreateStoredObject( wxInputStream& stream );
 #endif
 
@@ -160,7 +163,10 @@ wxObject* WXDLLEXPORT_CTORFN wxConstructorFor##name(void) \
 
 #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__
@@ -197,15 +203,18 @@ class WXDLLEXPORT wxObject
 #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
 
@@ -213,7 +222,7 @@ class WXDLLEXPORT wxObject
   virtual void Dump(ostream& str);
 #endif
 
-#ifdef wxUSE_SERIAL
+#if wxUSE_SERIAL
   virtual void StoreObject( wxObjectOutputStream &stream );
   virtual void LoadObject( wxObjectInputStream &stream );
 #endif
@@ -229,7 +238,7 @@ class WXDLLEXPORT wxObject
 
 protected:
   wxObjectRefData*      m_refData;
-#ifdef wxUSE_SERIAL
+#if wxUSE_SERIAL
   wxObject_Serialize*   m_serialObj;
 #endif
 };