Changeset 204:8ab2f71515ba

Timestamp:

03/08/08 15:33:54 (17 years ago)

Author:

Frank Benoit <benoit@tionex.de>

branch:

default

Message:

Fix: strange lines in CTabFolder, index bug because of evaluation order

Files:

• dwt/custom/CTabFolder.d (modified) (2 diffs)

dwt/custom/CTabFolder.d

@@ -527 +527 @@
- * @see #removeSelectionListener
- * @see SelectionEvent
- */
-public void addSelectionListener(SelectionListener listener) {
-    checkWidget();
-    if (listener is null) {
-        DWT.error(DWT.ERROR_NULL_ARGUMENT);
-    }
-    TypedListener typedListener = new TypedListener(listener);
-    addListener(DWT.Selection, typedListener);
-    addListener(DWT.DefaultSelection, typedListener);
-}
-void antialias (int[] shape, RGB lineRGB, RGB innerRGB, RGB outerRGB, GC gc){
-    // Don't perform anti-aliasing on Mac and WPF because the platform
-    // already does it.  The simple style also does not require anti-aliasing.
-==DWT.getPlatform() || "wpf"==DWT.getPlatform(
+.equals(DWT.getPlatform()) || "wpf".equals(DWT.getPlatform()
-    // Don't perform anti-aliasing on low resolution displays
-    if (getDisplay().getDepth() < 15) return;
-    if (outerRGB !is null) {
-        int index = 0;
-        bool left = true;
-        int oldY = onBottom ? 0 : getSize().y;
-        int[] outer = new int[shape.length];
-        for (int i = 0; i < shape.length/2; i++) {
-            if (left && (index + 3 < shape.length)) {
-                left = onBottom ? oldY <= shape[index+3] : oldY >= shape[index+3];
-                oldY = shape[index+1];
-            }
-
-
+
+
+
+
-        }
-        RGB from = lineRGB;
-        RGB to = outerRGB;
-        int red = from.red + 2*(to.red - from.red)/3;
-        int green = from.green + 2*(to.green - from.green)/3;
-        int blue = from.blue + 2*(to.blue - from.blue)/3;
-        Color color = new Color(getDisplay(), red, green, blue);
-        gc.setForeground(color);
-        gc.drawPolyline(outer);
-        color.dispose();
-    }
-    if (innerRGB !is null) {
-        int[] inner = new int[shape.length];
-        int index = 0;
-        bool left = true;
-        int oldY = onBottom ? 0 : getSize().y;
-        for (int i = 0; i < shape.length/2; i++) {
-            if (left && (index + 3 < shape.length)) {
-                left = onBottom ? oldY <= shape[index+3] : oldY >= shape[index+3];
-                oldY = shape[index+1];
-            }
-
-
+
+
+
+
-        }
-        RGB from = lineRGB;
-        RGB to = innerRGB;
-        int red = from.red + 2*(to.red - from.red)/3;
-        int green = from.green + 2*(to.green - from.green)/3;
-        int blue = from.blue + 2*(to.blue - from.blue)/3;
-        Color color = new Color(getDisplay(), red, green, blue);
-        gc.setForeground(color);
-        gc.drawPolyline(inner);
-        color.dispose();
-    }
-}
-public override Rectangle computeTrim (int x, int y, int width, int height) {
-    checkWidget();
-    int trimX = x - marginWidth - highlight_margin - borderLeft;
@@ -1304 +1308 @@
-    do {
-        while (index < length_ && string[index] !is '&') index++;
-        if (++index >= length_) return '\0';
-        if (string[index] !is '&') return CharacterFirstToLower(string[index..$]);
-        index++;
-    } while (index < length_);
-    return '\0';
-}
-char[] stripMnemonic (char[] string) {
-    int index = 0;
-    int length_ = string.length;
-    do {
-        while ((index < length_) && (string[index] !is '&')) index++;
-        if (++index >= length_) return string;
-        if (string[index] !is '&') {
-[0 .. index-1] ~ string[index .. length_]
+.substring(0, index-1) ~ string.substring(index, length_)
-        }
-        index++;
-    } while (index < length_);
-    return string;
-}
-/**
- * Returns <code>true</code> if the receiver is minimized.
- *
- * @return the receiver's minimized 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>
- *