X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fgui%2Fwince%2Fmenus.cpp;h=cd8edc7d0c18827b347e6c7fa8ccb013e5636ab6;hb=6ee1e193fd896ab9a4729fde14f009d9ce629815;hp=76b2b72027fc00840f20ec20b80df08eda469f89;hpb=81c5ac29fa2e80426c1b1dfcc941a1aabe8bc808;p=vlc diff --git a/modules/gui/wince/menus.cpp b/modules/gui/wince/menus.cpp index 76b2b72027..cd8edc7d0c 100644 --- a/modules/gui/wince/menus.cpp +++ b/modules/gui/wince/menus.cpp @@ -25,8 +25,6 @@ /***************************************************************************** * Preamble *****************************************************************************/ -#include /* strerror() */ -#include #include #include @@ -373,7 +371,7 @@ void RefreshNavigMenu( intf_thread_t *p_intf, HMENU hMenu ) /* Delete old menu */ int count = wce_GetMenuItemCount( hMenu ); for( i = 0; i <= count; i++ ) RemoveMenu( hMenu, 0, MF_BYPOSITION ); - + if( p_intf->p_sys->p_navig_menu ) MenuItemExt::ClearList( p_intf->p_sys->p_navig_menu ); else p_intf->p_sys->p_navig_menu = new vector; @@ -457,7 +455,7 @@ void RefreshSettingsMenu( intf_thread_t *p_intf, HMENU hMenu ) * Refresh the menu. *****************************************************************************/ void RefreshMenu( intf_thread_t *p_intf, vector *p_menu_list, - HMENU hMenu , int i_count, char **ppsz_varnames, + HMENU hMenu , int i_count, char **ppsz_varnames, int *pi_objects, int i_start_id ) { vlc_object_t *p_object; @@ -581,7 +579,7 @@ void CreateMenuItem( intf_thread_t *p_intf, vector *p_menu_list, p_menu_list->push_back( pMenuItemExt ); CheckMenuItem( hMenu, *pi_item_id , ( val.b_bool ? MF_UNCHECKED : MF_CHECKED ) | - MF_BYCOMMAND ); + MF_BYCOMMAND ); break; default: @@ -594,7 +592,7 @@ void CreateMenuItem( intf_thread_t *p_intf, vector *p_menu_list, } HMENU CreateChoicesMenu( intf_thread_t *p_intf, - vector *p_menu_list, char *psz_var, + vector *p_menu_list, char *psz_var, vlc_object_t *p_object, int *pi_item_id ) { MenuItemExt *pMenuItemExt; @@ -734,7 +732,7 @@ void OnMenuEvent( intf_thread_t *p_intf, int id ) if( p_intf->p_sys->p_audio_menu && !p_menuitemext ) for( iter = p_intf->p_sys->p_audio_menu->begin(); - iter != p_intf->p_sys->p_audio_menu->end(); iter++ ) + iter != p_intf->p_sys->p_audio_menu->end(); iter++ ) if( (*iter)->id == id ) { p_menuitemext = *iter;