X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f6bcfd974ef26faf6f91a62cac09827e09463fd1..68cb30154e69c03d141aa649f024e916c5a96540:/src/msw/icon.cpp?ds=sidebyside diff --git a/src/msw/icon.cpp b/src/msw/icon.cpp index a7e1fcad9d..8f27b61324 100644 --- a/src/msw/icon.cpp +++ b/src/msw/icon.cpp @@ -35,6 +35,7 @@ #include "wx/app.h" #include "wx/icon.h" #include "wx/bitmap.h" + #include "wx/log.h" #endif #include "wx/msw/private.h" @@ -62,7 +63,9 @@ void wxIconRefData::Free() { if ( m_hIcon ) { +#ifndef __WXMICROWIN__ ::DestroyIcon((HICON) m_hIcon); +#endif m_hIcon = 0; } @@ -93,6 +96,7 @@ wxIcon::~wxIcon() void wxIcon::CopyFromBitmap(const wxBitmap& bmp) { +#ifndef __WXMICROWIN__ #ifdef __WIN32__ wxMask *mask = bmp.GetMask(); if ( !mask ) @@ -153,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 +#endif } void wxIcon::CreateIconFromXpm(const char **data)