summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSilenio Quarti <silenio>2008-06-13 21:55:30 +0000
committerSilenio Quarti <silenio>2008-06-13 21:55:30 +0000
commitaa9b2291ca5b2b9f9d4fccc92c979ab026d9b0e9 (patch)
tree99c11ce86026f7aa43edf2fb6d6c73575d510944
parent98a4a56c018233577cff0e8e47d70c6c037c182b (diff)
downloadeclipse.platform.swt-aa9b2291ca5b2b9f9d4fccc92c979ab026d9b0e9.tar.gz
eclipse.platform.swt-aa9b2291ca5b2b9f9d4fccc92c979ab026d9b0e9.tar.xz
eclipse.platform.swt-aa9b2291ca5b2b9f9d4fccc92c979ab026d9b0e9.zip
cursor in CoolBar (simple fix)
-rwxr-xr-xbundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Control.java18
1 files changed, 2 insertions, 16 deletions
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Control.java b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Control.java
index 4e48cc96a7..265ad8aca7 100755
--- a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Control.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Control.java
@@ -2489,22 +2489,8 @@ public void setCursor (Cursor cursor) {
checkWidget();
if (cursor != null && cursor.isDisposed ()) error (SWT.ERROR_INVALID_ARGUMENT);
this.cursor = cursor;
- NSWindow window = view.window();
- NSPoint location = window.convertScreenToBase(NSEvent.mouseLocation());
- NSView view = window.contentView().hitTest(location);
- Control control = null;
- if (view != null) {
- do {
- Widget widget = display.getWidget (view);
- if (widget instanceof Control) {
- control = (Control)widget;
- break;
- }
- view = view.superview();
- } while (view != null);
- }
- if (control != null && control.isTrim (view)) control = null;
- display.setCursor (control);
+ if (!isEnabled()) return;
+ display.setCursor (display.currentControl);
}
void setDefaultFont () {