Merge branch 'master' of https://github.com/86Box/86Box into feature/savquest

This commit is contained in:
RichardG867
2021-08-03 21:45:54 -03:00
13 changed files with 189 additions and 90 deletions

View File

@@ -80,7 +80,7 @@ extern int update_icons;
extern int unscaled_size_x, /* current unscaled size X */
unscaled_size_y; /* current unscaled size Y */
extern int kbd_req_capture;
extern int kbd_req_capture, hide_status_bar;
/* System-related functions. */
extern char *fix_exe_path(char *str);

View File

@@ -307,8 +307,7 @@
#define IDM_ACTION_TRACE 40020
#endif
#define IDM_CONFIG 40020
#define IDM_CONFIG_LOAD 40021
#define IDM_CONFIG_SAVE 40022
#define IDM_VID_HIDE_STATUS_BAR 40021
#define IDM_UPDATE_ICONS 40030
#define IDM_VID_RESIZE 40040
#define IDM_VID_REMEMBER 40041