made wxList methods return compatibility_iterator instead of Node * to further reduce...

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

diff --git a/src/common/bmpbase.cpp b/src/common/bmpbase.cpp
index bc47df63a5217c506521cda5736539095c96fecd..1090664724b366f2882a46d4991a4c7794f96471 100644 (file)
--- a/src/common/bmpbase.cpp
+++ b/src/common/bmpbase.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        bitmap.cpp
+// Name:        src/common/bmpbase.cpp

 // Purpose:     wxBitmapBase
 // Author:      VaclavSlavik
 // Created:     2001/04/11
 // Purpose:     wxBitmapBase
 // Author:      VaclavSlavik
 // Created:     2001/04/11


@@ -8,10 +8,6 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

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

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


@@ -19,8 +15,12 @@
     #pragma hdrstop
 #endif
 
     #pragma hdrstop
 #endif
 

-#include "wx/wx.h"
-#include "wx/setup.h"
+#if defined(__WXMGL__)   || \
+    defined(__WXMAC__)   || \
+    defined(__WXGTK__)   || \
+    defined(__WXMOTIF__) || \
+    defined(__WXX11__)
+

 #include "wx/utils.h"
 #include "wx/palette.h"
 #include "wx/bitmap.h"
 #include "wx/utils.h"
 #include "wx/palette.h"
 #include "wx/bitmap.h"


@@ -50,61 +50,61 @@ bool wxBitmapBase::RemoveHandler(const wxString& name)
     if ( handler )
     {
         sm_handlers.DeleteObject(handler);
     if ( handler )
     {
         sm_handlers.DeleteObject(handler);

-        return TRUE;
+        return true;

     }
     else
     }
     else

-        return FALSE;
+        return false;

 }
 
 wxBitmapHandler *wxBitmapBase::FindHandler(const wxString& name)
 {
 }
 
 wxBitmapHandler *wxBitmapBase::FindHandler(const wxString& name)
 {

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

     while ( node )
     {
     while ( node )
     {

-        wxBitmapHandler *handler = (wxBitmapHandler *)node->Data();
+        wxBitmapHandler *handler = (wxBitmapHandler *)node->GetData();

         if ( handler->GetName() == name )
             return handler;
         if ( handler->GetName() == name )
             return handler;

-        node = node->Next();
+        node = node->GetNext();

     }
     return NULL;
 }
 
 wxBitmapHandler *wxBitmapBase::FindHandler(const wxString& extension, wxBitmapType bitmapType)
 {
     }
     return NULL;
 }
 
 wxBitmapHandler *wxBitmapBase::FindHandler(const wxString& extension, wxBitmapType bitmapType)
 {

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

     while ( node )
     {
     while ( node )
     {

-        wxBitmapHandler *handler = (wxBitmapHandler *)node->Data();
+        wxBitmapHandler *handler = (wxBitmapHandler *)node->GetData();

         if ( handler->GetExtension() == extension &&
         if ( handler->GetExtension() == extension &&

-                    (bitmapType == -1 || handler->GetType() == bitmapType) )
+                    (bitmapType == wxBITMAP_TYPE_ANY || handler->GetType() == bitmapType) )

             return handler;
             return handler;

-        node = node->Next();
+        node = node->GetNext();

     }
     return NULL;
 }
 
 wxBitmapHandler *wxBitmapBase::FindHandler(wxBitmapType bitmapType)
 {
     }
     return NULL;
 }
 
 wxBitmapHandler *wxBitmapBase::FindHandler(wxBitmapType bitmapType)
 {

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

     while ( node )
     {
     while ( node )
     {

-        wxBitmapHandler *handler = (wxBitmapHandler *)node->Data();
+        wxBitmapHandler *handler = (wxBitmapHandler *)node->GetData();

         if (handler->GetType() == bitmapType)
             return handler;
         if (handler->GetType() == bitmapType)
             return handler;

-        node = node->Next();
+        node = node->GetNext();

     }
     return NULL;
 }
 
 void wxBitmapBase::CleanUpHandlers()
 {
     }
     return NULL;
 }
 
 void wxBitmapBase::CleanUpHandlers()
 {

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

     while ( node )
     {
     while ( node )
     {

-        wxBitmapHandler *handler = (wxBitmapHandler *)node->Data();
-        wxNode *next = node->Next();
+        wxBitmapHandler *handler = (wxBitmapHandler *)node->GetData();
+        wxList::compatibility_iterator next = node->GetNext();

         delete handler;
         delete handler;

-        delete node;
+        sm_handlers.Erase(node);

         node = next;
     }
 }
         node = next;
     }
 }


@@ -114,8 +114,10 @@ class wxBitmapBaseModule: public wxModule
 DECLARE_DYNAMIC_CLASS(wxBitmapBaseModule)
 public:
     wxBitmapBaseModule() {}
 DECLARE_DYNAMIC_CLASS(wxBitmapBaseModule)
 public:
     wxBitmapBaseModule() {}

-    bool OnInit() { wxBitmap::InitStandardHandlers(); return TRUE; };
+    bool OnInit() { wxBitmap::InitStandardHandlers(); return true; };

     void OnExit() { wxBitmap::CleanUpHandlers(); };
 };
 
 IMPLEMENT_DYNAMIC_CLASS(wxBitmapBaseModule, wxModule)
     void OnExit() { wxBitmap::CleanUpHandlers(); };
 };
 
 IMPLEMENT_DYNAMIC_CLASS(wxBitmapBaseModule, wxModule)

+
+#endif // __WXMGL__ || __WXMAC__ || __WXCOCOA__ || __WXMOTIF__ || __WXX11__