Warning fixes found under hardest mode of OpenWatcom. Seems clean in Borland, MinGW...

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

diff --git a/src/common/bmpbase.cpp b/src/common/bmpbase.cpp
index 6e007f98f4335d099dc1a59d6dbfe4f369963dc5..bc718b14e681a1dcf68c3a845df10aa8b8e54a66 100644 (file)
--- a/src/common/bmpbase.cpp
+++ b/src/common/bmpbase.cpp
@@ -8,7 +8,7 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
 #pragma implementation "bitmapbase.h"
 #endif
 
@@ -19,7 +19,7 @@
     #pragma hdrstop
 #endif
 
-#if defined(__WXMGL__) || defined(__WXMAC__) || defined(__WXCOCOA__) \
+#if defined(__WXMGL__) || defined(__WXMAC__) \
     || defined(__WXMOTIF__) || defined(__WXX11__)
 
 #include "wx/setup.h"
@@ -52,15 +52,15 @@ bool wxBitmapBase::RemoveHandler(const wxString& name)
     if ( handler )
     {
         sm_handlers.DeleteObject(handler);
-        return TRUE;
+        return true;
     }
     else
-        return FALSE;
+        return false;
 }
 
 wxBitmapHandler *wxBitmapBase::FindHandler(const wxString& name)
 {
-    wxList::Node *node = sm_handlers.GetFirst();
+    wxList::compatibility_iterator node = sm_handlers.GetFirst();
     while ( node )
     {
         wxBitmapHandler *handler = (wxBitmapHandler *)node->GetData();
@@ -73,7 +73,7 @@ wxBitmapHandler *wxBitmapBase::FindHandler(const wxString& name)
 
 wxBitmapHandler *wxBitmapBase::FindHandler(const wxString& extension, wxBitmapType bitmapType)
 {
-    wxList::Node *node = sm_handlers.GetFirst();
+    wxList::compatibility_iterator node = sm_handlers.GetFirst();
     while ( node )
     {
         wxBitmapHandler *handler = (wxBitmapHandler *)node->GetData();
@@ -87,7 +87,7 @@ wxBitmapHandler *wxBitmapBase::FindHandler(const wxString& extension, wxBitmapTy
 
 wxBitmapHandler *wxBitmapBase::FindHandler(wxBitmapType bitmapType)
 {
-    wxList::Node *node = sm_handlers.GetFirst();
+    wxList::compatibility_iterator node = sm_handlers.GetFirst();
     while ( node )
     {
         wxBitmapHandler *handler = (wxBitmapHandler *)node->GetData();
@@ -100,13 +100,13 @@ wxBitmapHandler *wxBitmapBase::FindHandler(wxBitmapType bitmapType)
 
 void wxBitmapBase::CleanUpHandlers()
 {
-    wxList::Node *node = sm_handlers.GetFirst();
+    wxList::compatibility_iterator node = sm_handlers.GetFirst();
     while ( node )
     {
         wxBitmapHandler *handler = (wxBitmapHandler *)node->GetData();
-        wxList::Node *next = node->GetNext();
+        wxList::compatibility_iterator next = node->GetNext();
         delete handler;
-        delete node;
+        sm_handlers.Erase(node);
         node = next;
     }
 }
@@ -116,7 +116,7 @@ class wxBitmapBaseModule: public wxModule
 DECLARE_DYNAMIC_CLASS(wxBitmapBaseModule)
 public:
     wxBitmapBaseModule() {}
-    bool OnInit() { wxBitmap::InitStandardHandlers(); return TRUE; };
+    bool OnInit() { wxBitmap::InitStandardHandlers(); return true; };
     void OnExit() { wxBitmap::CleanUpHandlers(); };
 };