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

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

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files

8
src/common/object.cpp
View File

@@ -31,11 +31,11 @@
#include <string.h>
#include <assert.h>
#if (WXDEBUG && wxUSE_MEMORY_TRACING) || wxUSE_DEBUG_CONTEXT
#if (defined(__WXDEBUG__) && wxUSE_MEMORY_TRACING) || wxUSE_DEBUG_CONTEXT
#include "wx/memory.h"
#endif
#if WXDEBUG || wxUSE_DEBUG_CONTEXT
#if defined(__WXDEBUG__) || wxUSE_DEBUG_CONTEXT
// for wxObject::Dump
#if wxUSE_IOSTREAMH
# include <iostream.h>
@@ -90,7 +90,7 @@ bool wxObject::IsKindOf(wxClassInfo *info) const
return FALSE;
}
#if WXDEBUG || wxUSE_DEBUG_CONTEXT
#if defined(__WXDEBUG__) || wxUSE_DEBUG_CONTEXT
void wxObject::Dump(ostream& str)
{
if (GetClassInfo() && GetClassInfo()->GetClassName())
@@ -100,7 +100,7 @@ void wxObject::Dump(ostream& str)
}
#endif
#if WXDEBUG && wxUSE_MEMORY_TRACING
#if defined(__WXDEBUG__) && wxUSE_MEMORY_TRACING
#ifdef new
#undef new