| [hatari-devel] Small corrections gui-osx |
[ Thread Index |
Date Index
| More lists.tuxfamily.org/hatari-devel Archives
]
Bonjour,
in SDL_Main.m "Main_RequestQuit(int exitval)" is used but not defined.
in xib (english & french) in panel "System", radio-buttons for FPU choice are disabled.
Diff file adds line "extern void Main_RequestQuit(int exitval) ;" in SDL-Main.m
Diff file enables radio-buttons for FPU choice in xib (english & french).
Miguel
diff -r 275d888beeb6 src/gui-osx/Info-Hatari.plist
--- a/src/gui-osx/Info-Hatari.plist Wed Jun 07 23:56:29 2017 +0300
+++ b/src/gui-osx/Info-Hatari.plist Fri Jun 09 17:58:41 2017 +0200
@@ -74,7 +74,7 @@
<key>Hatari</key>
<string>SDL Cocoa App</string>
<key>LSMinimumSystemVersion</key>
- <string>10.5.0</string>
+ <string>10.6.0</string>
<key>NSMainNibFile</key>
<string>SDLMain</string>
<key>NSPrincipalClass</key>
diff -r 275d888beeb6 src/gui-osx/SDLMain.m
--- a/src/gui-osx/SDLMain.m Wed Jun 07 23:56:29 2017 +0300
+++ b/src/gui-osx/SDLMain.m Fri Jun 09 17:58:41 2017 +0200
@@ -34,6 +34,7 @@
#import "clocks_timings.h"
#import "change.h"
+extern void Main_RequestQuit(int exitval) ;
#ifdef SDL_USE_CPS
// Portions of CPS.h
diff -r 275d888beeb6 src/gui-osx/en.lproj/SDLMain.xib
--- a/src/gui-osx/en.lproj/SDLMain.xib Wed Jun 07 23:56:29 2017 +0300
+++ b/src/gui-osx/en.lproj/SDLMain.xib Fri Jun 09 17:58:41 2017 +0200
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="11762" systemVersion="16A323" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none">
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="12118" systemVersion="16A323" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none">
<dependencies>
<deployment version="1060" identifier="macosx"/>
- <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="11762"/>
+ <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="12118"/>
<capability name="box content view" minToolsVersion="7.0"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies>
@@ -1379,25 +1379,25 @@
<color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
<size key="cellSize" width="79" height="18"/>
<size key="intercellSpacing" width="4" height="2"/>
- <buttonCell key="prototype" type="radio" title="68040" imagePosition="left" alignment="left" enabled="NO" tag="4" inset="2" id="qUv-pT-udK">
+ <buttonCell key="prototype" type="radio" title="68040" imagePosition="left" alignment="left" tag="4" inset="2" id="qUv-pT-udK">
<behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
<font key="font" metaFont="system"/>
</buttonCell>
<cells>
<column>
- <buttonCell type="radio" title="None" imagePosition="left" alignment="left" enabled="NO" state="on" inset="2" id="NH6-x5-VEi">
+ <buttonCell type="radio" title="None" imagePosition="left" alignment="left" state="on" inset="2" id="NH6-x5-VEi">
<behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
<font key="font" metaFont="system"/>
</buttonCell>
- <buttonCell type="radio" title="68881" imagePosition="left" alignment="left" enabled="NO" tag="1" inset="2" id="lrv-D7-bNU">
+ <buttonCell type="radio" title="68881" imagePosition="left" alignment="left" tag="1" inset="2" id="lrv-D7-bNU">
<behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
<font key="font" metaFont="system"/>
</buttonCell>
- <buttonCell type="radio" title="68882" imagePosition="left" alignment="left" enabled="NO" tag="2" sound="Frog" inset="2" id="55k-lT-A3s">
+ <buttonCell type="radio" title="68882" imagePosition="left" alignment="left" tag="2" sound="Frog" inset="2" id="55k-lT-A3s">
<behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
<font key="font" metaFont="system"/>
</buttonCell>
- <buttonCell type="radio" title="Internal" imagePosition="left" alignment="left" enabled="NO" tag="3" inset="2" id="tCJ-OP-S5R">
+ <buttonCell type="radio" title="Internal" imagePosition="left" alignment="left" tag="3" inset="2" id="tCJ-OP-S5R">
<behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
<font key="font" metaFont="system"/>
</buttonCell>
diff -r 275d888beeb6 src/gui-osx/fr.lproj/SDLMain.xib
--- a/src/gui-osx/fr.lproj/SDLMain.xib Wed Jun 07 23:56:29 2017 +0300
+++ b/src/gui-osx/fr.lproj/SDLMain.xib Fri Jun 09 17:58:41 2017 +0200
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="11762" systemVersion="16A323" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none">
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="12118" systemVersion="16A323" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none">
<dependencies>
<deployment version="1080" identifier="macosx"/>
- <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="11762"/>
+ <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="12118"/>
<capability name="box content view" minToolsVersion="7.0"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies>
@@ -1778,25 +1778,25 @@
<color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
<size key="cellSize" width="77" height="18"/>
<size key="intercellSpacing" width="4" height="2"/>
- <buttonCell key="prototype" type="radio" title="68040" imagePosition="left" alignment="left" enabled="NO" tag="4" inset="2" id="ovQ-Vm-zmj">
+ <buttonCell key="prototype" type="radio" title="68040" imagePosition="left" alignment="left" tag="4" inset="2" id="ovQ-Vm-zmj">
<behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
<font key="font" metaFont="system"/>
</buttonCell>
<cells>
<column>
- <buttonCell type="radio" title="None" imagePosition="left" alignment="left" enabled="NO" state="on" inset="2" id="a9t-p7-hgL">
+ <buttonCell type="radio" title="None" imagePosition="left" alignment="left" state="on" inset="2" id="a9t-p7-hgL">
<behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
<font key="font" metaFont="cellTitle"/>
</buttonCell>
- <buttonCell type="radio" title="68881" imagePosition="left" alignment="left" enabled="NO" tag="1" inset="2" id="1AZ-I2-OI1">
+ <buttonCell type="radio" title="68881" imagePosition="left" alignment="left" tag="1" inset="2" id="1AZ-I2-OI1">
<behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
<font key="font" metaFont="cellTitle"/>
</buttonCell>
- <buttonCell type="radio" title="68882" imagePosition="left" alignment="left" enabled="NO" tag="2" sound="Frog" inset="2" id="AH5-Mg-Tap">
+ <buttonCell type="radio" title="68882" imagePosition="left" alignment="left" tag="2" sound="Frog" inset="2" id="AH5-Mg-Tap">
<behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
<font key="font" metaFont="cellTitle"/>
</buttonCell>
- <buttonCell type="radio" title="Internal" imagePosition="left" alignment="left" enabled="NO" tag="3" inset="2" id="ElI-aj-2JA">
+ <buttonCell type="radio" title="Internal" imagePosition="left" alignment="left" tag="3" inset="2" id="ElI-aj-2JA">
<behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
<font key="font" metaFont="cellTitle"/>
</buttonCell>
Cocoa Pod
http://cocoa.pod.free.fr/
http://www.aconit.org/