Add isAppleUI() to check if running on OS X with Apple UI.

Fixes issue 1247


git-svn-id: http://svn.dmdirc.com/trunk@4076 00569f92-eb28-0410-84fd-f71c24880f

src/com/dmdirc/ui/swing/Apple.java

@@ -42,6 +42,8 @@ import java.lang.reflect.Field;
 import java.lang.reflect.Proxy;
 import java.lang.reflect.InvocationTargetException;
 
+import javax.swing.UIManager;
+
 import java.util.ArrayList;
 
 /**
@@ -163,6 +165,15 @@ public final class Apple implements InvocationHandler, ActionListener {
 	public static boolean isApple() {
 		return (System.getProperty("mrj.version") != null);
 	}
+	
+	/**
+	 * Are we using the OS X look and feel?
+	 *
+	 * @return true if we are using the OS X look and feel
+	 */
+	public static boolean isAppleUI() {
+		return isApple() && UIManager.getLookAndFeel().getClass().getName().equals("apple.laf.AquaLookAndFeel");
+	}
 
 	/**
 	 * Set some OS X only UI settings.

src/com/dmdirc/ui/swing/MenuBar.java

@@ -105,7 +105,7 @@ public class MenuBar extends JMenuBar implements ActionListener, MenuListener {
         menu.addMenuListener(this);
         add(menu);
 
-        if (!Apple.isApple()) {
+        if (!Apple.isAppleUI()) {
             menuItem = new JMenuItem();
             menuItem.setText("Preferences");
             menuItem.setMnemonic('p');
@@ -173,7 +173,7 @@ public class MenuBar extends JMenuBar implements ActionListener, MenuListener {
         menuItem.addActionListener(this);
         menu.add(menuItem);
         
-        if (!Apple.isApple()) {
+        if (!Apple.isAppleUI()) {
             menuItem = new JMenuItem();
             menuItem.setMnemonic('a');
             menuItem.setText("About");