commit 4f495fb1481a77b53e0717f455b3ca50199987e6
author Silenio Quarti <silenio> Wed Feb 05 01:40:31 2003 +0000
committer Silenio Quarti <silenio> Wed Feb 05 01:40:31 2003 +0000
tree 47537dbfa4a7bc4dadb8b4bb6692b6f4ad147cbd
parent fec9326217e0881e73e76c1108058ed9719bbade

*** empty log message ***

bundles/org.eclipse.swt/Eclipse SWT/carbon/org/eclipse/swt/widgets/Display.java

diff --git a/bundles/org.eclipse.swt/Eclipse SWT/carbon/org/eclipse/swt/widgets/Display.java b/bundles/org.eclipse.swt/Eclipse SWT/carbon/org/eclipse/swt/widgets/Display.java
index ea23877..c85a542 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/carbon/org/eclipse/swt/widgets/Display.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/carbon/org/eclipse/swt/widgets/Display.java
@@ -959,7 +959,9 @@
 		case OS.inMenuBar: {
 			if (eventKind == OS.kEventMouseDown) {
 				clearMenuFlags ();
-				OS.MenuSelect (where);
+				if (menuBar != null && menuBar.isEnabled ()) {
+					OS.MenuSelect (where);
+				}					 
 				clearMenuFlags ();
 				return OS.noErr;
 			}

bundles/org.eclipse.swt/Eclipse SWT/carbon/org/eclipse/swt/widgets/MenuItem.java

diff --git a/bundles/org.eclipse.swt/Eclipse SWT/carbon/org/eclipse/swt/widgets/MenuItem.java b/bundles/org.eclipse.swt/Eclipse SWT/carbon/org/eclipse/swt/widgets/MenuItem.java
index fee2cd3..6b0a562 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/carbon/org/eclipse/swt/widgets/MenuItem.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/carbon/org/eclipse/swt/widgets/MenuItem.java
@@ -114,6 +114,9 @@
 }
 
 int kEventProcessCommand (int nextHandler, int theEvent, int userData) {
+	//TEMPORARY CODE
+	if (!isEnabled ()) return OS.noErr;
+
 	if ((style & SWT.CHECK) != 0) {
 		setSelection (!getSelection ());
 	} else {