projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
* Fixed wxToolbar95 and wxToolbarGTK to emit TOOL_ENTER event with id==-1 when the...
[wxWidgets.git]
/
src
/
msw
/
icon.cpp
diff --git
a/src/msw/icon.cpp
b/src/msw/icon.cpp
index fa2c11ffaf175c81eb77ea5c4f8f64e9e3356dc4..8f27b61324cc5c1ff31636b0591e08296c2a4a04 100644
(file)
--- a/
src/msw/icon.cpp
+++ b/
src/msw/icon.cpp
@@
-63,7
+63,9
@@
void wxIconRefData::Free()
{
if ( m_hIcon )
{
{
if ( m_hIcon )
{
+#ifndef __WXMICROWIN__
::DestroyIcon((HICON) m_hIcon);
::DestroyIcon((HICON) m_hIcon);
+#endif
m_hIcon = 0;
}
m_hIcon = 0;
}
@@
-94,6
+96,7
@@
wxIcon::~wxIcon()
void wxIcon::CopyFromBitmap(const wxBitmap& bmp)
{
void wxIcon::CopyFromBitmap(const wxBitmap& bmp)
{
+#ifndef __WXMICROWIN__
#ifdef __WIN32__
wxMask *mask = bmp.GetMask();
if ( !mask )
#ifdef __WIN32__
wxMask *mask = bmp.GetMask();
if ( !mask )
@@
-154,6
+157,7
@@
void wxIcon::CopyFromBitmap(const wxBitmap& bmp)
// wxFAIL_MSG("Bitmap to icon conversion (including use of XPMs for icons) not implemented");
#endif // Win32/16
// wxFAIL_MSG("Bitmap to icon conversion (including use of XPMs for icons) not implemented");
#endif // Win32/16
+#endif
}
void wxIcon::CreateIconFromXpm(const char **data)
}
void wxIcon::CreateIconFromXpm(const char **data)