--- np2/macosx/resource.h 2003/10/16 17:59:33 1.1.1.1 +++ np2/macosx/resource.h 2003/10/25 16:52:58 1.4 @@ -39,18 +39,22 @@ #define IDM_SASI2OPEN MAKE_MENUID(IDM_SASI2, 1) #define IDM_SASI2REMOVE MAKE_MENUID(IDM_SASI2, 3) -#define IDM_ROLNORMAL MAKE_MENUID(IDM_SCREEN, 1) -#define IDM_ROLLEFT MAKE_MENUID(IDM_SCREEN, 2) -#define IDM_ROLRIGHT MAKE_MENUID(IDM_SCREEN, 3) -#define IDM_DISPSYNC MAKE_MENUID(IDM_SCREEN, 5) -#define IDM_RASTER MAKE_MENUID(IDM_SCREEN, 6) -#define IDM_NOWAIT MAKE_MENUID(IDM_SCREEN, 7) -#define IDM_AUTOFPS MAKE_MENUID(IDM_SCREEN, 8) -#define IDM_60FPS MAKE_MENUID(IDM_SCREEN, 9) -#define IDM_30FPS MAKE_MENUID(IDM_SCREEN, 10) -#define IDM_20FPS MAKE_MENUID(IDM_SCREEN, 11) -#define IDM_15FPS MAKE_MENUID(IDM_SCREEN, 12) -#define IDM_SCREENOPT MAKE_MENUID(IDM_SCREEN, 14) +#define IDM_MOUSE MAKE_MENUID(IDM_DEVICE, 4) + +#define IDM_FULLSCREEN MAKE_MENUID(IDM_SCREEN, 1) + +#define IDM_ROLNORMAL MAKE_MENUID(IDM_SCREEN, 1+2) +#define IDM_ROLLEFT MAKE_MENUID(IDM_SCREEN, 2+2) +#define IDM_ROLRIGHT MAKE_MENUID(IDM_SCREEN, 3+2) +#define IDM_DISPSYNC MAKE_MENUID(IDM_SCREEN, 5+2) +#define IDM_RASTER MAKE_MENUID(IDM_SCREEN, 6+2) +#define IDM_NOWAIT MAKE_MENUID(IDM_SCREEN, 7+2) +#define IDM_AUTOFPS MAKE_MENUID(IDM_SCREEN, 8+2) +#define IDM_60FPS MAKE_MENUID(IDM_SCREEN, 9+2) +#define IDM_30FPS MAKE_MENUID(IDM_SCREEN, 10+2) +#define IDM_20FPS MAKE_MENUID(IDM_SCREEN, 11+2) +#define IDM_15FPS MAKE_MENUID(IDM_SCREEN, 12+2) +#define IDM_SCREENOPT MAKE_MENUID(IDM_SCREEN, 14+2) #define IDM_KEY MAKE_MENUID(IDM_KEYBOARD, 1) #define IDM_JOY1 MAKE_MENUID(IDM_KEYBOARD, 2)