diff options
| author | Silenio Quarti <silenio> | 2005-10-20 14:54:45 +0000 |
|---|---|---|
| committer | Silenio Quarti <silenio> | 2005-10-20 14:54:45 +0000 |
| commit | 3feb3891071699c796b343956d85937ece8acdcd (patch) | |
| tree | 14c1659a1b38d182ec13c9ae86ce09c21ee02dc5 | |
| parent | a5a369c7bd82e9d09b8470c072222ae85e612988 (diff) | |
| download | eclipse.platform.swt-3feb3891071699c796b343956d85937ece8acdcd.tar.gz eclipse.platform.swt-3feb3891071699c796b343956d85937ece8acdcd.tar.xz eclipse.platform.swt-3feb3891071699c796b343956d85937ece8acdcd.zip | |
33365 - implementing setDoubleClickEnabled()/getDoubleClickEnabled()
| -rw-r--r-- | bundles/org.eclipse.swt/Eclipse SWT/carbon/org/eclipse/swt/widgets/Text.java | 18 | ||||
| -rw-r--r-- | tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/AllCarbonTests.java | 2 |
2 files changed, 15 insertions, 5 deletions
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/carbon/org/eclipse/swt/widgets/Text.java b/bundles/org.eclipse.swt/Eclipse SWT/carbon/org/eclipse/swt/widgets/Text.java index 75ea7e2fc9..c2af75b9d5 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/carbon/org/eclipse/swt/widgets/Text.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/carbon/org/eclipse/swt/widgets/Text.java @@ -48,6 +48,7 @@ public class Text extends Scrollable { int txnObject, txnFrameID; int textLimit = LIMIT; char echoCharacter; + boolean doubleClick; String hiddenText; ControlEditTextSelectionRec selection; /** @@ -573,6 +574,7 @@ ScrollBar createScrollBar (int style) { void createWidget () { super.createWidget (); + doubleClick = true; hiddenText = ""; if ((style & SWT.PASSWORD) != 0) setEchoChar (PASSWORD); } @@ -767,8 +769,7 @@ String getClipboardText () { */ public boolean getDoubleClickEnabled () { checkWidget(); - //NOT DONE - return true; + return doubleClick; } /** @@ -1306,6 +1307,17 @@ int kEventControlGetFocusPart (int nextHandler, int theEvent, int userData) { return OS.eventNotHandledErr; } +int kEventMouseDown (int nextHandler, int theEvent, int userData) { + int result = super.kEventMouseDown (nextHandler, theEvent, userData); + if (result == OS.noErr) return result; + if (!doubleClick) { + int [] clickCount = new int [1]; + OS.GetEventParameter (theEvent, OS.kEventParamClickCount, OS.typeUInt32, null, 4, null, clickCount); + if (clickCount [0] > 1) return OS.noErr; + } + return result; +} + int kEventControlSetCursor (int nextHandler, int theEvent, int userData) { int result = super.kEventControlSetCursor (nextHandler, theEvent, userData); if (result == OS.noErr) return result; @@ -1650,7 +1662,7 @@ int setBounds (int x, int y, int width, int height, boolean move, boolean resize */ public void setDoubleClickEnabled (boolean doubleClick) { checkWidget(); - //NOT DONE + this.doubleClick = doubleClick; } /** diff --git a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/AllCarbonTests.java b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/AllCarbonTests.java index 53c30607a7..f1826d3a19 100644 --- a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/AllCarbonTests.java +++ b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/AllCarbonTests.java @@ -33,9 +33,7 @@ static String[] excludeTests = { "test_getBoundsI(org.eclipse.swt.tests.junit.Test_org_eclipse_swt_widgets_TreeItem)", "test_getBounds(org.eclipse.swt.tests.junit.Test_org_eclipse_swt_widgets_TreeItem)", "test_appendLjava_lang_String(org.eclipse.swt.tests.junit.Test_org_eclipse_swt_widgets_Text)", - "test_getDoubleClickEnabled(org.eclipse.swt.tests.junit.Test_org_eclipse_swt_widgets_Text)", "test_getTopPixel(org.eclipse.swt.tests.junit.Test_org_eclipse_swt_widgets_Text)", - "test_setDoubleClickEnabledZ(org.eclipse.swt.tests.junit.Test_org_eclipse_swt_widgets_Text)", "test_setTabsI(org.eclipse.swt.tests.junit.Test_org_eclipse_swt_widgets_Text)", "test_setTopIndexI(org.eclipse.swt.tests.junit.Test_org_eclipse_swt_widgets_Text)", "test_clearSelection(org.eclipse.swt.tests.junit.Test_org_eclipse_swt_widgets_Combo)", |