summaryrefslogtreecommitdiffstats
path: root/win
diff options
context:
space:
mode:
authorsr55 <[email protected]>2013-06-21 19:49:26 +0000
committersr55 <[email protected]>2013-06-21 19:49:26 +0000
commit0a1769b2635de1a80b958b55ff4bac217a6dde65 (patch)
tree9000c569a7e2003188601008164377f6b5f445d5 /win
parent35c1f7220cd198fcde18ead488845aa8b4357669 (diff)
WinGui: Fix the Source Drive MenuItems occasionally not working when pressed. Updated the Drag/Drop library that has a few bug fixes.
git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@5596 b64f7644-9d1e-0410-96f1-a4d463321fa5
Diffstat (limited to 'win')
-rw-r--r--win/CS/HandBrakeWPF/Commands/SourceMenuCommand.cs4
-rw-r--r--win/CS/HandBrakeWPF/Views/MainView.xaml3
-rw-r--r--win/CS/libraries/WPFDragDrop/GongSolutions.Wpf.DragDrop.XML5
-rw-r--r--win/CS/libraries/WPFDragDrop/GongSolutions.Wpf.DragDrop.dllbin49664 -> 50176 bytes
-rw-r--r--win/CS/libraries/WPFDragDrop/GongSolutions.Wpf.DragDrop.pdbbin97792 -> 89600 bytes
5 files changed, 6 insertions, 6 deletions
diff --git a/win/CS/HandBrakeWPF/Commands/SourceMenuCommand.cs b/win/CS/HandBrakeWPF/Commands/SourceMenuCommand.cs
index 661ef7fe3..8edc537fc 100644
--- a/win/CS/HandBrakeWPF/Commands/SourceMenuCommand.cs
+++ b/win/CS/HandBrakeWPF/Commands/SourceMenuCommand.cs
@@ -52,8 +52,6 @@ namespace HandBrakeWPF.Commands
#region Implemented Interfaces
- #region ICommand
-
/// <summary>
/// The can execute.
/// </summary>
@@ -80,7 +78,5 @@ namespace HandBrakeWPF.Commands
}
#endregion
-
- #endregion
}
} \ No newline at end of file
diff --git a/win/CS/HandBrakeWPF/Views/MainView.xaml b/win/CS/HandBrakeWPF/Views/MainView.xaml
index d5f211174..67ac70c21 100644
--- a/win/CS/HandBrakeWPF/Views/MainView.xaml
+++ b/win/CS/HandBrakeWPF/Views/MainView.xaml
@@ -208,8 +208,7 @@
<MenuItem.ItemContainerStyle>
<Style TargetType="{x:Type MenuItem}">
<Setter Property="Header" Value="{Binding Text}" />
- <Setter Property="MenuItem.Command" Value="{Binding Command}"/>
- <Setter Property="MenuItem.CommandParameter" Value="123"/>
+ <Setter Property="Command" Value="{Binding Command}"/>
<Setter Property="ItemsSource" Value="{Binding Children}" />
<Setter Property="Icon" Value="{Binding Image}" />
<Setter Property="InputGestureText" Value="{Binding InputGestureText}" />
diff --git a/win/CS/libraries/WPFDragDrop/GongSolutions.Wpf.DragDrop.XML b/win/CS/libraries/WPFDragDrop/GongSolutions.Wpf.DragDrop.XML
index 297f4bf28..e46d7093d 100644
--- a/win/CS/libraries/WPFDragDrop/GongSolutions.Wpf.DragDrop.XML
+++ b/win/CS/libraries/WPFDragDrop/GongSolutions.Wpf.DragDrop.XML
@@ -366,6 +366,11 @@
Gets a flag enumeration indicating the current state of the SHIFT, CTRL, and ALT keys, as well as the state of the mouse buttons.
</summary>
</member>
+ <member name="P:GongSolutions.Wpf.DragDrop.IDropInfo.NotHandled">
+ <summary>
+ Indicates if the drop info should be handled by itself (useful for child elements)
+ </summary>
+ </member>
<member name="T:GongSolutions.Wpf.DragDrop.DropInfo">
<summary>
Holds information about a the target of a drag drop operation.
diff --git a/win/CS/libraries/WPFDragDrop/GongSolutions.Wpf.DragDrop.dll b/win/CS/libraries/WPFDragDrop/GongSolutions.Wpf.DragDrop.dll
index 3e9615082..395aac56d 100644
--- a/win/CS/libraries/WPFDragDrop/GongSolutions.Wpf.DragDrop.dll
+++ b/win/CS/libraries/WPFDragDrop/GongSolutions.Wpf.DragDrop.dll
Binary files differ
diff --git a/win/CS/libraries/WPFDragDrop/GongSolutions.Wpf.DragDrop.pdb b/win/CS/libraries/WPFDragDrop/GongSolutions.Wpf.DragDrop.pdb
index 997730460..5b01a61e8 100644
--- a/win/CS/libraries/WPFDragDrop/GongSolutions.Wpf.DragDrop.pdb
+++ b/win/CS/libraries/WPFDragDrop/GongSolutions.Wpf.DragDrop.pdb
Binary files differ