Some code tidying; removing dibutils.cpp which
doesn't seem to be used any more git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19606 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -146,8 +146,7 @@ void wxIcon::CopyFromBitmap(const wxBitmap& bmp)
|
||||
// delete the inverted mask bitmap we created as well
|
||||
::DeleteObject(iconInfo.hbmMask);
|
||||
#else // Win16
|
||||
// there are some functions in curico.cpp which probably could be used
|
||||
// here...
|
||||
/*
|
||||
// This probably doesn't work.
|
||||
HBITMAP hBitmap = (HBITMAP) bmp.GetHBITMAP();
|
||||
HICON hIcon = MakeIconFromBitmap((HINSTANCE) wxGetInstance(), hBitmap);
|
||||
@@ -156,8 +155,8 @@ void wxIcon::CopyFromBitmap(const wxBitmap& bmp)
|
||||
SetHICON((WXHICON)hIcon);
|
||||
SetSize(bmp.GetWidth(), bmp.GetHeight());
|
||||
}
|
||||
|
||||
// wxFAIL_MSG("Bitmap to icon conversion (including use of XPMs for icons) not implemented");
|
||||
*/
|
||||
wxFAIL_MSG("Bitmap to icon conversion (including use of XPMs for icons) not implemented");
|
||||
#endif // Win32/16
|
||||
#endif
|
||||
}
|
||||
|
Reference in New Issue
Block a user