Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

eliminate __WIN32__ only code

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18943 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
2003-01-26 16:15:08 +00:00
parent f357c0d42c
commit 5eac771d09
1 changed files with 5 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/generic/filedlgg.cpp
View File

@@ -366,16 +366,11 @@ int wxFileIconsTable::GetIconID(const wxString& extension, const wxString& mime)
m_HashTable.Put(extension, new wxFileIconEntry(newid)); m_HashTable.Put(extension, new wxFileIconEntry(newid));
return newid; return newid;
} }
#ifdef __WIN32__
wxBitmap myBitmap (ic.GetWidth(), ic.GetHeight() ) ; wxBitmap tmpBmp;
wxMemoryDC memDC; tmpBmp.CopyFromIcon(ic);
memDC.SelectObject( myBitmap ); wxImage img = tmpBmp.ConvertToImage();
memDC.DrawIcon(ic,0,0);
memDC.SelectObject( wxNullBitmap );
wxImage img = myBitmap.ConvertToImage();
#else
wxImage img = ic.ConvertToImage();
#endif
delete ft; delete ft;
int id = m_ImageList.GetImageCount(); int id = m_ImageList.GetImageCount();