Fix 'Path' is an ambiguous reference between 'System.IO.Path' and 'System.Windows.Shapes.Path'

This commit is contained in:
Yeechan Lu
2014-03-23 16:51:08 +08:00
parent d2105a7169
commit fc4778159c

View File

@@ -41,7 +41,7 @@ namespace Wox
Storyboard.SetTargetProperty(fadeOutAnimation, new PropertyPath(TopProperty)); Storyboard.SetTargetProperty(fadeOutAnimation, new PropertyPath(TopProperty));
fadeOutStoryboard.Children.Add(fadeOutAnimation); fadeOutStoryboard.Children.Add(fadeOutAnimation);
imgClose.Source = new BitmapImage(new Uri(Path.GetDirectoryName(System.Windows.Forms.Application.ExecutablePath) + "\\Images\\close.png")); imgClose.Source = new BitmapImage(new Uri(System.IO.Path.GetDirectoryName(System.Windows.Forms.Application.ExecutablePath) + "\\Images\\close.png"));
imgClose.MouseUp += imgClose_MouseUp; imgClose.MouseUp += imgClose_MouseUp;
} }
@@ -65,7 +65,7 @@ namespace Wox
tbSubTitle.Text = subTitle; tbSubTitle.Text = subTitle;
if (!File.Exists(icopath)) if (!File.Exists(icopath))
{ {
icopath = Path.GetDirectoryName(System.Windows.Forms.Application.ExecutablePath) + "Images\\app.png"; icopath = System.IO.Path.GetDirectoryName(System.Windows.Forms.Application.ExecutablePath) + "Images\\app.png";
} }
imgIco.Source = new BitmapImage(new Uri(icopath)); imgIco.Source = new BitmapImage(new Uri(icopath));
Show(); Show();