X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/62ad3cb358891240142cbf33259758bbe79be53f..1e52188741389278cd99abf79218162c87024ba3:/src/common/bmpbase.cpp?ds=sidebyside diff --git a/src/common/bmpbase.cpp b/src/common/bmpbase.cpp index 6e007f98f4..3db6041ebd 100644 --- 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" @@ -60,7 +60,7 @@ bool wxBitmapBase::RemoveHandler(const wxString& name) 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; } }