wxComboControl and wxOwnerDrawnComboBox (patch 1479938)

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

diff --git a/src/common/module.cpp b/src/common/module.cpp
index 5a65c70b940e411664d506e19ed5f185de2f2eaf..961d478d933c55cb1036e3da6210d90cc8ba2e03 100644 (file)
--- a/src/common/module.cpp
+++ b/src/common/module.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        module.cpp
+// Name:        src/common/module.cpp

 // Purpose:     Modules initialization/destruction
 // Author:      Wolfram Gloger/adapted by Guilhem Lavaux
 // Modified by:
 // Purpose:     Modules initialization/destruction
 // Author:      Wolfram Gloger/adapted by Guilhem Lavaux
 // Modified by:


@@ -9,22 +9,26 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#ifdef __GNUG__
-#pragma implementation "module.h"
-#endif
-

 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__

-#pragma hdrstop
+    #pragma hdrstop

 #endif
 
 #include "wx/module.h"
 #endif
 
 #include "wx/module.h"

-#include "wx/hash.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/hash.h"
+    #include "wx/intl.h"
+    #include "wx/log.h"
+#endif
+

 #include "wx/listimpl.cpp"
 
 #include "wx/listimpl.cpp"
 

-WX_DEFINE_LIST(wxModuleList);
+#define TRACE_MODULE _T("module")
+
+WX_DEFINE_LIST(wxModuleList)

 
 IMPLEMENT_CLASS(wxModule, wxObject)
 
 
 IMPLEMENT_CLASS(wxModule, wxObject)
 


@@ -35,21 +39,29 @@ void wxModule::RegisterModule(wxModule* module)
     m_modules.Append(module);
 }
 
     m_modules.Append(module);
 }
 

+void wxModule::UnregisterModule(wxModule* module)
+{
+    m_modules.DeleteObject(module);
+    delete module;
+}
+

 // Collect up all module-derived classes, create an instance of each,
 // and register them.
 void wxModule::RegisterModules()
 {
 // Collect up all module-derived classes, create an instance of each,
 // and register them.
 void wxModule::RegisterModules()
 {

-    wxNode *node;
+    wxHashTable::compatibility_iterator node;

     wxClassInfo* classInfo;
 
     wxClassInfo::sm_classTable->BeginFind();
     node = wxClassInfo::sm_classTable->Next();
     while (node)
     {
     wxClassInfo* classInfo;
 
     wxClassInfo::sm_classTable->BeginFind();
     node = wxClassInfo::sm_classTable->Next();
     while (node)
     {

-        classInfo = (wxClassInfo *)node->Data();
+        classInfo = (wxClassInfo *)node->GetData();

         if ( classInfo->IsKindOf(CLASSINFO(wxModule)) &&
         if ( classInfo->IsKindOf(CLASSINFO(wxModule)) &&

-            (classInfo != (& (wxModule::sm_classwxModule))) )
+            (classInfo != (& (wxModule::ms_classInfo))) )

         {
         {

+            wxLogTrace(TRACE_MODULE, wxT("Registering module %s"),
+                       classInfo->GetClassName());

             wxModule* module = (wxModule *)classInfo->CreateObject();
             RegisterModule(module);
         }
             wxModule* module = (wxModule *)classInfo->CreateObject();
             RegisterModule(module);
         }


@@ -60,35 +72,39 @@ void wxModule::RegisterModules()
 bool wxModule::InitializeModules()
 {
     // Initialize user-defined modules
 bool wxModule::InitializeModules()
 {
     // Initialize user-defined modules

-    wxModuleList::Node *node;
+    wxModuleList::compatibility_iterator node;

     for ( node = m_modules.GetFirst(); node; node = node->GetNext() )
     {
     for ( node = m_modules.GetFirst(); node; node = node->GetNext() )
     {

-        if ( !node->GetData()->Init() )
+        wxModule *module = node->GetData();
+        if ( !module->Init() )

         {
         {

+            wxLogError(_("Module \"%s\" initialization failed"),
+                       module->GetClassInfo()->GetClassName());
+

             // clean up already initialized modules - process in reverse order
             // clean up already initialized modules - process in reverse order

-            wxModuleList::Node *n;
+            wxModuleList::compatibility_iterator n;

             for ( n = node->GetPrevious(); n; n = n->GetPrevious() )
             {
                 n->GetData()->OnExit();
             }
 
             for ( n = node->GetPrevious(); n; n = n->GetPrevious() )
             {
                 n->GetData()->OnExit();
             }
 

-            return FALSE;
+            return false;

         }
     }
 
         }
     }
 

-    return TRUE;
+    return true;

 }
 
 void wxModule::CleanUpModules()
 {
     // Cleanup user-defined modules
 }
 
 void wxModule::CleanUpModules()
 {
     // Cleanup user-defined modules

-    wxModuleList::Node *node;
+    wxModuleList::compatibility_iterator node;

     for ( node = m_modules.GetFirst(); node; node = node->GetNext() )
     {
     for ( node = m_modules.GetFirst(); node; node = node->GetNext() )
     {

+        wxLogTrace(TRACE_MODULE, wxT("Cleanup module %s"),
+                   node->GetData()->GetClassInfo()->GetClassName());

         node->GetData()->Exit();
     }
 
         node->GetData()->Exit();
     }
 

-    m_modules.DeleteContents(TRUE);
-    m_modules.Clear();
+    WX_CLEAR_LIST(wxModuleList, m_modules);

 }
 }

-