Added some tentative wxMotif clipboard code; did some file formatting

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

diff --git a/include/wx/object.h b/include/wx/object.h
index 2791952dcb5a6aa7370017362ce1a23eda69a073..b16265669a6797c85f538cd204d81f36dcf76355 100644 (file)
--- a/include/wx/object.h
+++ b/include/wx/object.h
@@ -23,11 +23,14 @@ class WXDLLEXPORT wxObject;
 
 #if wxUSE_DYNAMIC_CLASSES
 
 
 #if wxUSE_DYNAMIC_CLASSES
 

-#ifdef __GNUWIN32__
+// #ifdef __GNUWIN32__

 #ifdef GetClassName
 #undef GetClassName
 #endif
 #ifdef GetClassName
 #undef GetClassName
 #endif

+#ifdef GetClassInfo
+#undef GetClassInfo

 #endif
 #endif

+// #endif

 
 class WXDLLEXPORT wxClassInfo;
 class WXDLLEXPORT wxInputStream;
 
 class WXDLLEXPORT wxClassInfo;
 class WXDLLEXPORT wxInputStream;


@@ -160,7 +163,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 +196,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