restored wxPluginLibrary::ms_classes handling code that was removed by mistake
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25515 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -93,6 +93,8 @@ private:
|
||||
size_t m_objcount; // ..and (pluggable) object instantiations.
|
||||
wxModuleList m_wxmodules; // any wxModules that we initialised.
|
||||
|
||||
void UpdateClasses(); // Update ms_classes
|
||||
void RestoreClasses(); // Removes this library from ms_classes
|
||||
void RegisterModules(); // Init any wxModules in the lib.
|
||||
void UnregisterModules(); // Cleanup any wxModules we installed.
|
||||
|
||||
|
@@ -87,6 +87,7 @@ wxPluginLibrary::wxPluginLibrary(const wxString &libname, int flags)
|
||||
|
||||
if( m_handle != 0 )
|
||||
{
|
||||
UpdateClasses();
|
||||
RegisterModules();
|
||||
}
|
||||
else
|
||||
@@ -101,6 +102,7 @@ wxPluginLibrary::~wxPluginLibrary()
|
||||
if( m_handle != 0 )
|
||||
{
|
||||
UnregisterModules();
|
||||
RestoreClasses();
|
||||
}
|
||||
}
|
||||
|
||||
@@ -131,6 +133,27 @@ bool wxPluginLibrary::UnrefLib()
|
||||
// Private methods
|
||||
// ------------------------
|
||||
|
||||
void wxPluginLibrary::UpdateClasses()
|
||||
{
|
||||
for (wxClassInfo *info = m_after; info != m_before; info = info->m_next)
|
||||
{
|
||||
if( info->m_className )
|
||||
{
|
||||
// Hash all the class names into a local table too so
|
||||
// we can quickly find the entry they correspond to.
|
||||
(*ms_classes)[info->m_className] = this;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
void wxPluginLibrary::RestoreClasses()
|
||||
{
|
||||
for(wxClassInfo *info = m_after; info != m_before; info = info->m_next)
|
||||
{
|
||||
ms_classes->erase(ms_classes->find(info->m_className));
|
||||
}
|
||||
}
|
||||
|
||||
void wxPluginLibrary::RegisterModules()
|
||||
{
|
||||
// Plugin libraries might have wxModules, Register and initialise them if
|
||||
|
Reference in New Issue
Block a user