Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@8629 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
David Webster
2000-10-24 21:45:56 +00:00
parent b078fa025d
commit 4720388fc5
2 changed files with 28 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
include/wx/object.h
View File

@@ -214,7 +214,15 @@ class WXDLLEXPORT wxObject
#if defined(__WXDEBUG__) && wxUSE_MEMORY_TRACING #if defined(__WXDEBUG__) && wxUSE_MEMORY_TRACING
void * operator new (size_t size, wxChar * fileName = NULL, int lineNum = 0); 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 // VC++ 6.0
#if defined(__VISUALC__) && (__VISUALC__ >= 1200) #if defined(__VISUALC__) && (__VISUALC__ >= 1200)
@@ -253,6 +261,14 @@ class WXDLLEXPORT wxObject
inline wxObjectRefData *GetRefData(void) const { return m_refData; } inline wxObjectRefData *GetRefData(void) const { return m_refData; }
inline void SetRefData(wxObjectRefData *data) { m_refData = data; } 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: protected:
wxObjectRefData* m_refData; wxObjectRefData* m_refData;
#if wxUSE_SERIAL #if wxUSE_SERIAL

18
include/wx/wx.h
View File

@@ -1,3 +1,6 @@
#ifndef _WX_WXH__
#define _WX_WXH__
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
// Name: wx.h // Name: wx.h
// Purpose: wxWindows main include file // Purpose: wxWindows main include file
@@ -9,9 +12,6 @@
// Licence: wxWindows licence // Licence: wxWindows licence
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
#ifndef _WX_WXH__
#define _WX_WXH__
#include "wx/defs.h" #include "wx/defs.h"
#include "wx/object.h" #include "wx/object.h"
#include "wx/dynarray.h" #include "wx/dynarray.h"
@@ -59,23 +59,27 @@
#include "wx/radiobut.h" #include "wx/radiobut.h"
#include "wx/textctrl.h" #include "wx/textctrl.h"
#include "wx/slider.h" #include "wx/slider.h"
#if !defined(__VISAGECPP__) // cyclic dependency
#include "wx/gauge.h" #include "wx/gauge.h"
#include "wx/scrolwin.h"
#include "wx/dirdlg.h"
#include "wx/toolbar.h"
#endif
#include "wx/combobox.h" #include "wx/combobox.h"
#include "wx/layout.h" #include "wx/layout.h"
#include "wx/sizer.h" #include "wx/sizer.h"
#include "wx/memory.h" #include "wx/memory.h"
#include "wx/mdi.h" #include "wx/mdi.h"
#include "wx/scrolwin.h"
#include "wx/statusbr.h" #include "wx/statusbr.h"
#include "wx/scrolbar.h" #include "wx/scrolbar.h"
#include "wx/choicdlg.h" #include "wx/choicdlg.h"
#include "wx/textdlg.h" #include "wx/textdlg.h"
#include "wx/filedlg.h" #include "wx/filedlg.h"
#include "wx/dirdlg.h"
#include "wx/toolbar.h"
#include "wx/validate.h" // always include, even if !wxUSE_VALIDATORS #include "wx/validate.h" // always include, even if !wxUSE_VALIDATORS
#if !defined(__VISAGECPP__) // cyclic dependency
#if wxUSE_VALIDATORS #if wxUSE_VALIDATORS
#include "wx/valtext.h" #include "wx/valtext.h"
#endif // wxUSE_VALIDATORS #endif // wxUSE_VALIDATORS
@@ -85,6 +89,8 @@
#include "wx/serbase.h" #include "wx/serbase.h"
#endif // wxUSE_SERIAL #endif // wxUSE_SERIAL
#endif // __VISAGECPP__
#endif // wxUSE_GUI #endif // wxUSE_GUI
#endif #endif