fixing osx_carbon

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

diff --git a/src/common/dynload.cpp b/src/common/dynload.cpp
index 5cb065859d11077c14e0475edeabb83159b2f98a..a76a1907334f1b9e80f6586ee1d6932271deea68 100644 (file)
--- a/src/common/dynload.cpp
+++ b/src/common/dynload.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

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

 // Purpose:      Dynamic loading framework
 // Author:       Ron Lee, David Falkinder, Vadim Zeitlin and a cast of 1000's
 //               (derived in part from dynlib.cpp (c) 1998 Guilhem Lavaux)
 // Purpose:      Dynamic loading framework
 // Author:       Ron Lee, David Falkinder, Vadim Zeitlin and a cast of 1000's
 //               (derived in part from dynlib.cpp (c) 1998 Guilhem Lavaux)


@@ -31,12 +31,12 @@
     #include "wx/intl.h"
     #include "wx/hash.h"
     #include "wx/utils.h"
     #include "wx/intl.h"
     #include "wx/hash.h"
     #include "wx/utils.h"

+    #include "wx/module.h"

 #endif
 
 #include "wx/strconv.h"
 
 #include "wx/dynload.h"
 #endif
 
 #include "wx/strconv.h"
 
 #include "wx/dynload.h"

-#include "wx/module.h"

 
 
 // ---------------------------------------------------------------------------
 
 
 // ---------------------------------------------------------------------------


@@ -61,8 +61,7 @@ public:
 
     virtual void OnExit()
     {
 
     virtual void OnExit()
     {

-        delete wxPluginLibrary::ms_classes;
-        wxPluginLibrary::ms_classes = NULL;
+        wxDELETE(wxPluginLibrary::ms_classes);

         wxPluginManager::ClearManifest();
     }
 
         wxPluginManager::ClearManifest();
     }
 


@@ -77,9 +76,9 @@ wxPluginLibrary::wxPluginLibrary(const wxString &libname, int flags)
         : m_linkcount(1)
         , m_objcount(0)
 {
         : m_linkcount(1)
         , m_objcount(0)
 {

-    m_before = wxClassInfo::sm_first;
+    m_before = wxClassInfo::GetFirst();

     Load( libname, flags );
     Load( libname, flags );

-    m_after = wxClassInfo::sm_first;
+    m_after = wxClassInfo::GetFirst();

 
     if( m_handle != 0 )
     {
 
     if( m_handle != 0 )
     {


@@ -105,7 +104,7 @@ wxPluginLibrary::~wxPluginLibrary()
 wxPluginLibrary *wxPluginLibrary::RefLib()
 {
     wxCHECK_MSG( m_linkcount > 0, NULL,
 wxPluginLibrary *wxPluginLibrary::RefLib()
 {
     wxCHECK_MSG( m_linkcount > 0, NULL,

-                 _T("Library had been already deleted!") );
+                 wxT("Library had been already deleted!") );

 
     ++m_linkcount;
     return this;
 
     ++m_linkcount;
     return this;


@@ -114,7 +113,7 @@ wxPluginLibrary *wxPluginLibrary::RefLib()
 bool wxPluginLibrary::UnrefLib()
 {
     wxASSERT_MSG( m_objcount == 0,
 bool wxPluginLibrary::UnrefLib()
 {
     wxASSERT_MSG( m_objcount == 0,

-                  _T("Library unloaded before all objects were destroyed") );
+                  wxT("Library unloaded before all objects were destroyed") );

 
     if ( m_linkcount == 0 || --m_linkcount == 0 )
     {
 
     if ( m_linkcount == 0 || --m_linkcount == 0 )
     {


@@ -131,7 +130,7 @@ bool wxPluginLibrary::UnrefLib()
 
 void wxPluginLibrary::UpdateClasses()
 {
 
 void wxPluginLibrary::UpdateClasses()
 {

-    for (wxClassInfo *info = m_after; info != m_before; info = info->m_next)
+    for (const wxClassInfo *info = m_after; info != m_before; info = info->GetNext())

     {
         if( info->GetClassName() )
         {
     {
         if( info->GetClassName() )
         {


@@ -148,7 +147,7 @@ void wxPluginLibrary::RestoreClasses()
     if (!ms_classes)
         return;
 
     if (!ms_classes)
         return;
 

-    for(wxClassInfo *info = m_after; info != m_before; info = info->m_next)
+    for(const wxClassInfo *info = m_after; info != m_before; info = info->GetNext())

     {
         ms_classes->erase(ms_classes->find(info->GetClassName()));
     }
     {
         ms_classes->erase(ms_classes->find(info->GetClassName()));
     }


@@ -165,15 +164,15 @@ void wxPluginLibrary::RegisterModules()
     // though, as there is currently no way to Unregister it without it.
 
     wxASSERT_MSG( m_linkcount == 1,
     // though, as there is currently no way to Unregister it without it.
 
     wxASSERT_MSG( m_linkcount == 1,

-                  _T("RegisterModules should only be called for the first load") );
+                  wxT("RegisterModules should only be called for the first load") );

 
 

-    for ( wxClassInfo *info = m_after; info != m_before; info = info->m_next)
+    for ( const wxClassInfo *info = m_after; info != m_before; info = info->GetNext())

     {
         if( info->IsKindOf(CLASSINFO(wxModule)) )
         {
             wxModule *m = wxDynamicCast(info->CreateObject(), wxModule);
 
     {
         if( info->IsKindOf(CLASSINFO(wxModule)) )
         {
             wxModule *m = wxDynamicCast(info->CreateObject(), wxModule);
 

-            wxASSERT_MSG( m, _T("wxDynamicCast of wxModule failed") );
+            wxASSERT_MSG( m, wxT("wxDynamicCast of wxModule failed") );

 
             m_wxmodules.push_back(m);
             wxModule::RegisterModule(m);
 
             m_wxmodules.push_back(m);
             wxModule::RegisterModule(m);


@@ -188,7 +187,7 @@ void wxPluginLibrary::RegisterModules()
     {
         if( !(*it)->Init() )
         {
     {
         if( !(*it)->Init() )
         {

-            wxLogDebug(_T("wxModule::Init() failed for wxPluginLibrary"));
+            wxLogDebug(wxT("wxModule::Init() failed for wxPluginLibrary"));

 
             // XXX: Watch this, a different hash implementation might break it,
             //      a good hash implementation would let us fix it though.
 
             // XXX: Watch this, a different hash implementation might break it,
             //      a good hash implementation would let us fix it though.


@@ -258,8 +257,8 @@ wxPluginManager::LoadLibrary(const wxString &libname, int flags)
 
     if ( entry )
     {
 
     if ( entry )
     {

-        wxLogTrace(_T("dll"),
-                   _T("LoadLibrary(%s): already loaded."), realname.c_str());
+        wxLogTrace(wxT("dll"),
+                   wxT("LoadLibrary(%s): already loaded."), realname.c_str());

 
         entry->RefLib();
     }
 
         entry->RefLib();
     }


@@ -271,20 +270,20 @@ wxPluginManager::LoadLibrary(const wxString &libname, int flags)
         {
             (*ms_manifest)[realname] = entry;
 
         {
             (*ms_manifest)[realname] = entry;
 

-            wxLogTrace(_T("dll"),
-                       _T("LoadLibrary(%s): loaded ok."), realname.c_str());
+            wxLogTrace(wxT("dll"),
+                       wxT("LoadLibrary(%s): loaded ok."), realname.c_str());

 
         }
         else
         {
 
         }
         else
         {

-            wxLogTrace(_T("dll"),
-                       _T("LoadLibrary(%s): failed to load."), realname.c_str());
+            wxLogTrace(wxT("dll"),
+                       wxT("LoadLibrary(%s): failed to load."), realname.c_str());

 
             // we have created entry just above
             if ( !entry->UnrefLib() )
             {
                 // ... so UnrefLib() is supposed to delete it
 
             // we have created entry just above
             if ( !entry->UnrefLib() )
             {
                 // ... so UnrefLib() is supposed to delete it

-                wxFAIL_MSG( _T("Currently linked library is not loaded?") );
+                wxFAIL_MSG( wxT("Currently linked library is not loaded?") );

             }
 
             entry = NULL;
             }
 
             entry = NULL;


@@ -309,13 +308,13 @@ bool wxPluginManager::UnloadLibrary(const wxString& libname)
 
     if ( !entry )
     {
 
     if ( !entry )
     {

-        wxLogDebug(_T("Attempt to unload library '%s' which is not loaded."),
+        wxLogDebug(wxT("Attempt to unload library '%s' which is not loaded."),

                    libname.c_str());
 
         return false;
     }
 
                    libname.c_str());
 
         return false;
     }
 

-    wxLogTrace(_T("dll"), _T("UnloadLibrary(%s)"), realname.c_str());
+    wxLogTrace(wxT("dll"), wxT("UnloadLibrary(%s)"), realname.c_str());

 
     if ( !entry->UnrefLib() )
     {
 
     if ( !entry->UnrefLib() )
     {


@@ -341,7 +340,7 @@ bool wxPluginManager::Load(const wxString &libname, int flags)
 
 void wxPluginManager::Unload()
 {
 
 void wxPluginManager::Unload()
 {

-    wxCHECK_RET( m_entry, _T("unloading an invalid wxPluginManager?") );
+    wxCHECK_RET( m_entry, wxT("unloading an invalid wxPluginManager?") );

 
     for ( wxDLManifest::iterator i = ms_manifest->begin();
           i != ms_manifest->end();
 
     for ( wxDLManifest::iterator i = ms_manifest->begin();
           i != ms_manifest->end();


@@ -360,4 +359,3 @@ void wxPluginManager::Unload()
 }
 
 #endif  // wxUSE_DYNAMIC_LOADER
 }
 
 #endif  // wxUSE_DYNAMIC_LOADER

-