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

Added new dynamic loading classes. (which handle proper

Browse Source 
wxRTTI and wxModule initialisation and unloading)
Removed serialisation code from wxObject and elsewhere.
Added USER_EXPORTED hash and list macros.
Added *_PLUGGABLE_CLASS defines for exporting dynamic wxObjects
from dlls.

 ----------------------------------------------------------------------
 Modified Files:
 	Makefile.in configure configure.in setup.h.in debian/changelog
 	distrib/msw/tmake/filelist.txt include/wx/defs.h
 	include/wx/docview.h include/wx/dynlib.h include/wx/fileconf.h
 	include/wx/hash.h include/wx/list.h include/wx/module.h
 	include/wx/object.h include/wx/resource.h include/wx/stream.h
 	include/wx/gtk/setup0.h include/wx/msw/setup0.h src/files.lst
 	src/wxBase.dsp src/wxUniv.dsp src/wxWindows.dsp
 	src/common/dynlib.cpp src/common/filename.cpp
 	src/common/module.cpp src/common/object.cpp
 	src/common/stream.cpp src/gtk/files.lst src/mac/files.lst
 	src/mgl/files.lst src/mgl/makefile.wat src/motif/files.lst
 	src/msw/dialup.cpp src/msw/files.lst src/msw/helpchm.cpp
 	src/msw/makefile.b32 src/msw/makefile.bcc src/msw/makefile.dos
 	src/msw/makefile.g95 src/msw/makefile.sc src/msw/makefile.vc
 	src/msw/makefile.wat src/os2/files.lst src/univ/files.lst
 Added Files:
 	include/wx/dynload.h src/common/dynload.cpp
 Removed Files:
 	include/wx/objstrm.h include/wx/serbase.h
 	src/common/objstrm.cpp src/common/serbase.cpp
 	utils/serialize/.cvsignore utils/serialize/makefile.b32
 	utils/serialize/sercore.cpp utils/serialize/sercore.h
 	utils/serialize/serctrl.cpp utils/serialize/serctrl.h
 	utils/serialize/serext.cpp utils/serialize/serext.h
 	utils/serialize/sergdi.cpp utils/serialize/sergdi.h
 	utils/serialize/sermain.cpp utils/serialize/serwnd.cpp
 	utils/serialize/serwnd.h
 ----------------------------------------------------------------------


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@13088 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Ron Lee
2001-12-19 07:09:58 +00:00
parent 955b11918b
commit 0b9ab0bd82
66 changed files with 1838 additions and 3658 deletions
Download Patch File Download Diff File Expand all files Collapse all files

336
src/common/object.cpp
View File

@@ -2,10 +2,11 @@
// Name: object.cpp
// Purpose: wxObject implementation
// Author: Julian Smart
// Modified by:
// Modified by: Ron Lee
// Created: 04/01/98
// RCS-ID: $Id$
// Copyright: (c) Julian Smart and Markus Holzem
// Copyright: (c) 1998 Julian Smart and Markus Holzem
// (c) 2001 Ron Lee <ron@debian.org>
// Licence: wxWindows license
/////////////////////////////////////////////////////////////////////////////
@@ -13,7 +14,8 @@
#pragma implementation "object.h"
#endif
// For compilers that support precompilation, includes "wx.h".
// For compilers that support precompilation, includes "wx.h".
#include "wx/wxprec.h"
#ifdef __BORLANDC__
@@ -21,20 +23,7 @@
#endif
#ifndef WX_PRECOMP
#include "wx/hash.h"
#if wxUSE_SERIAL
#include "wx/objstrm.h"
#include "wx/serbase.h"
// for error messages
#include "wx/log.h"
#include "wx/intl.h"
#endif // wxUSE_SERIAL
#endif // WX_PRECOMP
#ifdef __VISAGECPP__
#include "wx/objstrm.h"
#include "wx/serbase.h"
#include "wx/hash.h"
#endif
#include <string.h>
@@ -46,62 +35,39 @@
#if defined(__WXDEBUG__) || wxUSE_DEBUG_CONTEXT
// for wxObject::Dump
#include "wx/ioswrap.h"
#if defined(__VISAGECPP__)
// help with VA debugging
#define DEBUG_PRINTF(NAME) { static int raz=0; \
printf( #NAME " %i\n",raz); fflush(stdout); \
raz++; \
}
#else
#define DEBUG_PRINTF(NAME)
#endif
#include "wx/ioswrap.h"
#if defined(__VISAGECPP__)
#define DEBUG_PRINTF(NAME) { static int raz=0; \
printf( #NAME " %i\n",raz); fflush(stdout); raz++; }
#else
#define DEBUG_PRINTF(NAME)
#endif
wxClassInfo wxObject::sm_classwxObject((wxChar *) wxT("wxObject"), (wxChar *) NULL, (wxChar *) NULL, (int ) sizeof(wxObject), (wxObjectConstructorFn) NULL);
wxClassInfo* wxClassInfo::sm_first = (wxClassInfo *) NULL;
wxHashTable* wxClassInfo::sm_classTable = (wxHashTable*) NULL;
#endif
wxClassInfo wxObject::sm_classwxObject( wxT("wxObject"), 0, 0,
(int) sizeof(wxObject),
(wxObjectConstructorFn) 0 );
wxClassInfo* wxClassInfo::sm_first = 0;
wxHashTable* wxClassInfo::sm_classTable = 0;
// These are here so we can avoid 'always true/false' warnings
// by referring to these instead of TRUE/FALSE
// These are here so we can avoid 'always true/false' warnings
// by referring to these instead of TRUE/FALSE
const bool wxTrue = TRUE;
const bool wxFalse = FALSE;
/*
* wxWindows root object.
*/
wxObject::wxObject()
{
m_refData = (wxObjectRefData *) NULL;
#if wxUSE_SERIAL
m_serialObj = (wxObject_Serialize *)NULL;
#endif
}
wxObject::~wxObject()
{
UnRef();
#if wxUSE_SERIAL
if (m_serialObj)
delete m_serialObj;
#endif
}
/*
* Is this object a kind of (a subclass of) 'info'?
* E.g. is wxWindow a kind of wxObject?
* Go from this class to superclass, taking into account
* two possible base classes.
*/
// Is this object a kind of (a subclass of) 'info'?
// E.g. is wxWindow a kind of wxObject?
// Go from this class to superclass, taking into account
// two possible base classes.
bool wxObject::IsKindOf(wxClassInfo *info) const
{
wxClassInfo *thisInfo = GetClassInfo();
if (thisInfo)
return thisInfo->IsKindOf(info);
else
return FALSE;
return (thisInfo) ? thisInfo->IsKindOf(info) : FALSE ;
}
#if wxUSE_STD_IOSTREAM && (defined(__WXDEBUG__) || wxUSE_DEBUG_CONTEXT)
@@ -120,115 +86,64 @@ void wxObject::Dump(wxSTD ostream& str)
#undef new
#endif
void *wxObject::operator new (size_t size, wxChar * fileName, int lineNum)
void *wxObject::operator new (size_t size, wxChar *fileName, int lineNum)
{
return wxDebugAlloc(size, fileName, lineNum, TRUE);
}
#if defined(__VISAGECPP__)
# if __DEBUG_ALLOC__
void wxObject::operator delete (void * buf,const char * _fname, size_t _line)
#ifndef __VISAGECPP__
void wxObject::operator delete (void *buf)
{
wxDebugFree(buf);
}
# endif //__DEBUG_ALLOC__
#else
void wxObject::operator delete (void * buf)
#elif __DEBUG_ALLOC__
void wxObject::operator delete (void *buf, const char *_fname, size_t _line)
{
wxDebugFree(buf);
}
#endif // __VISAGECPP__
#endif
// VC++ 6.0
// VC++ 6.0
#if defined(__VISUALC__) && (__VISUALC__ >= 1200)
void wxObject::operator delete(void* pData, wxChar* /* fileName */, int /* lineNum */)
void wxObject::operator delete(void *pData, wxChar *WXUNUSED(fileName), int WXUNUSED(lineNum))
{
::operator delete(pData);
}
#endif
// Cause problems for VC++ - crashes
// Cause problems for VC++ - crashes
#if (!defined(__VISUALC__) && wxUSE_ARRAY_MEMORY_OPERATORS ) || defined(__MWERKS__)
void * wxObject::operator new[] (size_t size, wxChar * fileName, int lineNum)
void *wxObject::operator new[] (size_t size, wxChar *fileName, int lineNum)
{
return wxDebugAlloc(size, fileName, lineNum, TRUE, TRUE);
}
void wxObject::operator delete[] (void * buf)
void wxObject::operator delete[] (void *buf)
{
wxDebugFree(buf, TRUE);
}
#endif
#endif
#endif // __WXDEBUG__ && wxUSE_MEMORY_TRACING
/*
* Class info: provides run-time class type information.
*/
wxClassInfo::wxClassInfo(const wxChar *cName,
const wxChar *baseName1,
const wxChar *baseName2,
int sz,
wxObjectConstructorFn constr)
// ----------------------------------------------------------------------------
// wxClassInfo
// ----------------------------------------------------------------------------
wxClassInfo *wxClassInfo::FindClass(const wxChar *className)
{
m_className = cName;
m_baseClassName1 = baseName1;
m_baseClassName2 = baseName2;
for(wxClassInfo *info = sm_first; info ; info = info->m_next)
if( wxStrcmp(info->GetClassName(), className) == 0 )
return info;
m_objectSize = sz;
m_objectConstructor = constr;
m_next = sm_first;
sm_first = this;
m_baseInfo1 = (wxClassInfo *) NULL;
m_baseInfo2 = (wxClassInfo *) NULL;
return 0;
}
wxObject *wxClassInfo::CreateObject()
{
if (m_objectConstructor)
return (wxObject *)(*m_objectConstructor)();
else
return (wxObject *) NULL;
}
// Set pointers to base class(es) to speed up IsKindOf
wxClassInfo *wxClassInfo::FindClass(const wxChar *c)
{
wxClassInfo *p = sm_first;
while (p)
{
if ( wxStrcmp(p->GetClassName(), c) == 0 )
break;
p = p->m_next;
}
return p;
}
// Climb upwards through inheritance hierarchy.
// Dual inheritance is catered for.
bool wxClassInfo::IsKindOf(const wxClassInfo *info) const
{
if (info == NULL)
return FALSE;
if (this == info)
return TRUE;
if (m_baseInfo1)
if (m_baseInfo1->IsKindOf(info))
return TRUE;
if (m_baseInfo2)
return m_baseInfo2->IsKindOf(info);
return FALSE;
}
// Set pointers to base class(es) to speed up IsKindOf
void wxClassInfo::InitializeClasses()
{
// using IMPLEMENT_DYNAMIC_CLASS() macro twice (which may happen if you
@@ -236,47 +151,45 @@ void wxClassInfo::InitializeClasses()
// because it will enter an infinite loop and eventually die with "out of
// memory" - as this is quite hard to detect if you're unaware of this,
// try to do some checks here
#ifdef __WXDEBUG__
// more classes than we'll ever have
static const size_t nMaxClasses = 10000;
static const size_t nMaxClasses = 10000; // more than we'll ever have
size_t nClass = 0;
#endif // Debug
#endif
wxClassInfo::sm_classTable = new wxHashTable(wxKEY_STRING);
// Index all class infos by their class name
wxClassInfo *info = sm_first;
while (info)
// Index all class infos by their class name
wxClassInfo *info;
for(info = sm_first; info; info = info->m_next)
{
if (info->m_className)
{
wxASSERT_MSG( ++nClass < nMaxClasses,
_T("an infinite loop detected - have you used IMPLEMENT_DYNAMIC_CLASS() twice (may be by linking some object module(s) twice)?") );
sm_classTable->Put(info->m_className, (wxObject *)info);
}
info = info->m_next;
}
// Set base pointers for each wxClassInfo
info = sm_first;
while (info)
// Set base pointers for each wxClassInfo
for(info = sm_first; info; info = info->m_next)
{
if (info->GetBaseClassName1())
info->m_baseInfo1 = (wxClassInfo *)sm_classTable->Get(info->GetBaseClassName1());
if (info->GetBaseClassName2())
info->m_baseInfo2 = (wxClassInfo *)sm_classTable->Get(info->GetBaseClassName2());
info = info->m_next;
}
}
void wxClassInfo::CleanUpClasses()
{
delete wxClassInfo::sm_classTable;
wxClassInfo::sm_classTable = NULL;
wxClassInfo::sm_classTable = 0;
}
wxObject *wxCreateDynamicObject(const wxChar *name)
{
#if defined(__WXDEBUG__) || wxUSE_DEBUG_CONTEXT
@@ -286,104 +199,34 @@ wxObject *wxCreateDynamicObject(const wxChar *name)
if (wxClassInfo::sm_classTable)
{
wxClassInfo *info = (wxClassInfo *)wxClassInfo::sm_classTable->Get(name);
if (!info)
return (wxObject *)NULL;
return info->CreateObject();
return info != 0 ? info->CreateObject() : 0;
}
else
{
wxClassInfo *info = wxClassInfo::sm_first;
while (info)
{
for(wxClassInfo *info = wxClassInfo::sm_first; info; info = info->m_next)
if (info->m_className && wxStrcmp(info->m_className, name) == 0)
return info->CreateObject();
info = info->m_next;
}
return (wxObject*) NULL;
return 0;
}
}
#if wxUSE_SERIAL
#include "wx/serbase.h"
#include "wx/dynlib.h"
wxObject* wxCreateStoredObject( wxInputStream &stream )
{
wxObjectInputStream obj_s(stream);
return obj_s.LoadObject();
};
void wxObject::StoreObject( wxObjectOutputStream& stream )
{
#if defined(__WXDEBUG__) || wxUSE_DEBUG_CONTEXT
DEBUG_PRINTF(wxObject::StoreObject)
#endif
wxString obj_name = wxString(GetClassInfo()->GetClassName()) + "_Serialize";
wxLibrary *lib = wxTheLibraries.LoadLibrary("wxserial");
if (!lib) {
wxLogError(_("Can't load wxSerial dynamic library."));
return;
}
if (!m_serialObj) {
m_serialObj = (WXSERIAL(wxObject) *)lib->CreateObject( obj_name );
if (!m_serialObj) {
wxLogError(_("Can't find the serialization object '%s' "
"for the object '%s'."),
obj_name.c_str(),
GetClassInfo()->GetClassName());
return;
}
m_serialObj->SetObject(this);
}
m_serialObj->StoreObject(stream);
}
void wxObject::LoadObject( wxObjectInputStream& stream )
{
#if defined(__WXDEBUG__) || wxUSE_DEBUG_CONTEXT
DEBUG_PRINTF(wxObject::LoadObject)
#endif
wxString obj_name = wxString(GetClassInfo()->GetClassName()) + "_Serialize";
wxLibrary *lib = wxTheLibraries.LoadLibrary("wxserial");
if (!m_serialObj) {
m_serialObj = (WXSERIAL(wxObject) *)lib->CreateObject( obj_name );
if (!m_serialObj) {
wxLogError(_("Can't find the serialization object '%s' "
"for the object '%s'."),
obj_name.c_str(),
GetClassInfo()->GetClassName());
return;
}
m_serialObj->SetObject(this);
}
m_serialObj->LoadObject(stream);
}
#endif // wxUSE_SERIAL
/*
* wxObject: cloning of objects
*/
// ----------------------------------------------------------------------------
// wxClassInfo
// ----------------------------------------------------------------------------
void wxObject::Ref(const wxObject& clone)
{
#if defined(__WXDEBUG__) || wxUSE_DEBUG_CONTEXT
DEBUG_PRINTF(wxObject::Ref)
#endif
// delete reference to old data
// delete reference to old data
UnRef();
// reference new data
if (clone.m_refData) {
if( clone.m_refData )
{
m_refData = clone.m_refData;
++(m_refData->m_count);
}
@@ -391,27 +234,16 @@ void wxObject::Ref(const wxObject& clone)
void wxObject::UnRef()
{
if ( m_refData )
if( m_refData )
{
wxASSERT_MSG( m_refData->m_count > 0, _T("invalid ref data count") );
if ( !--m_refData->m_count )
delete m_refData;
m_refData = (wxObjectRefData *) NULL;
m_refData = 0;
}
}
/*
* wxObjectData
*/
wxObjectRefData::wxObjectRefData(void) : m_count(1)
{
}
wxObjectRefData::~wxObjectRefData()
{
}
#if defined(__DARWIN__) && defined(DYLIB_INIT)
@@ -420,11 +252,11 @@ extern "C" {
void wxWindowsDylibInit(void);
};
// Dynamic shared library (dylib) initialization routine
// required to initialize static C++ objects bacause of lazy dynamic linking
// http://developer.apple.com/techpubs/macosx/Essentials/
// SystemOverview/Frameworks/Dynamic_Shared_Libraries.html
//
// Dynamic shared library (dylib) initialization routine
// required to initialize static C++ objects bacause of lazy dynamic linking
// http://developer.apple.com/techpubs/macosx/Essentials/
// SystemOverview/Frameworks/Dynamic_Shared_Libraries.html
void wxWindowsDylibInit()
{
// The function __initialize_Cplusplus() must be called from the shared
@@ -435,3 +267,5 @@ void wxWindowsDylibInit()
}
#endif
// vi:sts=4:sw=4:et