merged 2 overloaded functions into a single membersections

[wxWidgets.git] / src / common / module.cpp

diff --git a/src/common/module.cpp b/src/common/module.cpp
index f1d0bebed748271964c2af7a3f90eb2601d75392..8397312756c520a4f07b0ba53c8639d1a719f20b 100644 (file)
--- a/src/common/module.cpp
+++ b/src/common/module.cpp
@@ -24,14 +24,7 @@
 #include "wx/hash.h"
 #include "wx/listimpl.cpp"
 
-#ifdef __SALFORDC__
-void wxwxModuleListNode::DeleteData()
-{
-    delete (_WX_LIST_ITEM_TYPE_wxModuleList *)GetData();
-}
-#else
 WX_DEFINE_LIST(wxModuleList);
-#endif
 
 IMPLEMENT_CLASS(wxModule, wxObject)
 
@@ -42,6 +35,11 @@ void wxModule::RegisterModule(wxModule* module)
     m_modules.Append(module);
 }
 
+void wxModule::UnregisterModule(wxModule* module)
+{
+    m_modules.DeleteObject(module);
+}
+
 // Collect up all module-derived classes, create an instance of each,
 // and register them.
 void wxModule::RegisterModules()
@@ -53,7 +51,7 @@ void wxModule::RegisterModules()
     node = wxClassInfo::sm_classTable->Next();
     while (node)
     {
-        classInfo = (wxClassInfo *)node->Data();
+        classInfo = (wxClassInfo *)node->GetData();
         if ( classInfo->IsKindOf(CLASSINFO(wxModule)) &&
             (classInfo != (& (wxModule::sm_classwxModule))) )
         {