Ticket #1589: MainMenu.diff

src/org/openstreetmap/josm/gui/MainMenu.java

@@ -150 +152 @@
                 current.setAccelerator(download.shortCut);
                 current = fileMenu.add(upload);
                 current.setAccelerator(upload.shortCut);
+                if (!Main.withOSXIntegration) {
                 fileMenu.addSeparator();
                 current = fileMenu.add(exit);
                 current.setAccelerator(exit.shortCut);
+                }
                 add(fileMenu);
 
                 editMenu.setMnemonic('E');
@@ -179 +183 @@
                 editMenu.addSeparator();
                 current = editMenu.add(search);
                 current.setAccelerator(search.shortCut);
+                if (!Main.withOSXIntegration) {
                 editMenu.addSeparator();
                 current = editMenu.add(preferences);
                 current.setAccelerator(preferences.shortCut);
+                }
                 add(editMenu);
 
                 viewMenu.setMnemonic('V');
@@ -273 +281 @@
                 current = helpMenu.add(check);
                 current = helpMenu.add(help);
                 //current.setAccelerator(help.shortCut);
+                if (!Main.withOSXIntegration) {
                 current = helpMenu.add(about);
                 current.setAccelerator(about.shortCut);
+                }
                 current = helpMenu.add(historyinfo);
                 current.setAccelerator(historyinfo.shortCut);
                 add(helpMenu);