summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSteve Northover <steve>2003-02-20 02:41:21 +0000
committerSteve Northover <steve>2003-02-20 02:41:21 +0000
commit42d7d4f098d341f4d4e3b2f1db84bb3572840fc0 (patch)
treedfc81919b84747d3f1781ec8517f02c89ab206c2
parent889e8b5e571d2e4b2e1f70fadd792e5876d526c7 (diff)
downloadeclipse.platform.swt-42d7d4f098d341f4d4e3b2f1db84bb3572840fc0.tar.gz
eclipse.platform.swt-42d7d4f098d341f4d4e3b2f1db84bb3572840fc0.tar.xz
eclipse.platform.swt-42d7d4f098d341f4d4e3b2f1db84bb3572840fc0.zip
*** empty log message ***
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT/carbon/org/eclipse/swt/widgets/Display.java26
1 files changed, 5 insertions, 21 deletions
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 1da5402cf8..310b53a9da 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
@@ -51,7 +51,6 @@ public class Display extends Device {
Runnable [] timerList;
Callback timerCallback;
int timerProc;
- boolean allowTimers;
/* Current caret */
Caret currentCaret;
@@ -597,6 +596,11 @@ public Object getData () {
return data;
}
+public int getDismissalAlignment () {
+ checkDevice ();
+ return SWT.RIGHT;
+}
+
public int getDoubleClickTime () {
checkDevice ();
return OS.GetDblTime ();
@@ -1030,12 +1034,9 @@ int mouseHoverProc (int id, int handle) {
public boolean readAndDispatch () {
checkDevice ();
- runTimers ();
runEnterExit ();
- allowTimers = true;
int [] outEvent = new int [1];
int status = OS.ReceiveNextEvent (0, null, OS.kEventDurationNoWait, true, outEvent);
- allowTimers = false;
if (status == OS.noErr) {
int eventClass = OS.GetEventClass (outEvent [0]);
int eventKind = OS.GetEventKind (outEvent [0]);
@@ -1383,23 +1384,6 @@ boolean runPopups () {
return result;
}
-boolean runTimers () {
- if (timerList == null || timerIds == null) return false;
- boolean result = false;
- for (int i=0; i<timerList.length; i++) {
- if (timerIds [i] == -1) {
- Runnable runnable = timerList [i];
- timerList [i] = null;
- timerIds [i] = 0;
- if (runnable != null) {
- runnable.run ();
- result = true;
- }
- }
- }
- return result;
-}
-
void sendEvent (int eventType, Event event) {
if (eventTable == null && filterTable == null) {
return;