From: David Webster <Dave.Webster@bhmi.com>
Date: Tue, 24 Oct 2000 21:45:56 +0000 (+0000)
Subject: Updates for os/2 -- mostly to allow easier VA debugging
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/4720388fc5fa81fbec8e80ea95dfe59cf45db7a5?ds=inline

Updates for os/2 -- mostly to allow easier VA debugging


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@8629 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---

diff --git a/include/wx/object.h b/include/wx/object.h
index 3ce6e27bc3..458f5e78e6 100644
--- a/include/wx/object.h
+++ b/include/wx/object.h
@@ -214,7 +214,15 @@ class WXDLLEXPORT wxObject
 
 #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);
+#endif
+   // defined(__VISAGECPP__)
 
 // VC++ 6.0
 #if defined(__VISUALC__) && (__VISUALC__ >= 1200)
@@ -253,6 +261,14 @@ class WXDLLEXPORT wxObject
   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
diff --git a/include/wx/wx.h b/include/wx/wx.h
index 719a25e964..6221ac02be 100644
--- a/include/wx/wx.h
+++ b/include/wx/wx.h
@@ -1,3 +1,6 @@
+#ifndef _WX_WXH__
+#define _WX_WXH__
+
 /////////////////////////////////////////////////////////////////////////////
 // Name:        wx.h
 // Purpose:     wxWindows main include file
@@ -9,9 +12,6 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifndef _WX_WXH__
-#define _WX_WXH__
-
 #include "wx/defs.h"
 #include "wx/object.h"
 #include "wx/dynarray.h"
@@ -59,23 +59,27 @@
 #include "wx/radiobut.h"
 #include "wx/textctrl.h"
 #include "wx/slider.h"
+#if !defined(__VISAGECPP__) // cyclic dependency
 #include "wx/gauge.h"
+#include "wx/scrolwin.h"
+#include "wx/dirdlg.h"
+#include "wx/toolbar.h"
+#endif
 #include "wx/combobox.h"
 #include "wx/layout.h"
 #include "wx/sizer.h"
 #include "wx/memory.h"
 #include "wx/mdi.h"
-#include "wx/scrolwin.h"
 #include "wx/statusbr.h"
 #include "wx/scrolbar.h"
 #include "wx/choicdlg.h"
 #include "wx/textdlg.h"
 #include "wx/filedlg.h"
-#include "wx/dirdlg.h"
-#include "wx/toolbar.h"
 
 #include "wx/validate.h"        // always include, even if !wxUSE_VALIDATORS
 
+#if !defined(__VISAGECPP__) // cyclic dependency
+
 #if wxUSE_VALIDATORS
     #include "wx/valtext.h"
 #endif // wxUSE_VALIDATORS
@@ -85,6 +89,8 @@
     #include "wx/serbase.h"
 #endif // wxUSE_SERIAL
 
+#endif // __VISAGECPP__
+
 #endif // wxUSE_GUI
 
 #endif