Changeset 213:36f5cb12e1a2 for dwt/custom/CCombo.d

Timestamp:

05/17/08 11:34:28 (8 months ago)

Author:

Frank Benoit <benoit@tionex.de>

branch:

default

Message:

Update to SWT 3.4M7

Files:

• dwt/custom/CCombo.d (modified) (22 diffs)

dwt/custom/CCombo.d

@@ -52 +52 @@
-static import tango.text.convert.Format;
-import dwt.dwthelper.utils;
+import dwt.dwthelper.Runnable;
-
-/**
@@ -153 +154 @@
-            }
-            if (getShell () is event.widget) {
-
+
+
+
+
+
+
-            }
-        }
@@ -166 +172 @@
-    };
-
-
+FocusIn, DWT.
-    for (int i=0; i<comboEvents.length; i++) this.addListener (comboEvents [i], listener);
-
-KeyDown, DWT.KeyUp, DWT.MenuDetect, DWT.Modify, DWT.MouseDown, DWT.MouseUp
+DefaultSelection, DWT.KeyDown, DWT.KeyUp, DWT.MenuDetect, DWT.Modify, DWT.MouseDown, DWT.MouseUp, DWT.MouseDoubleClick, DWT.MouseWheel
-    for (int i=0; i<textEvents.length; i++) text.addListener (textEvents [i], listener);
-
-
+MouseDown, DWT.MouseUp, DWT.
-    for (int i=0; i<arrowEvents.length; i++) arrow.addListener (arrowEvents [i], listener);
-
@@ -180 +186 @@
-static int checkStyle (int style) {
-    int mask = DWT.BORDER | DWT.READ_ONLY | DWT.FLAT | DWT.LEFT_TO_RIGHT | DWT.RIGHT_TO_LEFT;
-style & mask
+DWT.NO_FOCUS | (style & mask)
-}
-/**
@@ -319 +325 @@
-            break;
-        }
+        case DWT.MouseDown: {
+            Event mouseEvent = new Event ();
+            mouseEvent.button = event.button;
+            mouseEvent.count = event.count;
+            mouseEvent.stateMask = event.stateMask;
+            mouseEvent.time = event.time;
+            mouseEvent.x = event.x; mouseEvent.y = event.y;
+            notifyListeners (DWT.MouseDown, mouseEvent);
+            event.doit = mouseEvent.doit;
+            break;
+        }
+        case DWT.MouseUp: {
+            Event mouseEvent = new Event ();
+            mouseEvent.button = event.button;
+            mouseEvent.count = event.count;
+            mouseEvent.stateMask = event.stateMask;
+            mouseEvent.time = event.time;
+            mouseEvent.x = event.x; mouseEvent.y = event.y;
+            notifyListeners (DWT.MouseUp, mouseEvent);
+            event.doit = mouseEvent.doit;
+            break;
+        }
-        case DWT.Selection: {
+            text.setFocus();
-            dropDown (!isDropped ());
-            break;
@@ -363 +392 @@
-            list = null;
-            arrow = null;
+            break;
+        case DWT.FocusIn:
+            Control focusControl = getDisplay ().getFocusControl ();
+            if (focusControl is arrow || focusControl is list) return;
+            if (isDropped()) {
+                list.setFocus();
+            } else {
+                text.setFocus();
+            }
-            break;
-        case DWT.Move:
@@ -466 +504 @@
-public void deselect (int index) {
-    checkWidget ();
-
+
+
+
+
+
+
-}
-/**
@@ -484 +527 @@
-public void deselectAll () {
-    checkWidget ();
+    text.setText("");  //$NON-NLS-1$
-    list.deselectAll ();
-}
@@ -490 +534 @@
-    if (!drop) {
-        popup.setVisible (false);
-&& arrow.
+ && 
-            text.setFocus();
-        }
@@ -528 +572 @@
-    popup.setBounds (x, y, width, height);
-    popup.setVisible (true);
-
+if (isFocusControl()) 
-}
-/*
@@ -655 +699 @@
-    checkWidget ();
-    return list.getItems ();
+}
+/**
+ * Returns <code>true</code> if the receiver's list is visible,
+ * and <code>false</code> otherwise.
+ * <p>
+ * If one of the receiver's ancestors is not visible or some
+ * other condition makes the receiver not visible, this method
+ * may still indicate that it is considered visible even though
+ * it may not actually be showing.
+ * </p>
+ *
+ * @return the receiver's list's visibility state
+ *
+ * @exception DWTException <ul>
+ *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
+ *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
+ * </ul>
+ *
+ * @since 3.4
+ */
+public bool getListVisible () {
+    checkWidget ();
+    return isDropped();
-}
-public override Menu getMenu() {
@@ -906 +973 @@
-        public void getLocation (AccessibleControlEvent e) {
-            Rectangle location = getBounds ();
-
+getParent().
-            e.x = pt.x;
-            e.y = pt.y;
@@ -1003 +1070 @@
-                    event.doit = false;
-                    break;
+                case DWT.TRAVERSE_TAB_NEXT:
+                case DWT.TRAVERSE_TAB_PREVIOUS:
+                    event.doit = text.traverse(event.detail);
+                    event.detail = DWT.TRAVERSE_NONE;
+                    if (event.doit) dropDown(false);
+                    return;
-                default:
-            }
@@ -1094 +1167 @@
-             * it again. To prevent the popup from showing again, we will let the selection
-             * event of the arrow button hide the popup.
+             * In Windows, hiding the popup during the deactivate causes the deactivate
+             * to be called twice and the selection event to be disappear.
-             */
-"gtk
+!"carbon
-                Point point = arrow.toControl(getDisplay().getCursorLocation());
-                Point size = arrow.getSize();
@@ -1318 +1393 @@
-public override bool setFocus () {
-    checkWidget();
+    if (!isEnabled () || !isVisible ()) return false;
-    if (isFocusControl ()) return true;
-    return text.setFocus ();
@@ -1394 +1470 @@
-    checkWidget ();
-    return;
+}
+/**
+ * Marks the receiver's list as visible if the argument is <code>true</code>,
+ * and marks it invisible otherwise.
+ * <p>
+ * If one of the receiver's ancestors is not visible or some
+ * other condition makes the receiver not visible, marking
+ * it visible may not actually cause it to be displayed.
+ * </p>
+ *
+ * @param visible the new visibility state
+ *
+ * @exception DWTException <ul>
+ *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
+ *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
+ * </ul>
+ *
+ * @since 3.4
+ */
+public void setListVisible (bool visible) {
+    checkWidget ();
+    dropDown(visible);
-}
-public override void setMenu(Menu menu) {
@@ -1527 +1625 @@
-            break;
-        }
+        case DWT.DefaultSelection: {
+            dropDown (false);
+            Event e = new Event ();
+            e.time = event.time;
+            e.stateMask = event.stateMask;
+            notifyListeners (DWT.DefaultSelection, e);
+            break;
+        }
-        case DWT.KeyDown: {
-            Event keyEvent = new Event ();
@@ -1537 +1643 @@
-            event.doit = keyEvent.doit;
-            if (!event.doit) break;
-
-            if (event.character is DWT.CR) {
-                dropDown (false);
-                Event selectionEvent = new Event ();
-                selectionEvent.time = event.time;
-                selectionEvent.stateMask = event.stateMask;
-                notifyListeners (DWT.DefaultSelection, selectionEvent);
-                if (isDisposed ()) break;
-            }
-
-            if (event.keyCode is DWT.ARROW_UP || event.keyCode is DWT.ARROW_DOWN) {
-                event.doit = false;
@@ -1600 +1696 @@
-        }
-        case DWT.MouseDown: {
+            Event mouseEvent = new Event ();
+            mouseEvent.button = event.button;
+            mouseEvent.count = event.count;
+            mouseEvent.stateMask = event.stateMask;
+            mouseEvent.time = event.time;
+            mouseEvent.x = event.x; mouseEvent.y = event.y;
+            notifyListeners (DWT.MouseDown, mouseEvent);
+            if (isDisposed ()) break;
+            event.doit = mouseEvent.doit;
+            if (!event.doit) break;
-            if (event.button !is 1) return;
-            if (text.getEditable ()) return;
@@ -1609 +1715 @@
-        }
-        case DWT.MouseUp: {
+            Event mouseEvent = new Event ();
+            mouseEvent.button = event.button;
+            mouseEvent.count = event.count;
+            mouseEvent.stateMask = event.stateMask;
+            mouseEvent.time = event.time;
+            mouseEvent.x = event.x; mouseEvent.y = event.y;
+            notifyListeners (DWT.MouseUp, mouseEvent);
+            if (isDisposed ()) break;
+            event.doit = mouseEvent.doit;
+            if (!event.doit) break;
-            if (event.button !is 1) return;
-            if (text.getEditable ()) return;
@@ -1614 +1730 @@
-            break;
-        }
+        case DWT.MouseDoubleClick: {
+            Event mouseEvent = new Event ();
+            mouseEvent.button = event.button;
+            mouseEvent.count = event.count;
+            mouseEvent.stateMask = event.stateMask;
+            mouseEvent.time = event.time;
+            mouseEvent.x = event.x; mouseEvent.y = event.y;
+            notifyListeners (DWT.MouseDoubleClick, mouseEvent);
+            break;
+        }
+        case DWT.MouseWheel: {
+            Event keyEvent = new Event ();
+            keyEvent.time = event.time;
+            keyEvent.keyCode = event.count > 0 ? DWT.ARROW_UP : DWT.ARROW_DOWN;
+            keyEvent.stateMask = event.stateMask;
+            notifyListeners (DWT.KeyDown, keyEvent);
+            if (isDisposed ()) break;
+            event.doit = keyEvent.doit;
+            if (!event.doit) break;
+            if (event.count !is 0) {
+                event.doit = false;
+                int oldIndex = getSelectionIndex ();
+                if (event.count > 0) {
+                    select (Math.max (oldIndex - 1, 0));
+                } else {
+                    select (Math.min (oldIndex + 1, getItemCount () - 1));
+                }
+                if (oldIndex !is getSelectionIndex ()) {
+                    Event e = new Event();
+                    e.time = event.time;
+                    e.stateMask = event.stateMask;
+                    notifyListeners (DWT.Selection, e);
+                }
+                if (isDisposed ()) break;
+            }
+            break;
+        }
-        case DWT.Traverse: {
-            switch (event.detail) {
-                case DWT.TRAVERSE_RETURN:
-                case DWT.TRAVERSE_ARROW_PREVIOUS:
-                case DWT.TRAVERSE_ARROW_NEXT:
@@ -1624 +1776 @@
-                    event.doit = false;
-                    break;
+                case DWT.TRAVERSE_TAB_PREVIOUS:
+                    event.doit = traverse(DWT.TRAVERSE_TAB_PREVIOUS);
+                    event.detail = DWT.TRAVERSE_NONE;
+                    return;
-                default:
-            }
-
-            Event e = new Event ();
-            e.time = event.time;