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

Removed obsolete code

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21427 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart 2003-06-26 17:10:14 +00:00
parent 1e0af0bcda
commit b073db94f2
1 changed files with 9 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
include/wx/memory.h
View File

@ -28,22 +28,8 @@
#include <stddef.h>
// Obsolete
#if 0
#if wxUSE_IOSTREAMH
// N.B. BC++ doesn't have istream.h, ostream.h
# include <iostream.h>
#else
# include <iostream>
# if defined(__VISUALC__) || defined(__MWERKS__)
// using namespace std;
# endif
#endif
#endif
#ifdef __WXDEBUG__
// devik 2000-8-27: export these because new/delete operators are now inline
WXDLLEXPORT void * wxDebugAlloc(size_t size, wxChar * fileName, int lineNum, bool isObject, bool isVect = FALSE);
WXDLLEXPORT void wxDebugFree(void * buf, bool isVect = FALSE);
@ -85,28 +71,28 @@ WXDLLEXPORT void wxDebugFree(void * buf, bool isVect = FALSE);
inline void * operator new (size_t size, wxChar * fileName, int lineNum)
{
return wxDebugAlloc(size, fileName, lineNum, FALSE, FALSE);
return wxDebugAlloc(size, fileName, lineNum, FALSE, FALSE);
}
inline void * operator new (size_t size)
{
return wxDebugAlloc(size, NULL, 0, FALSE);
return wxDebugAlloc(size, NULL, 0, FALSE);
}
inline void operator delete (void * buf)
{
wxDebugFree(buf, FALSE);
wxDebugFree(buf, FALSE);
}
#if wxUSE_ARRAY_MEMORY_OPERATORS
inline void * operator new[] (size_t size)
{
return wxDebugAlloc(size, NULL, 0, FALSE, TRUE);
return wxDebugAlloc(size, NULL, 0, FALSE, TRUE);
}
inline void * operator new[] (size_t size, wxChar * fileName, int lineNum)
{
return wxDebugAlloc(size, fileName, lineNum, FALSE, TRUE);
return wxDebugAlloc(size, fileName, lineNum, FALSE, TRUE);
}
inline void operator delete[] (void * buf)
@ -119,11 +105,11 @@ inline void operator delete[] (void * buf)
#if ( defined(__VISUALC__) && (__VISUALC__ >= 1200) ) || defined(__MWERKS__)
inline void operator delete(void* pData, wxChar* /* fileName */, int /* lineNum */)
{
wxDebugFree(pData, FALSE);
wxDebugFree(pData, FALSE);
}
inline void operator delete[](void* pData, wxChar* /* fileName */, int /* lineNum */)
{
wxDebugFree(pData, TRUE);
wxDebugFree(pData, TRUE);
}
#endif // __VISUALC__>=1200
#endif // wxUSE_GLOBAL_MEMORY_OPERATORS
@ -207,11 +193,11 @@ typedef void (wxMemStruct::*PmSFV) ();
/*
Debugging class. This will only have a single instance, but it\'s
Debugging class. This will only have a single instance, but it's
a reasonable way to keep everything together and to make this
available for change if needed by someone else.
A lot of this stuff would be better off within the wxMemStruct class, but
it\'s stuff which we need to access at times when there is no wxMemStruct
it's stuff which we need to access at times when there is no wxMemStruct
object so we use this class instead. Think of it as a collection of
globals which have to do with the wxMemStruct class.
*/
@ -230,12 +216,6 @@ protected:
// Traverse the list.
static void TraverseList (PmSFV, wxMemStruct *from = NULL);
// Obsolete
#if 0
static wxSTD streambuf *m_streamBuf;
static wxSTD ostream *m_debugStream;
#endif
static int debugLevel;
static bool debugOn;
@ -249,16 +229,6 @@ public:
wxDebugContext(void);
~wxDebugContext(void);
// Obsolete
#if 0
static bool HasStream(void) { return (m_debugStream != NULL); };
static wxSTD ostream& GetStream(void) { return *m_debugStream; }
static wxSTD streambuf *GetStreamBuf(void) { return m_streamBuf; }
static void SetStream(wxSTD ostream *stream, wxSTD streambuf *buf = NULL);
static bool SetFile(const wxString& file);
static bool SetStandardError(void);
#endif
static int GetLevel(void) { return debugLevel; }
static void SetLevel(int level) { debugLevel = level; }
@ -343,7 +313,6 @@ inline void wxTraceLevel(int WXUNUSED(level), const wxChar *WXUNUSED(fmt)) {}
#define WXTRACE TRUE ? (void)0 : wxTrace
#define WXTRACELEVEL TRUE ? (void)0 : wxTraceLevel
// #define WXDEBUG_NEW new
#endif // __WXDEBUG__