claunia/86Box
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of ssh://github.com/86Box/86Box into cleanup30

Browse Source
This commit is contained in:
RichardG867
2021-11-21 14:20:49 -03:00
parent 5af0db8075 0c307c2058
commit 87f7067bdd
25 changed files with 781 additions and 120 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/include/86box/resource.h
View File

@@ -29,7 +29,7 @@
#define DLG_SND_GAIN 103 /* top-level dialog */
#define DLG_NEW_FLOPPY 104 /* top-level dialog */
#define DLG_SPECIFY_DIM 105 /* top-level dialog */
#define DLG_PROG_SETT 106 /* top-level dialog */
#define DLG_PREFERENCES 106 /* top-level dialog */
#define DLG_CONFIG 110 /* top-level dialog */
#define DLG_CFG_MACHINE 111 /* sub-dialog of config */
#define DLG_CFG_VIDEO 112 /* sub-dialog of config */
@@ -357,7 +357,7 @@
#define IDM_DISCORD 40090
#endif
#define IDM_VID_PROG_SETT 40091
#define IDM_PREFERENCES 40091
#if defined(DEV_BRANCH) && defined(USE_OPENGL)
#define IDM_VID_GL_FPS_BLITTER 40100

4
src/include/86box/win.h
View File

@@ -188,8 +188,8 @@ extern void NewFloppyDialogCreate(HWND hwnd, int id, int part);
/* Functions in win_specify_dim.c: */
extern void SpecifyDimensionsDialogCreate(HWND hwnd);
/* Functions in win_lang.c: */
extern void ProgSettDlgCreate(HWND hwnd);
/* Functions in win_preferences.c: */
extern void PreferencesDlgCreate(HWND hwnd);
/* Functions in win_settings.c: */