// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
-#ifdef __GNUG__
-#pragma implementation "bitmapbase.h"
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
+#ifdef __BORLANDC__
+ #pragma hdrstop
#endif
-#include "wx/wx.h"
+#if defined(__WXMGL__) || \
+ defined(__WXMAC__) || \
+ defined(__WXGTK__) || \
+ defined(__WXMOTIF__) || \
+ defined(__WXX11__)
+
#include "wx/setup.h"
#include "wx/utils.h"
#include "wx/palette.h"
if ( handler )
{
sm_handlers.DeleteObject(handler);
- return TRUE;
+ return true;
}
else
- return FALSE;
+ return false;
}
wxBitmapHandler *wxBitmapBase::FindHandler(const wxString& name)
{
- wxNode *node = sm_handlers.First();
+ wxList::compatibility_iterator node = sm_handlers.GetFirst();
while ( node )
{
- wxBitmapHandler *handler = (wxBitmapHandler *)node->Data();
+ wxBitmapHandler *handler = (wxBitmapHandler *)node->GetData();
if ( handler->GetName() == name )
return handler;
- node = node->Next();
+ node = node->GetNext();
}
return NULL;
}
wxBitmapHandler *wxBitmapBase::FindHandler(const wxString& extension, wxBitmapType bitmapType)
{
- wxNode *node = sm_handlers.First();
+ wxList::compatibility_iterator node = sm_handlers.GetFirst();
while ( node )
{
- wxBitmapHandler *handler = (wxBitmapHandler *)node->Data();
+ wxBitmapHandler *handler = (wxBitmapHandler *)node->GetData();
if ( handler->GetExtension() == extension &&
- (bitmapType == -1 || handler->GetType() == bitmapType) )
+ (bitmapType == wxBITMAP_TYPE_ANY || handler->GetType() == bitmapType) )
return handler;
- node = node->Next();
+ node = node->GetNext();
}
return NULL;
}
wxBitmapHandler *wxBitmapBase::FindHandler(wxBitmapType bitmapType)
{
- wxNode *node = sm_handlers.First();
+ wxList::compatibility_iterator node = sm_handlers.GetFirst();
while ( node )
{
- wxBitmapHandler *handler = (wxBitmapHandler *)node->Data();
+ wxBitmapHandler *handler = (wxBitmapHandler *)node->GetData();
if (handler->GetType() == bitmapType)
return handler;
- node = node->Next();
+ node = node->GetNext();
}
return NULL;
}
void wxBitmapBase::CleanUpHandlers()
{
- wxNode *node = sm_handlers.First();
+ wxList::compatibility_iterator node = sm_handlers.GetFirst();
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 node;
+ sm_handlers.Erase(node);
node = next;
}
}
-
-
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(); };
};
IMPLEMENT_DYNAMIC_CLASS(wxBitmapBaseModule, wxModule)
+
+#endif // __WXMGL__ || __WXMAC__ || __WXCOCOA__ || __WXMOTIF__ || __WXX11__