eliminate __WIN32__ only code
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18943 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
parent
f357c0d42c
commit
5eac771d09
@ -366,16 +366,11 @@ int wxFileIconsTable::GetIconID(const wxString& extension, const wxString& mime)
|
||||
m_HashTable.Put(extension, new wxFileIconEntry(newid));
|
||||
return newid;
|
||||
}
|
||||
#ifdef __WIN32__
|
||||
wxBitmap myBitmap (ic.GetWidth(), ic.GetHeight() ) ;
|
||||
wxMemoryDC memDC;
|
||||
memDC.SelectObject( myBitmap );
|
||||
memDC.DrawIcon(ic,0,0);
|
||||
memDC.SelectObject( wxNullBitmap );
|
||||
wxImage img = myBitmap.ConvertToImage();
|
||||
#else
|
||||
wxImage img = ic.ConvertToImage();
|
||||
#endif
|
||||
|
||||
wxBitmap tmpBmp;
|
||||
tmpBmp.CopyFromIcon(ic);
|
||||
wxImage img = tmpBmp.ConvertToImage();
|
||||
|
||||
delete ft;
|
||||
|
||||
int id = m_ImageList.GetImageCount();
|
||||
|
Loading…
Reference in New Issue
Block a user