// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
#pragma implementation "icon.h"
#endif
-#include "wx/icon.h"
-#include "wx/window.h"
-
-#include <Xm/Xm.h>
-#include <X11/cursorfont.h>
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
-#include "wx/motif/private.h"
+#include "wx/icon.h"
-#if !USE_SHARED_LIBRARIES
-IMPLEMENT_DYNAMIC_CLASS(wxIcon, wxBitmap)
-#endif
+IMPLEMENT_DYNAMIC_CLASS(wxIcon, wxBitmap);
-/*
- * Icons
- */
+// ============================================================================
+// Icons
+// ============================================================================
wxIcon::wxIcon()
{
}
// Create from XPM data
-wxIcon::wxIcon(const char **data)
+wxIcon::wxIcon(char **data)
{
(void) Create((void*) data, wxBITMAP_TYPE_XPM_DATA, 0, 0, 0);
}
-wxIcon::wxIcon(const wxString& icon_file, long flags,
- int desiredWidth, int desiredHeight)
+wxIcon::wxIcon(const char **data)
+{
+ (void) Create((void*) data, wxBITMAP_TYPE_XPM_DATA, 0, 0, 0);
+}
+void wxIcon::CopyFromBitmap(const wxBitmap& bmp)
{
- LoadFile(icon_file, flags, desiredWidth, desiredHeight);
+ wxIcon *icon = (wxIcon*)(&bmp);
+ *this = *icon;
}
wxIcon::~wxIcon()
{
}
-bool wxIcon::LoadFile(const wxString& filename, long type,
- int desiredWidth, int desiredHeight)
+bool wxIcon::LoadFile(const wxString& filename, wxBitmapType type,
+ int desiredWidth, int desiredHeight)
{
- UnRef();
-
- m_refData = new wxBitmapRefData;
-
- wxBitmapHandler *handler = FindHandler(type);
-
- if ( handler )
- return handler->LoadFile(this, filename, type, desiredWidth, desiredHeight);
- else
- return FALSE;
+ UnRef();
+
+ wxBitmapHandler *handler = FindHandler(type);
+
+ if ( handler )
+ return handler->LoadFile(this, filename, type,
+ desiredWidth, desiredHeight);
+ else
+ return false;
}
-