--- hatari/src/gui-osx/PrefsController.h 2019/04/09 08:56:36 1.1.1.11 +++ hatari/src/gui-osx/PrefsController.h 2019/04/09 08:59:03 1.1.1.13 @@ -8,6 +8,10 @@ #import +#if (!defined MAC_OS_X_VERSION_10_12) || MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_12 +#define NSAlertStyleInformational NSInformationalAlertStyle +#endif + @interface PrefsController : NSObject { // Preferences window @@ -57,7 +61,8 @@ IBOutlet NSTextField *maxZoomedHeight; // N IBOutlet NSButton *keepDesktopResolution; IBOutlet NSButton *SDL2UseLinearScaling; - IBOutlet NSButton *SDL2UseVSync; + IBOutlet NSButton *SDL2Resizable ; + IBOutlet NSButton *SDL2UseVSync ; // Hidestatus, Capture only, Avi codec, Avi FPS // Sound @@ -70,19 +75,19 @@ IBOutlet NSMatrix *cpuType; IBOutlet NSMatrix *cpuClock; IBOutlet NSMatrix *machineType; - IBOutlet NSMatrix *ramSize; - IBOutlet NSButton *compatibleCpu; //bCompatibleCpu + IBOutlet NSMatrix *ramSize; // ram size + IBOutlet NSButton *compatibleCpu; // bCompatibleCpu IBOutlet NSButton *blitter; IBOutlet NSButton *realTime; IBOutlet NSButton *patchTimerD; IBOutlet NSButton *FastBootPatch; IBOutlet NSPopUpButton *videoTiming; // for ENABLE_WINUAE_CPU CORE - IBOutlet NSButton *cycleExactCPU; //bCycleExactCpu + IBOutlet NSButton *cycleExactCPU; //bCycleExactCpu IBOutlet NSButton *MMU_Emulation; - IBOutlet NSButton *adressSpace24; //bAddressSpace24 - IBOutlet NSStepper *TTRAMSizeStepper; - IBOutlet NSTextField *TTRAMSizeValue; + IBOutlet NSButton *adressSpace24; // bAddressSpace24 + IBOutlet NSStepper *TTRAMSizeStepper; // MS 12-2016 + IBOutlet NSTextField *TTRAMSizeValue; // MS 12-2016 //IBOutlet NSButton *CompatibleFPU; IBOutlet NSMatrix *FPUType; @@ -116,6 +121,8 @@ IBOutlet NSTextField *readRS232FromFile; // T IBOutlet NSButton *enableMidi; IBOutlet NSTextField *writeMidiToFile; // T + __unsafe_unretained IBOutlet NSPopUpButton *midiInPort; + __unsafe_unretained IBOutlet NSPopUpButton *midiOutPort; // Other