Merge branch 'master' into changeable_icon_set

2021-11-18 22:15:53 +01:00
parent 9125169e5b 181f210eea
commit 52e23efb44
30 changed files with 2068 additions and 844 deletions
--- a/src/include/86box/win.h
+++ b/src/include/86box/win.h
@@ -243,6 +243,9 @@ extern void	media_menu_update_cdrom(int id);
 extern void	media_menu_update_zip(int id);
 extern void	media_menu_update_mo(int id);

+/* Functions in win_ui.c */
+extern HMENU	menuMain;
+extern void	ResetAllMenus();

 #ifdef __cplusplus
 }