Merge pull request #2322 from thoemmi/hotkey

[RFC] Hotkey control (reverted from commit 26b8abd)

Author: punker76

MahApps.Metro/Controls/HotKeyBox.cs

@@ -169,7 +169,6 @@
     <Compile Include="Controls\Helper\MouseWheelChange.cs" />
     <Compile Include="Controls\Helper\MouseWheelState.cs" />
     <Compile Include="Controls\Helper\SliderHelper.cs" />
-    <Compile Include="Controls\HotKeyBox.cs" />
     <Compile Include="Controls\Helper\VisibilityHelper.cs" />
     <Compile Include="Controls\MetroAnimatedSingleRowTabControl.cs" />
     <Compile Include="Controls\MetroAnimatedTabControl.cs" />
@@ -592,10 +591,6 @@
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
-    <Page Include="Themes\HotKeyBox.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
     <Page Include="Themes\MetroAnimatedSingleRowTabControl.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>

MahApps.Metro/MahApps.Metro.NET45.csproj

@@ -135,7 +135,6 @@
     <Compile Include="Controls\Helper\TextBoxHelper.cs" />
     <Compile Include="Controls\Helper\ToggleButtonHelper.cs" />
     <Compile Include="Controls\Helper\VisibilityHelper.cs" />
-    <Compile Include="Controls\HotKeyBox.cs" />
     <Compile Include="Controls\LayoutInvalidationCatcher.cs" />
     <Compile Include="Controls\MetroAnimatedSingleRowTabControl.cs" />
     <Compile Include="Controls\MetroAnimatedTabControl.cs" />
@@ -539,10 +538,6 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
-    <Page Include="Themes\HotKeyBox.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
     <Page Include="Themes\MetroAnimatedSingleRowTabControl.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>

MahApps.Metro/MahApps.Metro.csproj

@@ -167,17 +167,5 @@ public enum RedrawWindowFlags : uint
         public const int WM_MOVE = 0x0003;
 
         public const uint TOPMOST_FLAGS = SWP_NOACTIVATE | SWP_NOOWNERZORDER | SWP_NOSIZE | SWP_NOMOVE | SWP_NOREDRAW | SWP_NOSENDCHANGING;
-
-        public const int WM_HOTKEY = 0x0312;
-        public const int VK_SHIFT = 0x10;
-        public const int VK_CONTROL = 0x11;
-        public const int VK_MENU = 0x12;
-
-        /* used by UnsafeNativeMethods.MapVirtualKey */
-        public const uint MAPVK_VK_TO_VSC = 0x00;
-        public const uint MAPVK_VSC_TO_VK = 0x01;
-        public const uint MAPVK_VK_TO_CHAR = 0x02;
-        public const uint MAPVK_VSC_TO_VK_EX = 0x03;
-        public const uint MAPVK_VK_TO_VSC_EX = 0x04;
     }
 }

MahApps.Metro/Native/Constants.cs

@@ -12,7 +12,7 @@ namespace MahApps.Metro.Native
 
     /// <devdoc>http://msdn.microsoft.com/en-us/library/ms182161.aspx</devdoc>
     [SuppressUnmanagedCodeSecurity]
-    internal static class UnsafeNativeMethods
+    internal static class UnsafeNativeMethods 
     {
         /// <devdoc>http://msdn.microsoft.com/en-us/library/windows/desktop/aa969518%28v=vs.85%29.aspx</devdoc>
         [DllImport("dwmapi", PreserveSig = false, CallingConvention = CallingConvention.Winapi)]
@@ -227,12 +227,6 @@ internal static Point GetPoint(IntPtr ptr)
 
         [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
         [DllImport("user32.dll", SetLastError = true)]
-        internal static extern bool RedrawWindow(IntPtr hWnd, IntPtr lprcUpdate, IntPtr hrgnUpdate, Constants.RedrawWindowFlags flags);
-
-        [DllImport("user32.dll")]
-        internal static extern int MapVirtualKey(uint uCode, uint uMapType);
-
-        [DllImport("user32.dll", CharSet = CharSet.Auto)]
-        internal static extern int GetKeyNameText(int lParam, [MarshalAs(UnmanagedType.LPWStr), Out] StringBuilder str, int size);
+        internal static extern bool RedrawWindow(IntPtr hWnd, IntPtr lprcUpdate, IntPtr hrgnUpdate, Constants.RedrawWindowFlags flags); 
     }
 }

MahApps.Metro/Native/UnsafeNativeMethods.cs

@@ -30,7 +30,6 @@
         <ResourceDictionary Source="pack://application:,,,/MahApps.Metro;component/Themes/TransitioningContentControl.xaml" />
         <ResourceDictionary Source="pack://application:,,,/MahApps.Metro;component/Themes/WindowButtonCommands.xaml" />
         <ResourceDictionary Source="pack://application:,,,/MahApps.Metro;component/Themes/WindowCommands.xaml" />
-        <ResourceDictionary Source="pack://application:,,,/MahApps.Metro;component/Themes/HotKeyBox.xaml" />
 
         <ResourceDictionary Source="pack://application:,,,/MahApps.Metro;component/Themes/Dialogs/BaseMetroDialog.xaml" />
     </ResourceDictionary.MergedDictionaries>