// Created: 2003/08/11
// RCS-ID: $Id$
// Copyright: (c) 2003 David Elliott
-// Licence: wxWidgets licence
+// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
#include "wx/wxprec.h"
wxGDIRefData *wxIcon::CloneGDIRefData(const wxGDIRefData *data) const
{
- return new wxIconRefData(*wx_static_cast(const wxIconRefData *, data));
+ return new wxIconRefData(*static_cast<const wxIconRefData *>(data));
}
-bool wxIcon::CreateFromXpm(const char **xpm)
+bool wxIcon::CreateFromXpm(const char* const* xpm)
{
wxBitmap bitmap(xpm);
CopyFromBitmap(bitmap);
- return Ok();
+ return IsOk();
}
bool wxIcon::LoadFile(const wxString& filename, wxBitmapType type,
{
wxBitmap bitmap(filename, type);
CopyFromBitmap(bitmap);
- return bitmap.Ok();
+ return bitmap.IsOk();
}
void wxIcon::CopyFromBitmap(const wxBitmap& bitmap)
M_ICONDATA->m_height = bitmap.GetHeight();
wxAutoNSAutoreleasePool pool;
M_ICONDATA->m_cocoaNSImage = [bitmap.GetNSImage(true) retain];
- M_ICONDATA->m_ok = bitmap.Ok();
+ M_ICONDATA->m_ok = bitmap.IsOk();
M_ICONDATA->m_numColors = 0;
M_ICONDATA->m_quality = 0;
}