Upgrade to .net framework 4.5

This commit is contained in:
qianlifeng
2015-01-15 20:47:48 +08:00
parent bc341d193f
commit 8d746cd206
31 changed files with 147 additions and 111 deletions

View File

@@ -37,16 +37,17 @@ namespace Wox.ImageLoader
private static ImageSource GetIcon(string fileName)
{
if (System.IO.File.Exists(fileName) == false) return null;
Icon icon = GetFileIcon(fileName);
if (icon == null) icon = Icon.ExtractAssociatedIcon(fileName);
if (icon != null)
try
{
return System.Windows.Interop.Imaging.CreateBitmapSourceFromHIcon(icon.Handle,
new Int32Rect(0, 0, icon.Width, icon.Height), BitmapSizeOptions.FromEmptyOptions());
if (File.Exists(fileName) == false) return null;
Icon icon = GetFileIcon(fileName) ?? Icon.ExtractAssociatedIcon(fileName);
if (icon != null)
{
return System.Windows.Interop.Imaging.CreateBitmapSourceFromHIcon(icon.Handle,
new Int32Rect(0, 0, icon.Width, icon.Height), BitmapSizeOptions.FromEmptyOptions());
}
}
catch{}
return null;
}