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

USE_xxx constants renamed to wxUSE_xxx. This is an incompatible change, you

Browse Source 
must recompile everything after upgrading!


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@774 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
1998-09-25 13:28:52 +00:00
parent d069d02e1e
commit 47d67540a0
166 changed files with 1374 additions and 1314 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/common/object.cpp
View File

@@ -22,7 +22,7 @@
#ifndef WX_PRECOMP
#include "wx/hash.h"
#ifdef USE_SERIAL
#ifdef wxUSE_SERIAL
#include "wx/objstrm.h"
#include "wx/serbase.h"
#endif
@@ -31,11 +31,11 @@
#include <string.h>
#include <assert.h>
#if (WXDEBUG && USE_MEMORY_TRACING) || USE_DEBUG_CONTEXT
#if (WXDEBUG && wxUSE_MEMORY_TRACING) || wxUSE_DEBUG_CONTEXT
#include "wx/memory.h"
#endif
#if WXDEBUG || USE_DEBUG_CONTEXT
#if WXDEBUG || wxUSE_DEBUG_CONTEXT
// for wxObject::Dump
#include <iostream.h>
#endif
@@ -53,7 +53,7 @@ wxHashTable* wxClassInfo::sm_classTable = (wxHashTable*) NULL;
wxObject::wxObject(void)
{
m_refData = (wxObjectRefData *) NULL;
#ifdef USE_SERIAL
#ifdef wxUSE_SERIAL
m_serialObj = (wxObject_Serialize *)NULL;
#endif
}
@@ -61,7 +61,7 @@ wxObject::wxObject(void)
wxObject::~wxObject(void)
{
UnRef();
#ifdef USE_SERIAL
#ifdef wxUSE_SERIAL
if (m_serialObj)
delete m_serialObj;
#endif
@@ -83,7 +83,7 @@ bool wxObject::IsKindOf(wxClassInfo *info) const
return FALSE;
}
#if WXDEBUG || USE_DEBUG_CONTEXT
#if WXDEBUG || wxUSE_DEBUG_CONTEXT
void wxObject::Dump(ostream& str)
{
if (GetClassInfo() && GetClassInfo()->GetClassName())
@@ -93,7 +93,7 @@ void wxObject::Dump(ostream& str)
}
#endif
#if WXDEBUG && USE_MEMORY_TRACING
#if WXDEBUG && wxUSE_MEMORY_TRACING
#ifdef new
#undef new
@@ -258,7 +258,7 @@ wxObject *wxCreateDynamicObject(const char *name)
return (wxObject*) NULL;
}
#ifdef USE_SERIAL
#ifdef wxUSE_SERIAL
#include "wx/serbase.h"
#include "wx/dynlib.h"