declare the wx2os2PenStyle helper in the header.

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

diff --git a/include/wx/object.h b/include/wx/object.h
index 0b72a7243ac6070c6a22c02880efec4a61b8114d..458f5e78e6ad0b6d8857d63f4710fee59a710349 100644 (file)
--- a/include/wx/object.h
+++ b/include/wx/object.h
@@ -170,6 +170,21 @@ wxObject* WXDLLEXPORT_CTORFN wxConstructorFor##name(void) \
         ? (className *)(obj) \
         : (className *)0)
 
         ? (className *)(obj) \
         : (className *)0)
 

+#define wxConstCast(obj, className) ((className *)(obj))
+
+#ifdef __WXDEBUG__
+    inline void wxCheckCast(void *ptr)
+    {
+        wxASSERT_MSG( ptr, _T("wxStaticCast() used incorrectly") );
+    }
+
+    #define wxStaticCast(obj, className) \
+        (wxCheckCast(wxDynamicCast(obj, className)), ((className *)(obj)))
+
+#else // !Debug
+    #define wxStaticCast(obj, className) ((className *)(obj))
+#endif // Debug/!Debug
+

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


@@ -199,11 +214,19 @@ class WXDLLEXPORT wxObject
 
 #if defined(__WXDEBUG__) && wxUSE_MEMORY_TRACING
   void * operator new (size_t size, wxChar * fileName = NULL, int lineNum = 0);
 
 #if defined(__WXDEBUG__) && wxUSE_MEMORY_TRACING
   void * operator new (size_t size, wxChar * fileName = NULL, int lineNum = 0);

+
+#if defined(__VISAGECPP__)
+  #if __DEBUG_ALLOC__
+     void operator delete (void * buf,const char * _fname, size_t _line);
+  #endif  //__DEBUG_ALLOC__
+#else

   void operator delete (void * buf);
   void operator delete (void * buf);

+#endif
+   // defined(__VISAGECPP__)

 
 // VC++ 6.0
 #if defined(__VISUALC__) && (__VISUALC__ >= 1200)
 
 // VC++ 6.0
 #if defined(__VISUALC__) && (__VISUALC__ >= 1200)

-  void operator delete(void *buf, char*, int);
+  void operator delete(void *buf, wxChar*, int);

 #endif
 
     // Causes problems for VC++
 #endif
 
     // Causes problems for VC++


@@ -213,7 +236,8 @@ class WXDLLEXPORT wxObject
 #endif
 
 #ifdef __MWERKS__
 #endif
 
 #ifdef __MWERKS__

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

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


@@ -237,6 +261,14 @@ class WXDLLEXPORT wxObject
   inline wxObjectRefData *GetRefData(void) const { return m_refData; }
   inline void SetRefData(wxObjectRefData *data) { m_refData = data; }
 
   inline wxObjectRefData *GetRefData(void) const { return m_refData; }
   inline void SetRefData(wxObjectRefData *data) { m_refData = data; }
 

+//EK
+#if defined(__WXDEBUG__) && defined(__VISAGECPP__)
+public:
+  static int                        N;
+  static int                        Nid;  // total number of objects and serial counter
+         int                        id; // serial number for current object
+#endif // __WXDEBUG__
+

 protected:
   wxObjectRefData*      m_refData;
 #if wxUSE_SERIAL
 protected:
   wxObjectRefData*      m_refData;
 #if wxUSE_SERIAL