// Modified by: 20.11.99 (VZ): don't derive from wxBitmap any more
// Created: 04/01/98
// RCS-ID: $Id$
-// Copyright: (c) Julian Smart and Markus Holzem
-// Licence: wxWindows license
+// Copyright: (c) Julian Smart
+// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
// ============================================================================
#include "wx/utils.h"
#include "wx/app.h"
#include "wx/icon.h"
+ #include "wx/bitmap.h"
+ #include "wx/log.h"
#endif
#include "wx/msw/private.h"
-#if wxUSE_RESOURCE_LOADING_IN_MSW
- #include "wx/msw/curico.h"
- #include "wx/msw/curicop.h"
-#endif
-
// ----------------------------------------------------------------------------
// wxWin macros
// ----------------------------------------------------------------------------
- IMPLEMENT_DYNAMIC_CLASS(wxIcon, wxIconBase)
+IMPLEMENT_DYNAMIC_CLASS(wxIcon, wxGDIObject)
// ============================================================================
// implementation
{
if ( m_hIcon )
{
+#ifndef __WXMICROWIN__
::DestroyIcon((HICON) m_hIcon);
+#endif
m_hIcon = 0;
}
// wxIcon
// ----------------------------------------------------------------------------
-wxIcon::wxIcon()
-{
-}
-
-wxIcon::wxIcon(const char WXUNUSED(bits)[],
- int WXUNUSED(width),
- int WXUNUSED(height))
+wxIcon::wxIcon(const char bits[], int width, int height)
{
+ wxBitmap bmp(bits, width, height);
+ CopyFromBitmap(bmp);
}
wxIcon::wxIcon(const wxString& iconfile,
LoadFile(iconfile, flags, desiredWidth, desiredHeight);
}
+wxIcon::wxIcon(const wxIconLocation& loc)
+{
+ // wxICOFileHandler accepts names in the format "filename;index"
+ wxString fullname = loc.GetFileName();
+ if ( loc.GetIndex() )
+ {
+ fullname << _T(';') << loc.GetIndex();
+ }
+ //else: 0 is default
+
+ LoadFile(fullname, wxBITMAP_TYPE_ICO);
+}
+
wxIcon::~wxIcon()
{
}
+void wxIcon::CopyFromBitmap(const wxBitmap& bmp)
+{
+#ifndef __WXMICROWIN__
+ HICON hicon = wxBitmapToHICON(bmp);
+ if ( !hicon )
+ {
+ wxLogLastError(wxT("CreateIconIndirect"));
+ }
+ else
+ {
+ SetHICON((WXHICON)hicon);
+ SetSize(bmp.GetWidth(), bmp.GetHeight());
+ }
+#endif // __WXMICROWIN__
+}
+
+void wxIcon::CreateIconFromXpm(const char **data)
+{
+ wxBitmap bmp(data);
+ CopyFromBitmap(bmp);
+}
+
bool wxIcon::LoadFile(const wxString& filename,
long type,
int desiredWidth, int desiredHeight)