X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/68379eaf0ae64d105f8244b1db83e793f7dd83b0..588c80dea16b3ab32c7f1f8f15b62eb4450a20a9:/src/common/dynload.cpp diff --git a/src/common/dynload.cpp b/src/common/dynload.cpp index 854d7c3049..562b6ce975 100644 --- a/src/common/dynload.cpp +++ b/src/common/dynload.cpp @@ -10,10 +10,6 @@ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) -#pragma implementation "dynload.h" -#endif - // ---------------------------------------------------------------------------- // headers // ---------------------------------------------------------------------------- @@ -137,11 +133,11 @@ void wxPluginLibrary::UpdateClasses() { for (wxClassInfo *info = m_after; info != m_before; info = info->m_next) { - if( info->m_className ) + if( info->GetClassName() ) { // 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; + (*ms_classes)[info->GetClassName()] = this; } } } @@ -154,7 +150,7 @@ void wxPluginLibrary::RestoreClasses() for(wxClassInfo *info = m_after; info != m_before; info = info->m_next) { - ms_classes->erase(ms_classes->find(info->m_className)); + ms_classes->erase(ms_classes->find(info->GetClassName())); } } @@ -526,13 +522,13 @@ wxLibraries::wxLibraries():m_loaded(wxKEY_STRING) wxLibraries::~wxLibraries() { - wxNode *node = m_loaded.First(); + wxNode *node = m_loaded.GetFirst(); while (node) { - wxLibrary *lib = (wxLibrary *)node->Data(); + wxLibrary *lib = (wxLibrary *)node->GetData(); delete lib; - node = node->Next(); + node = node->GetNext(); } } @@ -543,7 +539,7 @@ wxLibrary *wxLibraries::LoadLibrary(const wxString& name) wxNode *node = m_loaded.Find(name.GetData()); if (node != NULL) - return ((wxLibrary *)node->Data()); + return ((wxLibrary *)node->GetData()); // If DLL shares data, this is necessary. old_sm_first = wxClassInfo::sm_first; @@ -567,15 +563,15 @@ wxLibrary *wxLibraries::LoadLibrary(const wxString& name) wxObject *wxLibraries::CreateObject(const wxString& path) { - wxNode *node = m_loaded.First(); + wxNode *node = m_loaded.GetFirst(); wxObject *obj; while (node) { - obj = ((wxLibrary *)node->Data())->CreateObject(path); + obj = ((wxLibrary *)node->GetData())->CreateObject(path); if (obj) return obj; - node = node->Next(); + node = node->GetNext(); } return NULL; }