--- ./build.xml.orig 2017-10-25 17:05:24.000000000 +0200 +++ ./build.xml.orig 2018-01-03 17:57:46.942716327 +0100 @@ -33,6 +33,8 @@ + + --- ./src/com/eteks/sweethome3d/SweetHome3D.java.orig 2017-10-25 17:05:26.000000000 +0200 +++ ./src/com/eteks/sweethome3d/SweetHome3D.java.orig 2018-01-03 17:58:57.342720263 +0100 @@ -486,7 +486,7 @@ } if (OperatingSystem.isMacOSX()) { // Bind to application menu at last - MacOSXConfiguration.bindToApplicationMenu(this); + // MacOSXConfiguration.bindToApplicationMenu(this); } // Run everything else in Event Dispatch Thread @@ -522,7 +522,7 @@ // except for bundles under macOS 10.13 System.setProperty("apple.laf.useScreenMenuBar", String.valueOf(OperatingSystem.compareVersions(System.getProperty("os.version"), "10.13") < 0 - || MacOSXConfiguration.isScreenMenuBarSupported())); + /*|| MacOSXConfiguration.isScreenMenuBarSupported()*/)); } // Force the use of Quartz under Mac OS X for better Java 2D rendering performance System.setProperty("apple.awt.graphics.UseQuartz", "true"); @@ -597,7 +597,7 @@ if (ev.getItem().getName() != null && home.getName() == null && !home.isRecovered()) { - if (OperatingSystem.isMacOSXLionOrSuperior() +/* if (OperatingSystem.isMacOSXLionOrSuperior() && OperatingSystem.isJavaVersionGreaterOrEqual("1.7") && MacOSXConfiguration.isWindowFullScreen(getHomeFrame(home))) { // Delay home disposal to avoid Java 3D fatal error @@ -607,9 +607,9 @@ controller.close(); } }).start(); - } else { + } else {*/ controller.close(); - } +/* }*/ } removeHomesListener(this); } else if (ev.getItem() == home && ev.getType() == CollectionEvent.Type.DELETE) { --- ./src/com/eteks/sweethome3d/HomeFramePane.java.orig 2017-10-25 17:05:26.000000000 +0200 +++ ./src/com/eteks/sweethome3d/HomeFramePane.java.orig 2018-01-03 17:57:46.942716327 +0100 @@ -124,7 +124,7 @@ homeFrame.setIconImage(frameImages.get(0)); } if (OperatingSystem.isMacOSXLionOrSuperior()) { - MacOSXConfiguration.installToolBar(this); +// MacOSXConfiguration.installToolBar(this); } updateFrameTitle(homeFrame, this.home, this.application); // Change component orientation --- ./src/com/eteks/sweethome3d/tools/OperatingSystem.java.orig 2017-10-25 17:05:26.000000000 +0200 +++ ./src/com/eteks/sweethome3d/tools/OperatingSystem.java.orig 2018-01-03 17:57:46.942716327 +0100 @@ -33,7 +33,7 @@ import java.util.TimerTask; import java.util.UUID; -import com.apple.eio.FileManager; +//import com.apple.eio.FileManager; import com.eteks.sweethome3d.model.Home; /** @@ -434,9 +434,10 @@ */ public static File getDefaultApplicationFolder() throws IOException { File userApplicationFolder; - if (isMacOSX()) { +/* if (isMacOSX()) { userApplicationFolder = new File(MacOSXFileManager.getApplicationSupportFolder()); - } else if (isWindows()) { + } else if (isWindows()) { */ + if (isWindows()) { userApplicationFolder = new File(System.getProperty("user.home"), "Application Data"); // If user Application Data directory doesn't exist, use user home if (!userApplicationFolder.exists()) { @@ -457,10 +458,10 @@ * This class requires some classes of com.apple.eio package * to compile. */ - private static class MacOSXFileManager { +/* private static class MacOSXFileManager { public static String getApplicationSupportFolder() throws IOException { // Find application support folder (0x61737570) for user domain (-32763) return FileManager.findFolder((short)-32763, 0x61737570); } - } + } */ }