wxX11 and wxMotif STL-ification, part 1. it does not compile.
yet, but keeps the diff between my local copy and HEAD < 4000 lines... git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22209 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -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;
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user