headers are now installed by automake too

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

diff --git a/include/wx/object.h b/include/wx/object.h
index 174561f43d8126e42322e92c6d02b34b05865088..61c34c41ecfd9f4757cef9c57931ba45a8fa7b12 100644 (file)
--- a/include/wx/object.h
+++ b/include/wx/object.h
@@ -192,11 +192,13 @@ class WXDLLEXPORT wxObject
   virtual ~wxObject(void);
 
   virtual wxClassInfo *GetClassInfo(void) const { return &sm_classwxObject; }
   virtual ~wxObject(void);
 
   virtual wxClassInfo *GetClassInfo(void) const { return &sm_classwxObject; }

+  wxObject *Clone(void) const;
+  virtual void CopyObject(wxObject& object_dest) const;

 
   bool IsKindOf(wxClassInfo *info) const;
 
 #if defined(__WXDEBUG__) && wxUSE_MEMORY_TRACING
 
   bool IsKindOf(wxClassInfo *info) const;
 
 #if defined(__WXDEBUG__) && wxUSE_MEMORY_TRACING

-  void * operator new (size_t size, char * fileName = NULL, int lineNum = 0);
+  void * operator new (size_t size, wxChar * fileName = NULL, int lineNum = 0);

   void operator delete (void * buf);
 
 // VC++ 6.0
   void operator delete (void * buf);
 
 // VC++ 6.0


@@ -206,12 +208,12 @@ class WXDLLEXPORT wxObject
 
     // Causes problems for VC++
 #if wxUSE_ARRAY_MEMORY_OPERATORS && !defined(__VISUALC__) && !defined( __MWERKS__)
 
     // Causes problems for VC++
 #if wxUSE_ARRAY_MEMORY_OPERATORS && !defined(__VISUALC__) && !defined( __MWERKS__)

-  void * operator new[] (size_t size, char * fileName = NULL, int lineNum = 0);
+  void * operator new[] (size_t size, wxChar * fileName = NULL, int lineNum = 0);

   void operator delete[] (void * buf);
 #endif
 
 #ifdef __MWERKS__
   void operator delete[] (void * buf);
 #endif
 
 #ifdef __MWERKS__

-  void * operator new[] (size_t size, char * fileName  , int lineNum = 0);
+  void * operator new[] (size_t size, wxChar * fileName  , int lineNum = 0);

   void operator delete[] (void * buf);
 #endif
 
   void operator delete[] (void * buf);
 #endif
 


@@ -261,7 +263,7 @@ private:
 
 #ifdef __WXDEBUG__
 #ifndef WXDEBUG_NEW
 
 #ifdef __WXDEBUG__
 #ifndef WXDEBUG_NEW

-#define WXDEBUG_NEW new(__FILE__,__LINE__)
+#define WXDEBUG_NEW new(__TFILE__,__LINE__)

 #endif
 #else
 #define WXDEBUG_NEW new
 #endif
 #else
 #define WXDEBUG_NEW new


@@ -272,7 +274,7 @@ private:
 // use WXDEBUG_NEW explicitly if you wish to use the debugging version.
 
 #if defined(__WXDEBUG__) && wxUSE_GLOBAL_MEMORY_OPERATORS && wxUSE_DEBUG_NEW_ALWAYS
 // 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__)
+#define new new(__TFILE__,__LINE__)

 #endif
 
 #endif
 #endif
 
 #endif