Changeset 194:3afcd4ddcf90

Timestamp:

03/19/08 16:48:31 (5 months ago)

Author:

Frank Benoit <benoit@tionex.de>

branch:

default

Message:

Update to SWT 3.3.2

Files:

• dwt/custom/CCombo.d (modified) (1 diff)
• dwt/dnd/DragSource.d (modified) (6 diffs)
• dwt/dnd/TableDragSourceEffect.d (modified) (1 diff)
• dwt/dnd/TreeDragSourceEffect.d (modified) (2 diffs)
• dwt/dwthelper/utils.d (modified) (1 diff)
• dwt/graphics/GC.d (modified) (1 diff)
• dwt/internal/Library.d (modified) (2 diffs)
• dwt/internal/win32/OS.d (modified) (1 diff)
• dwt/widgets/Decorations.d (modified) (2 diffs)
• dwt/widgets/Synchronizer.d (modified) (2 diffs)
• dwt/widgets/TableColumn.d (modified) (1 diff)

dwt/custom/CCombo.d

@@ -1088 +1088 @@
-            break;
-        case DWT.Deactivate:
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-            break;
-        default:

dwt/dnd/DragSource.d

@@ -132 +132 @@
-    DragSourceEffect dragEffect;
-    Composite topControl;
+    HWND hwndDrag;
-
-    // ole interfaces
@@ -144 +145 @@
-    static const char[] DRAGSOURCEID = "DragSource"; //$NON-NLS-1$
-    static const int CFSTR_PERFORMEDDROPEFFECT;
+    static final TCHAR[] WindowClass = "#32770\0";
-    static this(){
-        CFSTR_PERFORMEDDROPEFFECT  = Transfer.registerType("Performed DropEffect");     //$NON-NLS-1$
@@ -299 +301 @@
-    int operations = opToOs(getStyle());
-    Display display = control.getDisplay();
-org.eclipse.s
+d
-    Object oldValue = display.getData(key);
-    display.setData(key, new ValueWrapperBool(true));
-    ImageList imagelist = null;
-    Image image = event.image;
+    hwndDrag = null;
+    topControl = null;
-    if (image !is null) {
-        imagelist = new ImageList(DWT.NONE);
-        imagelist.add(image);
-        topControl = control.getShell();
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        /*
-        * Feature in Windows. When ImageList_DragEnter() is called,
@@ -324 +352 @@
-            OS.RedrawWindow (topControl.handle, null, null, flags);
-        }
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    int operation = osToOp(pdwEffect[0]);
-    if (dataEffect is DND.DROP_MOVE) {
@@ -460 +501 @@
-
-package .LRESULT QueryContinueDrag(int fEscapePressed, DWORD grfKeyState) {
+    if (topControl !is null && topControl.isDisposed()) return COM.DRAGDROP_S_CANCEL;
-    if (fEscapePressed !is 0){
-topControl !is null) OS.ImageList_DragLeave(topControl.handle
+hwndDrag !is null) OS.ImageList_DragLeave(hwndDrag
-        return COM.DRAGDROP_S_CANCEL;
-    }
@@ -473 +515 @@
-//  if (display.xMouse) mask |= OS.MK_XBUTTON1 | OS.MK_XBUTTON2;
-    if ((grfKeyState & mask) is 0) {
-topControl !is null) OS.ImageList_DragLeave(topControl.handle
+hwndDrag !is null) OS.ImageList_DragLeave(hwndDrag
-        return COM.DRAGDROP_S_DROP;
-    }
-
-
-
-
-
-
+
+
+
+
+
+
-    }
-    return COM.S_OK;

dwt/dnd/TableDragSourceEffect.d

@@ -100 +100 @@
-            auto hDC = OS.GetDC(null);
-            auto hDC1 = OS.CreateCompatibleDC(hDC);
+            if (!OS.IsWinCE && OS.WIN32_VERSION >= OS.VERSION(4, 10)) {
+                if ((table.getStyle() & DWT.RIGHT_TO_LEFT) !is 0) {
+                    OS.SetLayout(hDC1, OS.LAYOUT_RTL | OS.LAYOUT_BITMAPORIENTATIONPRESERVED);
+                }
+            }
-            auto bitmap = OS.CreateCompatibleBitmap(hDC, bounds.width, bounds.height);
-            auto hOldBitmap = OS.SelectObject(hDC1, bitmap);

dwt/dnd/TreeDragSourceEffect.d

@@ -97 +97 @@
-                bounds = bounds.makeUnion(selection[i].getBounds(0));
-            }
-null
+tree.handle
-            auto hDC1 = OS.CreateCompatibleDC(hDC);
-            auto bitmap = OS.CreateCompatibleBitmap(hDC, bounds.width, bounds.height);
@@ -115 +115 @@
-            OS.SelectObject(hDC1, hOldBitmap);
-            OS.DeleteDC (hDC1);
-null
+tree.handle
-            Display display = tree.getDisplay();
-            dragSourceImage = Image.win32_new(display, DWT.BITMAP, bitmap);

dwt/dwthelper/utils.d

@@ -11 +11 @@
-import tango.io.Stdout;
-import tango.stdc.stringz;
-
+static 
-import tango.text.Unicode;
-import tango.text.convert.Utf;

dwt/graphics/GC.d

@@ -3715 +3715 @@
-    data.state &= ~(NULL_BRUSH | NULL_PEN);
-    auto hFont = data.hFont;
-
+ && hFont !is cast(HFONT)-1 
-        data.state &= ~FONT;
-    } else {
-
+data.
-    }
-    auto hPalette = data.device.hPalette;

dwt/internal/Library.d

@@ -1 @@
-
+
- * Copyright (c) 2000, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
@@ -34 +34 @@
-     * DWT Minor version number (must be in the range 0..999)
-     */
-6
+9
-
-    /**

dwt/internal/win32/OS.d

@@ -1041 +1041 @@
-    public static const int LANG_USER_DEFAULT = 1 << 10;
-    public static const int LAYOUT_RTL = 0x1;
+    public static const int LAYOUT_BITMAPORIENTATIONPRESERVED = 0x8;
-    public static const int LBN_DBLCLK = 0x2;
-    public static const int LBN_SELCHANGE = 0x1;

dwt/widgets/Decorations.d

@@ -446 +446 @@
-        setSystemMenu ();
-    }
-    /*
-    * Set the default icon for the shell to IDI_APPLICATION.
-    * This is not necessary for native applications but later
-    * versions of Java set the icon in javaw.exe instead of
-    * leaving the default.
-    *
-    * NOTE:  The icon is not leaked.  It is shared within
-    * the process by all threads and is released when the
-    * process exits.
-    */
-    if ((state & FOREIGN_HANDLE) is 0) {
-        static if (!OS.IsWinCE) {
-            auto hIcon = OS.LoadIcon (null, cast(wchar*)OS.IDI_APPLICATION);
-            OS.SendMessage (handle, OS.WM_SETICON, OS.ICON_SMALL, hIcon);
-        }
-    }
-}
-
@@ -1029 +1013 @@
-            default:
-        }
-    } else {
-        /*
-        * Set the default icon for the shell to IDI_APPLICATION.
-        * This is not necessary for native applications but later
-        * versions of Java set the icon in javaw.exe instead of
-        * leaving the default.
-        *
-        * NOTE:  The icon is not leaked.  It is shared within
-        * the process by all threads and is released when the
-        * process exits.
-        */
-        if ((state & FOREIGN_HANDLE) is 0) {
-            hSmallIcon = OS.LoadIcon (null, cast(wchar*)OS.IDI_APPLICATION);
-        }
-    }
-    OS.SendMessage (handle, OS.WM_SETICON, OS.ICON_SMALL, hSmallIcon);

dwt/widgets/Synchronizer.d

@@ -47 +47 @@
-    Thread syncThread;
-
+    //TEMPORARY CODE
+    static final bool IS_CARBON = false;//"carbon".equals (DWT.getPlatform ());
+
-/**
- * Constructs a new instance of this class.
@@ -85 +88 @@
-public void asyncExec (Runnable runnable) {
-    if (runnable is null) {
-
-
+
+
+
+
+
-    }
-    addLast (new RunnableLock (runnable));

dwt/widgets/TableColumn.d

@@ -562 +562 @@
-    auto hwnd = parent.handle;
-    LVCOLUMN lvColumn;
- | OS.LVCF_IMAGE
+
-    OS.SendMessage (hwnd, OS.LVM_GETCOLUMN, index, &lvColumn);
-    lvColumn.fmt &= ~OS.LVCFMT_JUSTIFYMASK;