Remove incorrect and unnecessary wxEntryCleanup declaration.

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

diff --git a/src/common/image.cpp b/src/common/image.cpp
index baa5f6b8b425730d9de4125aa00ea970b48f6889..5192bc06d82624615a223c22b73fd72852bd5a86 100644 (file)
--- a/src/common/image.cpp
+++ b/src/common/image.cpp
@@ -1128,7 +1128,7 @@ bool wxImage::CanRead( wxInputStream &stream )
 {
     const wxList& list = GetHandlers();
 
 {
     const wxList& list = GetHandlers();
 

-    for ( wxList::Node *node = list.GetFirst(); node; node = node->GetNext() )
+    for ( wxList::compatibility_iterator node = list.GetFirst(); node; node = node->GetNext() )

     {
         wxImageHandler *handler=(wxImageHandler*)node->GetData();
         if (handler->CanRead( stream ))
     {
         wxImageHandler *handler=(wxImageHandler*)node->GetData();
         if (handler->CanRead( stream ))


@@ -1146,7 +1146,7 @@ int wxImage::GetImageCount( wxInputStream &stream, long type )
     {
         wxList &list=GetHandlers();
 
     {
         wxList &list=GetHandlers();
 

-        for (wxList::Node *node = list.GetFirst(); node; node = node->GetNext())
+        for (wxList::compatibility_iterator node = list.GetFirst(); node; node = node->GetNext())

         {
              handler=(wxImageHandler*)node->GetData();
              if ( handler->CanRead(stream) )
         {
              handler=(wxImageHandler*)node->GetData();
              if ( handler->CanRead(stream) )


@@ -1189,7 +1189,7 @@ bool wxImage::LoadFile( wxInputStream& stream, long type, int index )
     {
         wxList &list=GetHandlers();
 
     {
         wxList &list=GetHandlers();
 

-        for ( wxList::Node *node = list.GetFirst(); node; node = node->GetNext() )
+        for ( wxList::compatibility_iterator node = list.GetFirst(); node; node = node->GetNext() )

         {
              handler=(wxImageHandler*)node->GetData();
              if ( handler->CanRead(stream) )
         {
              handler=(wxImageHandler*)node->GetData();
              if ( handler->CanRead(stream) )


@@ -1266,9 +1266,6 @@ bool wxImage::SaveFile( wxOutputStream& stream, const wxString& mimetype ) const
 
 void wxImage::AddHandler( wxImageHandler *handler )
 {
 
 void wxImage::AddHandler( wxImageHandler *handler )
 {

-    // make sure that the memory will be freed at the program end
-    sm_handlers.DeleteContents(true);
-

     // Check for an existing handler of the type being added.
     if (FindHandler( handler->GetType() ) == 0)
     {
     // Check for an existing handler of the type being added.
     if (FindHandler( handler->GetType() ) == 0)
     {


@@ -1290,9 +1287,6 @@ void wxImage::AddHandler( wxImageHandler *handler )
 
 void wxImage::InsertHandler( wxImageHandler *handler )
 {
 
 void wxImage::InsertHandler( wxImageHandler *handler )
 {

-    // make sure that the memory will be freed at the program end
-    sm_handlers.DeleteContents(true);
-

     // Check for an existing handler of the type being added.
     if (FindHandler( handler->GetType() ) == 0)
     {
     // Check for an existing handler of the type being added.
     if (FindHandler( handler->GetType() ) == 0)
     {


@@ -1313,6 +1307,7 @@ bool wxImage::RemoveHandler( const wxString& name )
     if (handler)
     {
         sm_handlers.DeleteObject(handler);
     if (handler)
     {
         sm_handlers.DeleteObject(handler);

+        delete handler;

         return true;
     }
     else
         return true;
     }
     else


@@ -1321,7 +1316,7 @@ bool wxImage::RemoveHandler( const wxString& name )
 
 wxImageHandler *wxImage::FindHandler( const wxString& name )
 {
 
 wxImageHandler *wxImage::FindHandler( const wxString& name )
 {

-    wxNode *node = sm_handlers.GetFirst();
+    wxList::compatibility_iterator node = sm_handlers.GetFirst();

     while (node)
     {
         wxImageHandler *handler = (wxImageHandler*)node->GetData();
     while (node)
     {
         wxImageHandler *handler = (wxImageHandler*)node->GetData();


@@ -1334,7 +1329,7 @@ wxImageHandler *wxImage::FindHandler( const wxString& name )
 
 wxImageHandler *wxImage::FindHandler( const wxString& extension, long bitmapType )
 {
 
 wxImageHandler *wxImage::FindHandler( const wxString& extension, long bitmapType )
 {

-    wxNode *node = sm_handlers.GetFirst();
+    wxList::compatibility_iterator node = sm_handlers.GetFirst();

     while (node)
     {
         wxImageHandler *handler = (wxImageHandler*)node->GetData();
     while (node)
     {
         wxImageHandler *handler = (wxImageHandler*)node->GetData();


@@ -1348,7 +1343,7 @@ wxImageHandler *wxImage::FindHandler( const wxString& extension, long bitmapType
 
 wxImageHandler *wxImage::FindHandler( long bitmapType )
 {
 
 wxImageHandler *wxImage::FindHandler( long bitmapType )
 {

-    wxNode *node = sm_handlers.GetFirst();
+    wxList::compatibility_iterator node = sm_handlers.GetFirst();

     while (node)
     {
         wxImageHandler *handler = (wxImageHandler *)node->GetData();
     while (node)
     {
         wxImageHandler *handler = (wxImageHandler *)node->GetData();


@@ -1360,7 +1355,7 @@ wxImageHandler *wxImage::FindHandler( long bitmapType )
 
 wxImageHandler *wxImage::FindHandlerMime( const wxString& mimetype )
 {
 
 wxImageHandler *wxImage::FindHandlerMime( const wxString& mimetype )
 {

-    wxNode *node = sm_handlers.GetFirst();
+    wxList::compatibility_iterator node = sm_handlers.GetFirst();

     while (node)
     {
         wxImageHandler *handler = (wxImageHandler *)node->GetData();
     while (node)
     {
         wxImageHandler *handler = (wxImageHandler *)node->GetData();


@@ -1379,24 +1374,24 @@ void wxImage::InitStandardHandlers()
 
 void wxImage::CleanUpHandlers()
 {
 
 void wxImage::CleanUpHandlers()
 {

-    wxNode *node = sm_handlers.GetFirst();
+    wxList::compatibility_iterator node = sm_handlers.GetFirst();

     while (node)
     {
         wxImageHandler *handler = (wxImageHandler *)node->GetData();
     while (node)
     {
         wxImageHandler *handler = (wxImageHandler *)node->GetData();

-        wxNode *next = node->GetNext();
+        wxList::compatibility_iterator next = node->GetNext();

         delete handler;
         delete handler;

-        delete node;

         node = next;
     }
         node = next;
     }

-}

 
 

+    sm_handlers.Clear();
+}

 
 wxString wxImage::GetImageExtWildcard()
 {
     wxString fmts;
 
     wxList& Handlers = wxImage::GetHandlers();
 
 wxString wxImage::GetImageExtWildcard()
 {
     wxString fmts;
 
     wxList& Handlers = wxImage::GetHandlers();

-    wxNode* Node = Handlers.GetFirst();
+    wxList::compatibility_iterator Node = Handlers.GetFirst();

     while ( Node )
     {
         wxImageHandler* Handler = (wxImageHandler*)Node->GetData();
     while ( Node )
     {
         wxImageHandler* Handler = (wxImageHandler*)Node->GetData();


@@ -1408,7 +1403,6 @@ wxString wxImage::GetImageExtWildcard()
     return wxT("(") + fmts + wxT(")|") + fmts;
 }
 
     return wxT("(") + fmts + wxT(")|") + fmts;
 }
 

-

 //-----------------------------------------------------------------------------
 // wxImageHandler
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 // wxImageHandler
 //-----------------------------------------------------------------------------