diff options
| author | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2018-03-19 19:56:15 +0100 |
|---|---|---|
| committer | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2018-03-19 19:56:15 +0100 |
| commit | 1542c122b3672fe83e027411ad2445772e2d0ed3 (patch) | |
| tree | e535bc621bd7ffa9d5ce89e0d495df5d1c4ab6fd /app/wlib/mswlib/mswmenu.c | |
| parent | 773810e6583142d7d15263e6481c42aebed6d7f1 (diff) | |
| parent | d1a8285f818eb7e5c3d6a05709ea21a808490b8c (diff) | |
Update upstream source from tag 'upstream/5.1.0'
Update to upstream version '5.1.0'
with Debian dir 93ca74b8b4602fce4c9c7740e0cfdde25f086673
Diffstat (limited to 'app/wlib/mswlib/mswmenu.c')
| -rw-r--r-- | app/wlib/mswlib/mswmenu.c | 8 |
1 files changed, 5 insertions, 3 deletions
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 ); |