diff options
| author | Veronika Irvine <veronika> | 2006-05-02 17:43:40 +0000 |
|---|---|---|
| committer | Veronika Irvine <veronika> | 2006-05-02 17:43:40 +0000 |
| commit | 3f92c6f0fc3dca30dca82dabb4b8ec80f538abd5 (patch) | |
| tree | 9d2e2ea8f07f4924238b133662c21f0b6b845e2f /bundles | |
| parent | 087391432c358a97aa293253d3f96865b2753451 (diff) | |
| download | eclipse.platform.swt-3f92c6f0fc3dca30dca82dabb4b8ec80f538abd5.tar.gz eclipse.platform.swt-3f92c6f0fc3dca30dca82dabb4b8ec80f538abd5.tar.xz eclipse.platform.swt-3f92c6f0fc3dca30dca82dabb4b8ec80f538abd5.zip | |
Bug 130173 Tree Column does not send DefaultSelection event
Diffstat (limited to 'bundles')
| -rw-r--r-- | bundles/org.eclipse.swt/Eclipse SWT/carbon/org/eclipse/swt/widgets/Control.java | 4 | ||||
| -rw-r--r-- | bundles/org.eclipse.swt/Eclipse SWT/carbon/org/eclipse/swt/widgets/Display.java | 8 |
2 files changed, 8 insertions, 4 deletions
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/carbon/org/eclipse/swt/widgets/Control.java b/bundles/org.eclipse.swt/Eclipse SWT/carbon/org/eclipse/swt/widgets/Control.java index eb045c958a..abb656169f 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/carbon/org/eclipse/swt/widgets/Control.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/carbon/org/eclipse/swt/widgets/Control.java @@ -1706,16 +1706,12 @@ int kEventMouseDown (int nextHandler, int theEvent, int userData) { Shell shell = getShell (); short [] button = new short [1]; OS.GetEventParameter (theEvent, OS.kEventParamMouseButton, OS.typeMouseButton, null, 2, null, button); - int [] clickCount = new int [1]; - OS.GetEventParameter (theEvent, OS.kEventParamClickCount, OS.typeUInt32, null, 4, null, clickCount); int result = sendMouseEvent (SWT.MouseDown, button [0], 0, 0, false, theEvent) ? OS.eventNotHandledErr : OS.noErr; if (isDisposed ()) return OS.noErr; - display.clickCount = display.clickCountButton == button [0] ? clickCount [0] : 1; if (display.clickCount == 2) { result = sendMouseEvent (SWT.MouseDoubleClick, button [0], 0, 0, false, theEvent) ? OS.eventNotHandledErr : OS.noErr; if (isDisposed ()) return OS.noErr; } - display.clickCountButton = button [0]; if (hooks (SWT.DragDetect)) { org.eclipse.swt.internal.carbon.Point pt = new org.eclipse.swt.internal.carbon.Point (); int sizeof = org.eclipse.swt.internal.carbon.Point.sizeof; 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 1732c4a0ed..81aa3f6e58 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 @@ -2698,6 +2698,14 @@ int menuProc (int nextHandler, int theEvent, int userData) { int mouseProc (int nextHandler, int theEvent, int userData) { int eventKind = OS.GetEventKind (theEvent); switch (eventKind) { + case OS.kEventMouseDown: + short [] buttonData = new short [1]; + OS.GetEventParameter (theEvent, OS.kEventParamMouseButton, OS.typeMouseButton, null, 2, null, buttonData); + int [] clickCountData = new int [1]; + OS.GetEventParameter (theEvent, OS.kEventParamClickCount, OS.typeUInt32, null, 4, null, clickCountData); + clickCount = clickCountButton == buttonData [0] ? clickCountData [0] : 1; + clickCountButton = buttonData [0]; + break; case OS.kEventMouseDragged: case OS.kEventMouseMoved: mouseMoved = true; |