* include/vlc_keys.h: Added Insert and Delete hotkeys.

* modules/gui/wxwindows/interface.cpp: Fixed End hotkey + added Insert/Delete.

Patch by Greg Hazel (ghazel at gmail dot com)

diff --git a/include/vlc_keys.h b/include/vlc_keys.h
index cbaebc529433accbe798f897de80bc801f601bb6..987d4ebfe5f7ca910a5079d0fd68b52461590d57 100644 (file)
--- a/include/vlc_keys.h
+++ b/include/vlc_keys.h
@@ -49,14 +49,16 @@
 #define KEY_F12              0x00120000
 #define KEY_HOME             0x00130000
 #define KEY_END              0x00140000
-#define KEY_MENU             0x00150000
-#define KEY_ESC              0x00160000
-#define KEY_PAGEUP           0x00170000
-#define KEY_PAGEDOWN         0x00180000
-#define KEY_TAB              0x00190000
-#define KEY_BACKSPACE        0x001A0000
-#define KEY_MOUSEWHEELUP     0x001B0000
-#define KEY_MOUSEWHEELDOWN   0x001C0000
+#define KEY_INSERT           0x00150000
+#define KEY_DELETE           0x00160000
+#define KEY_MENU             0x00170000
+#define KEY_ESC              0x00180000
+#define KEY_PAGEUP           0x00190000
+#define KEY_PAGEDOWN         0x001A0000
+#define KEY_TAB              0x001B0000
+#define KEY_BACKSPACE        0x001C0000
+#define KEY_MOUSEWHEELUP     0x001D0000
+#define KEY_MOUSEWHEELDOWN   0x001E0000
 
 #define KEY_ASCII            0x0000007F
 #define KEY_UNSET            0
@@ -101,6 +103,8 @@ static const struct key_descriptor_s vlc_keys[] =
     { "F12", KEY_F12 },
     { "Home", KEY_HOME },
     { "End", KEY_END },
+    { "Insert", KEY_INSERT },
+    { "Delete", KEY_DELETE },
     { "Menu", KEY_MENU },
     { "Esc", KEY_ESC },
     { "Page Up", KEY_PAGEUP },

diff --git a/modules/gui/wxwindows/interface.cpp b/modules/gui/wxwindows/interface.cpp
index a3d028543b9d9715d91131fb9599ae0a63335d5c..08615cf0914c5bcc12b8e1b3ed9db74ec9562f24 100644 (file)
--- a/modules/gui/wxwindows/interface.cpp
+++ b/modules/gui/wxwindows/interface.cpp
@@ -621,7 +621,9 @@ static int ConvertHotkey( int i_hotkey )
         case KEY_F11: return WXK_F11;
         case KEY_F12: return WXK_F12;
         case KEY_HOME: return WXK_HOME;
-        case KEY_END: return WXK_HOME;
+        case KEY_END: return WXK_END;
+        case KEY_INSERT: return WXK_INSERT;
+        case KEY_DELETE: return WXK_DELETE;
         case KEY_MENU: return WXK_MENU;
         case KEY_ESC: return WXK_ESCAPE;
         case KEY_PAGEUP: return WXK_PRIOR;