Rename widgets/menu_popup to widgets/menu_dialog

Makefile.common

@@ -509,7 +509,7 @@ ifeq ($(HAVE_MENU_COMMON), 1)
           menu/menu_navigation.o  \
           menu/menu_setting.o \
           menu/menu_shader.o \
-			 menu/widgets/menu_popup.o \
+			 menu/widgets/menu_dialog.o \
           menu/widgets/menu_entry.o \
 			 menu/widgets/menu_list.o \
           menu/menu_cbs.o \

command.c

@@ -48,7 +48,7 @@
 #include "menu/menu_content.h"
 #include "menu/menu_display.h"
 #include "menu/menu_shader.h"
-#include "menu/widgets/menu_popup.h"
+#include "menu/widgets/menu_dialog.h"
 #endif
 
 #ifdef HAVE_NETPLAY

griffin/griffin.c

@@ -893,7 +893,7 @@ MENU
 #include "../menu/menu_cbs.c"
 #include "../menu/menu_content.c"
 #include "../menu/widgets/menu_entry.c"
-#include "../menu/widgets/menu_popup.c"
+#include "../menu/widgets/menu_dialog.c"
 #include "../menu/widgets/menu_list.c"
 #include "../menu/cbs/menu_cbs_ok.c"
 #include "../menu/cbs/menu_cbs_cancel.c"

menu/cbs/menu_cbs_ok.c

@@ -31,7 +31,7 @@
 #include "../menu_setting.h"
 #include "../menu_shader.h"
 #include "../menu_navigation.h"
-#include "../widgets/menu_popup.h"
+#include "../widgets/menu_dialog.h"
 #include "../menu_content.h"
 
 #include "../../core.h"

menu/drivers/menu_generic.c

@@ -25,7 +25,7 @@
 #include "../menu_displaylist.h"
 #include "../menu_navigation.h"
 #include "../menu_entries.h"
-#include "../widgets/menu_popup.h"
+#include "../widgets/menu_dialog.h"
 
 #include "../../configuration.h"
 #include "../../performance_counters.h"

menu/menu_displaylist.c

@@ -44,7 +44,7 @@
 #include "menu_content.h"
 #include "menu_driver.h"
 #include "menu_navigation.h"
-#include "widgets/menu_popup.h"
+#include "widgets/menu_dialog.h"
 #include "widgets/menu_list.h"
 #include "menu_cbs.h"
 

menu/menu_driver.c

@@ -29,7 +29,7 @@
 #include "menu_cbs.h"
 #include "menu_display.h"
 #include "menu_navigation.h"
-#include "widgets/menu_popup.h"
+#include "widgets/menu_dialog.h"
 #include "widgets/menu_list.h"
 #include "menu_shader.h"
 

menu/widgets/menu_popup.c → menu/widgets/menu_dialog.c

@@ -24,7 +24,7 @@
 #include "../../cheevos.h"
 #endif
 
-#include "menu_popup.h"
+#include "menu_dialog.h"
 
 #include "../menu_display.h"
 #include "../menu_driver.h"
@@ -35,11 +35,11 @@
 #include "../../input/input_autodetect.h"
 #include "../../input/input_config.h"
 
-static bool                menu_popup_pending_push   = false;
-static bool                 menu_popup_active       = false;
-static unsigned            menu_popup_current_id     = 0;
-static enum menu_popup_type menu_popup_current_type = MENU_POPUP_NONE;
-static enum msg_hash_enums  menu_popup_current_msg  = MSG_UNKNOWN;
+static bool                 menu_popup_pending_push   = false;
+static bool                 menu_popup_active         = false;
+static unsigned             menu_popup_current_id     = 0;
+static enum menu_popup_type menu_popup_current_type   = MENU_POPUP_NONE;
+static enum msg_hash_enums  menu_popup_current_msg    = MSG_UNKNOWN;
 
 int menu_popup_iterate(char *s, size_t len, const char *label)
 {

runloop.c

@@ -44,7 +44,7 @@
 #ifdef HAVE_MENU
 #include "menu/menu_display.h"
 #include "menu/menu_driver.h"
-#include "menu/widgets/menu_popup.h"
+#include "menu/widgets/menu_dialog.h"
 #endif
 
 #ifdef HAVE_NETPLAY