From d1a8285f818eb7e5c3d6a05709ea21a808490b8c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Mon, 19 Mar 2018 19:55:58 +0100 Subject: New upstream version 5.1.0 --- app/wlib/mswlib/mswmenu.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'app/wlib/mswlib/mswmenu.c') diff --git a/app/wlib/mswlib/mswmenu.c b/app/wlib/mswlib/mswmenu.c index de49742..815752a 100644 --- a/app/wlib/mswlib/mswmenu.c +++ b/app/wlib/mswlib/mswmenu.c @@ -315,7 +315,9 @@ static long acclKeyMap[] = { VK_F9, /* wAccelKey_F9, */ VK_F10, /* wAccelKey_F10, */ VK_F11, /* wAccelKey_F11, */ - VK_F12 /* wAccelKey_F12, */ + VK_F12, /* wAccelKey_F12, */ + VK_ADD, /* wAccelKey_Numpad_Add, */ + VK_SUBTRACT /* wAccelKey_Numpad_Subtract, */ }; @@ -326,7 +328,7 @@ void wAttachAccelKey( void * data ) { acclTable_t * ad; - if ( key < 1 || key > wAccelKey_F12 ) { + if ( key < 1 || key > wAccelKey_Numpad_Subtract ) { mswFail( "wAttachAccelKey: key out of range" ); return; } @@ -908,7 +910,7 @@ wMenuToggle_p wMenuToggleCreate( if ( vk & 0xFF00 ) modifier |= WKEY_SHIFT; acclTable(acclTable_da.cnt-1).acclKey = (modifier<<8) | (vk&0x00FF); - acclTable(acclTable_da.cnt-1).mp = mt; + acclTable(acclTable_da.cnt-1).mp = (wMenuPush_p)mt; } rc = AppendMenu( m->menu, MF_STRING, mt->index, label ); -- cgit v1.2.3