Removed references to DEBUG and WXDEBUG; cured Motif font problem; removed

some warnings in OGL; fixed bug in wxChoice


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@974 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
1998-11-09 11:57:05 +00:00
parent 605c9c8318
commit ea57084d10
47 changed files with 205 additions and 321 deletions

View File

@@ -187,7 +187,7 @@ class WXDLLEXPORT wxObject
bool IsKindOf(wxClassInfo *info) const;
#if WXDEBUG && wxUSE_MEMORY_TRACING
#if defined(__WXDEBUG__) && wxUSE_MEMORY_TRACING
void * operator new (size_t size, char * fileName = NULL, int lineNum = 0);
void operator delete (void * buf);
@@ -204,7 +204,7 @@ class WXDLLEXPORT wxObject
#endif
#if WXDEBUG || wxUSE_DEBUG_CONTEXT
#if defined(__WXDEBUG__) || wxUSE_DEBUG_CONTEXT
virtual void Dump(ostream& str);
#endif
@@ -246,7 +246,7 @@ private:
int m_count;
};
#if WXDEBUG && wxUSE_GLOBAL_MEMORY_OPERATORS
#if defined(__WXDEBUG__) && wxUSE_GLOBAL_MEMORY_OPERATORS
//#ifndef WXDEBUG_NEW
//#define WXDEBUG_NEW new(__FILE__,__LINE__)
//#endif