(Menu) Cut down on unnecessary HAVE_RGUI ifdefs where appropriate, and

replace with HAVE_MENU where possible
This commit is contained in:
twinaphex 2014-06-10 02:08:41 +02:00
parent 966db762cf
commit b70d6292ff
3 changed files with 2 additions and 4 deletions

View File

@ -3912,10 +3912,8 @@ static int menu_common_setting_set(unsigned setting, unsigned action)
if (driver.menu->current_pad < MAX_PLAYERS - 1)
driver.menu->current_pad++;
}
#ifdef HAVE_RGUI
if (port != driver.menu->current_pad)
driver.menu->need_refresh = true;
#endif
port = driver.menu->current_pad;
break;
case MENU_SETTINGS_BIND_DEVICE:

View File

@ -927,7 +927,7 @@ static const video_poke_interface_t lima_poke_interface = {
#endif
lima_set_aspect_ratio,
lima_apply_state_changes,
#if defined(HAVE_RGUI) || defined(HAVE_RMENU) /* TODO: only HAVE_MENU i think */
#ifdef HAVE_MENU
lima_set_texture_frame,
lima_set_texture_enable,
#endif

View File

@ -608,7 +608,7 @@ MENU
#include "../frontend/menu/history.c"
#include "../frontend/menu/file_list.c"
#if defined(HAVE_RMENU) || defined(HAVE_RGUI) || defined(HAVE_RMENU_XUI)
#ifdef HAVE_MENU
#include "../frontend/menu/backend/menu_common_backend.c"
#endif