/////////////////////////////////////////////////////////////////////////////
-// Name: icon.cpp
+// Name: src/motif/icon.cpp
// Purpose: wxIcon class
// Author: Julian Smart
// Modified by:
// Created: 17/09/98
-// RCS-ID: $Id$
// Copyright: (c) Julian Smart
-// Licence: wxWidgets licence
+// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma implementation "icon.h"
-#endif
-
// For compilers that support precompilation, includes "wx.h".
#include "wx/wxprec.h"
#include "wx/icon.h"
-IMPLEMENT_DYNAMIC_CLASS(wxIcon, wxBitmap);
+IMPLEMENT_DYNAMIC_CLASS(wxIcon, wxBitmap)
// ============================================================================
// Icons
(void) Create((void*) bits, wxBITMAP_TYPE_XBM_DATA, width, height, 1);
}
+#ifdef wxNEEDS_CHARPP
// Create from XPM data
wxIcon::wxIcon(char **data)
{
(void) Create((void*) data, wxBITMAP_TYPE_XPM_DATA, 0, 0, 0);
}
+#endif
-wxIcon::wxIcon(const char **data)
+wxIcon::wxIcon(const char* const* data)
{
(void) Create((void*) data, wxBITMAP_TYPE_XPM_DATA, 0, 0, 0);
}
UnRef();
wxBitmapHandler *handler = FindHandler(type);
-
+
if ( handler )
return handler->LoadFile(this, filename, type,
desiredWidth, desiredHeight);
else
- return FALSE;
+ return false;
}