diff options
| author | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2020-08-22 14:05:41 +0200 |
|---|---|---|
| committer | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2020-08-22 14:05:41 +0200 |
| commit | b55285a77da0e0b829e4ce8d7e09debaabc68e15 (patch) | |
| tree | f622559ef65bbdd3e1c5bdb06098a8f89eec0563 /app/wlib/gtklib/menu.c | |
| parent | d3897ce090dbeb220ed2c782f095597e417cf3cc (diff) | |
| parent | d1ae75703e1ed81d65ea16946dcdb77e7a13adc9 (diff) | |
Merge branch 'feature/upstream' into develop
Diffstat (limited to 'app/wlib/gtklib/menu.c')
| -rw-r--r-- | app/wlib/gtklib/menu.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/app/wlib/gtklib/menu.c b/app/wlib/gtklib/menu.c index d19805a..79695d4 100644 --- a/app/wlib/gtklib/menu.c +++ b/app/wlib/gtklib/menu.c @@ -555,7 +555,7 @@ wMenuList_p wMenuListCreate( * behind it. In case the maximum number of items is reached the last item is removed. * * \param ml IN handle for the menu list - the placeholder item - * \param index IN currently ignored + * \param index IN position of new menu item * \param labelStr IN the menu label for the new item * \param data IN application data for the new item * \return @@ -611,7 +611,11 @@ void wMenuListAdd( g_object_set_data( G_OBJECT(MMENUITEM( mi )), WLISTITEM, mi ); // add the item to the menu - gtk_menu_shell_insert((GtkMenuShell *)(MPARENT( ml )->menu), MMENUITEM( mi ), i + 1 ); + if ( index < 0 ) + index = 0; + if ( index >= ml->count ) + index = ml->count - 1; + gtk_menu_shell_insert((GtkMenuShell *)(MPARENT( ml )->menu), MMENUITEM( mi ), i + index + 1 ); g_signal_connect( GTK_OBJECT(MMENUITEM( mi )), "activate", G_CALLBACK(pushMenuList), mi ); gtk_widget_show(MMENUITEM( mi )); |