// (derived in part from dynlib.cpp (c) 1998 Guilhem Lavaux)
// Modified by:
// Created: 03/12/01
-// RCS-ID: $Id$
// Copyright: (c) 2001 Ron Lee <ron@debian.org>
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
const wxClassInfo* const oldFirst = wxClassInfo::GetFirst();
Load( libname, flags );
- // It is simple to know what is the last object we registered, it's just
- // the new head of the wxClassInfo list:
- m_ourLast = wxClassInfo::GetFirst();
+ // It is simple to know what is the first object in the linked list of
+ // wxClassInfo that we registered (it's also the last one chronologically),
+ // it's just the new head of the wxClassInfo list:
+ m_ourFirst = wxClassInfo::GetFirst();
// But to find the first wxClassInfo created by this library we need to
// iterate until we get to the previous head as we don't have the links in
// the backwards direction:
- if ( m_ourLast != oldFirst )
+ if ( m_ourFirst != oldFirst )
{
- for ( const wxClassInfo* info = m_ourLast; ; info = info->GetNext() )
+ for ( const wxClassInfo* info = m_ourFirst; ; info = info->GetNext() )
{
if ( info->GetNext() == oldFirst )
{
- m_ourFirst = info;
+ m_ourLast = info;
break;
}
}
{
for ( const wxClassInfo *info = m_ourFirst; ; info = info->GetNext() )
{
- if( info->IsKindOf(CLASSINFO(wxModule)) )
+ if( info->IsKindOf(wxCLASSINFO(wxModule)) )
{
wxModule *m = wxDynamicCast(info->CreateObject(), wxModule);
wxString realname(libname);
if( !(flags & wxDL_VERBATIM) )
- realname += wxDynamicLibrary::GetDllExt();
+ realname += wxDynamicLibrary::GetDllExt(wxDL_MODULE);
wxPluginLibrary *entry;
if ( !entry )
{
- realname += wxDynamicLibrary::GetDllExt();
+ realname += wxDynamicLibrary::GetDllExt(wxDL_MODULE);
entry = FindByName(realname);
}