Changeset 115:640928daee8c

Timestamp:

02/10/08 22:05:55 (1 year ago)

Author:

Frank Benoit <benoit@tionex.de>

Children:

116:a0366718e047 117:25f88bf5a6df

branch:

default

Message:

Revert the reverting changes
Backed out changeset f353be82b6be

Files:

• dwt/graphics/Cursor.d (modified) (3 diffs)
• dwt/graphics/Device.d (modified) (3 diffs)
• dwt/graphics/GC.d (modified) (26 diffs)
• dwt/graphics/Image.d (modified) (22 diffs)
• dwt/graphics/Region.d (modified) (2 diffs)
• dwt/internal/ImageList.d (modified) (7 diffs)
• dwt/ole/win32/OleFrame.d (modified) (1 diff)
• dwt/widgets/Canvas.d (modified) (3 diffs)
• dwt/widgets/Combo.d (modified) (2 diffs)
• dwt/widgets/Composite.d (modified) (4 diffs)
• dwt/widgets/CoolBar.d (modified) (1 diff)
• dwt/widgets/Decorations.d (modified) (9 diffs)
• dwt/widgets/Display.d (modified) (10 diffs)
• dwt/widgets/FileDialog.d (modified) (1 diff)
• dwt/widgets/FontDialog.d (modified) (1 diff)
• dwt/widgets/Group.d (modified) (1 diff)
• dwt/widgets/Label.d (modified) (1 diff)
• dwt/widgets/Menu.d (modified) (7 diffs)
• dwt/widgets/MenuItem.d (modified) (2 diffs)
• dwt/widgets/MessageBox.d (modified) (1 diff)
• dwt/widgets/Sash.d (modified) (2 diffs)
• dwt/widgets/ScrollBar.d (modified) (1 diff)
• dwt/widgets/Shell.d (modified) (26 diffs)
• dwt/widgets/Slider.d (modified) (4 diffs)
• dwt/widgets/Spinner.d (modified) (7 diffs)
• dwt/widgets/Table.d (modified) (9 diffs)
• dwt/widgets/Text.d (modified) (1 diff)
• dwt/widgets/ToolBar.d (modified) (2 diffs)
• dwt/widgets/ToolTip.d (modified) (2 diffs)
• dwt/widgets/Tree.d (modified) (16 diffs)
• dwt/widgets/TreeItem.d (modified) (3 diffs)

dwt/graphics/Cursor.d

@@ -232 +232 @@
-        if (width is 32 && height is 32) {
-            auto hInst = OS.GetModuleHandle(null);
-static 
+
-            handle = OS.CreateCursor(hInst, 5, 0, 32, 32, HAND_SOURCE.ptr, HAND_MASK.ptr);
-
@@ -302 +302 @@
-    /* Create the cursor */
-    auto hInst = OS.GetModuleHandle(null);
-static 
+
-    handle = OS.CreateCursor(hInst, hotspotX, hotspotY, source.width, source.height, sourceData.ptr, maskData.ptr);
-    if (handle is null) DWT.error(DWT.ERROR_NO_HANDLES);
@@ -397 +397 @@
-        * put the flag back in.
-        */
-static 
+
-    }
-    handle = null;

dwt/graphics/Device.d

@@ -196 +196 @@
-void checkGDIP() {
-    if (gdipToken) return;
-static 
+
-    int oldErrorMode = OS.SetErrorMode (OS.SEM_FAILCRITICALERRORS);
-    try {
@@ -674 +674 @@
-protected void init () {
-    if (debug_) {
-static 
+
-    }
-
-    /* Initialize scripts list */
-static 
+
-        SCRIPT_PROPERTIES** ppSp;
-        int piNumScripts;
@@ -703 +703 @@
-    int numEntries = OS.GetDeviceCaps (hDC, OS.SIZEPALETTE);
-
-static 
+
-        /*
-        * Feature on WinCE.  For some reason, certain 8 bit WinCE

dwt/graphics/GC.d

@@ -554 +554 @@
-        * BitBlt and invalidate the appropriate source area.
-        */
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-                        OS.InvalidateRect(hwnd, &lprcScroll, true);
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
-                    }
-                }
@@ -771 +769 @@
-    * Polyline.
-    */
-static 
+
-        /* compute arc with a simple linear interpolation */
-        if (arcAngle < 0) {
@@ -1060 +1058 @@
-    /* Get the icon info */
-    ICONINFO srcIconInfo;
-static 
+
-        Image.GetIconInfo(srcImage, &srcIconInfo);
-    } else {
@@ -1112 +1110 @@
-            bool stretch = !simple && (srcWidth !is destWidth || srcHeight !is destHeight);
-            if (stretch) {
-static 
+
-                OS.StretchBlt(dstHdc, 0, 0, destWidth, destHeight, srcHdc, srcX, srcColorY, srcWidth, srcHeight, OS.SRCCOPY);
-            } else {
@@ -1339 +1337 @@
-        auto oldTempBitmap = OS.SelectObject(tempHdc, tempDib);
-        if (!simple && (srcWidth !is destWidth || srcHeight !is destHeight)) {
-static 
+
-            OS.StretchBlt(tempHdc, 0, 0, destWidth, destHeight, memHdc, 0, 0, srcWidth, srcHeight, OS.SRCCOPY);
-        } else {
@@ -1350 +1348 @@
-    } else {
-        if (!simple && (srcWidth !is destWidth || srcHeight !is destHeight)) {
-static 
+
-            OS.StretchBlt(memHdc, 0, 0, destWidth, destHeight, memHdc, 0, 0, srcWidth, srcHeight, OS.SRCCOPY);
-        } else {
@@ -1415 +1413 @@
-    OS.SelectClipRgn(handle, rgn);
-    int rop2 = 0;
-static 
+
-        rop2 = OS.GetROP2(handle);
-    } else {
@@ -1424 +1422 @@
-    if (!simple && (srcWidth !is destWidth || srcHeight !is destHeight)) {
-        int mode = 0;
-static 
+
-        OS.StretchBlt(handle, destX, destY, destWidth, destHeight, srcHdc, srcX, srcY, srcWidth, srcHeight, dwRop);
-static 
+
-    } else {
-        OS.BitBlt(handle, destX, destY, destWidth, destHeight, srcHdc, srcX, srcY, dwRop);
@@ -1461 +1459 @@
-    if (!simple && (srcWidth !is destWidth || srcHeight !is destHeight)) {
-        int mode = 0;
-static 
+
-        OS.StretchBlt(destHdc, x, y, destWidth, destHeight, srcHdc, srcX, srcColorY, srcWidth, srcHeight, OS.SRCINVERT);
-        OS.SelectObject(srcHdc, srcMask);
@@ -1467 +1465 @@
-        OS.SelectObject(srcHdc, srcColor);
-        OS.StretchBlt(destHdc, x, y, destWidth, destHeight, srcHdc, srcX, srcColorY, srcWidth, srcHeight, OS.SRCINVERT);
-static 
+
-    } else {
-        OS.BitBlt(destHdc, x, y, destWidth, destHeight, srcHdc, srcX, srcColorY, OS.SRCINVERT);
@@ -1501 +1499 @@
-        if (isDib) {
-            /* Palette-based DIBSECTION */
-static 
+
-                byte* pBits = cast(byte*)bm.bmBits;
-                //OS.MoveMemory(pBits, bm.bmBits, 1);
@@ -1552 +1550 @@
-            byte[] bmi = new byte[BITMAPINFOHEADER.sizeof + numColors * 4];
-            bmi[] = (cast(byte*)&bmiHeader)[ 0 .. BITMAPINFOHEADER.sizeof ];
-static 
+
-            OS.GetDIBits(srcHdc, srcImage.handle, 0, 0, null, cast(BITMAPINFO*)bmi.ptr, OS.DIB_RGB_COLORS);
-            int offset = BITMAPINFOHEADER.sizeof + 4 * srcImage.transparentPixel;
@@ -1613 +1611 @@
-            OS.BitBlt(tempHdc, 0, 0, destWidth, destHeight, handle, destX, destY, OS.SRCCOPY);
-            if (!simple && (srcWidth !is destWidth || srcHeight !is destHeight)) {
-static 
+
-                OS.StretchBlt(tempHdc, 0, 0, destWidth, destHeight, srcHdc, srcX, srcY, srcWidth, srcHeight, OS.SRCINVERT);
-                OS.StretchBlt(tempHdc, 0, 0, destWidth, destHeight, maskHdc, srcX, srcY, srcWidth, srcHeight, OS.SRCAND);
@@ -1640 +1638 @@
-    auto oldSrcBitmap = OS.SelectObject(srcHdc, srcImage.handle);
-    int rop2 = 0;
-static 
+
-        rop2 = OS.GetROP2(handle);
-    } else {
@@ -1649 +1647 @@
-    if (!simple && (srcWidth !is destWidth || srcHeight !is destHeight)) {
-        int mode = 0;
-static 
+
-        OS.StretchBlt(handle, destX, destY, destWidth, destHeight, srcHdc, srcX, srcY, srcWidth, srcHeight, dwRop);
-static 
+
-    } else {
-        OS.BitBlt(handle, destX, destY, destWidth, destHeight, srcHdc, srcX, srcY, dwRop);
@@ -1688 +1686 @@
-        }
-    }
-static 
+
-        int [] points = [x1, y1, x2, y2];
-        OS.Polyline (handle, cast(POINT*)points.ptr, points.length / 2);
@@ -1988 +1986 @@
-        if (data.lineWidth !is 0 && data.lineWidth % 2 is 0) x--;
-    }
-static 
+
-        /*
-        * Bug in WinCE PPC.  On certain devices, RoundRect does not draw
@@ -2179 +2177 @@
-    }
-    int rop2 = 0;
-static 
+
-        rop2 = OS.SetROP2(handle, OS.R2_COPYPEN);
-        OS.SetROP2(handle, rop2);
@@ -2403 +2401 @@
-    }
-    int rop2 = 0;
-static 
+
-        rop2 = OS.SetROP2(handle, OS.R2_COPYPEN);
-        OS.SetROP2(handle, rop2);
@@ -2520 +2518 @@
-    * WinCE SDK.  The fix is to emulate it by using Polygon.
-    */
-static 
+
-        /* compute arc with a simple linear interpolation */
-        if (arcAngle < 0) {
@@ -2654 +2652 @@
-    */
-    int rop2 = 0;
-static 
+
-        rop2 = OS.SetROP2(handle, OS.R2_COPYPEN);
-        OS.SetROP2(handle, rop2);
@@ -2824 +2822 @@
-    }
-    int rop2 = 0;
-static 
+
-        rop2 = OS.SetROP2(handle, OS.R2_COPYPEN);
-        OS.SetROP2(handle, rop2);
@@ -3270 +3268 @@
-public int getFillRule() {
-    if (handle is null) DWT.error(DWT.ERROR_GRAPHIC_DISPOSED);
-static 
+
-    return OS.GetPolyFillMode(handle) is OS.WINDING ? DWT.FILL_WINDING : DWT.FILL_EVEN_ODD;
-}
@@ -3616 +3614 @@
-    if (handle is null) DWT.error(DWT.ERROR_GRAPHIC_DISPOSED);
-    int rop2 = 0;
-static 
+
-        rop2 = OS.SetROP2 (handle, OS.R2_COPYPEN);
-        OS.SetROP2 (handle, rop2);
@@ -3694 +3692 @@
-        }
-        POINT pt;
-static 
+
-        return Gdip.Matrix_new(-1, 0, 0, 1, width + 2 * pt.x, 0);
-    }
@@ -4151 +4149 @@
-public void setFillRule(int rule) {
-    if (handle is null) DWT.error(DWT.ERROR_GRAPHIC_DISPOSED);
-static 
+
-    int mode = OS.ALTERNATE;
-    switch (rule) {

dwt/graphics/Image.d

@@ -269 +269 @@
-                    break;
-                case DWT.ICON:
-static 
+
-                        init(device, srcImage.data);
-                    } else {
@@ -984 +984 @@
-            */
-            ICONINFO iconInfo;
-static 
+
-                GetIconInfo(this, &iconInfo);
-            } else {
@@ -1054 +1054 @@
-    if (memGC !is null) memGC.dispose();
-    if (type is DWT.ICON) {
-static 
+
-        OS.DestroyIcon (handle);
-    } else {
@@ -1114 +1114 @@
-    int red = 0, green = 0, blue = 0;
-    if (bm.bmBitsPixel <= 8)  {
-static 
+
-            byte[1] pBits;
-            OS.MoveMemory(pBits.ptr, bm.bmBits, 1);
@@ -1186 +1186 @@
-            return new Rectangle(0, 0, width = bm.bmWidth, height = bm.bmHeight);
-        case DWT.ICON:
-static 
+
-                return new Rectangle(0, 0, width = data.width, height = data.height);
-            } else {
@@ -1226 +1226 @@
-    switch (type) {
-        case DWT.ICON: {
-static 
+
-            ICONINFO info;
-static 
+
-            OS.GetIconInfo(handle, &info);
-            /* Get the basic BITMAP information */
@@ -1269 +1269 @@
-            int imageSize;
-            /* Call with null lpBits to get the image size */
-static 
+
-            OS.GetDIBits(hBitmapDC, hBitmap, 0, height, null, cast(BITMAPINFO*)bmi.ptr, OS.DIB_RGB_COLORS);
-            OS.MoveMemory(&bmiHeader, bmi.ptr, BITMAPINFOHEADER.sizeof);
@@ -1278 +1278 @@
-            auto lpvBits = cast(byte*) OS.HeapAlloc(hHeap, OS.HEAP_ZERO_MEMORY, imageSize);
-            if (lpvBits is null) DWT.error(DWT.ERROR_NO_HANDLES);
-static 
+
-            OS.GetDIBits(hBitmapDC, hBitmap, 0, height, lpvBits, cast(BITMAPINFO*)bmi.ptr, OS.DIB_RGB_COLORS);
-            OS.MoveMemory(data.ptr, lpvBits, imageSize);
@@ -1305 +1305 @@
-            if (info.hbmColor is null) {
-                /* Do the bottom half of the mask */
-static 
+
-                OS.GetDIBits(hBitmapDC, hBitmap, height, height, lpvBits, cast(BITMAPINFO*)bmi.ptr, OS.DIB_RGB_COLORS);
-                OS.MoveMemory(maskData.ptr, lpvBits, imageSize);
@@ -1327 +1327 @@
-                OS.SelectObject(hBitmapDC, info.hbmMask);
-                /* Call with null lpBits to get the image size */
-static 
+
-                OS.GetDIBits(hBitmapDC, info.hbmMask, 0, height, null, cast(BITMAPINFO*)bmi.ptr, OS.DIB_RGB_COLORS);
-                OS.MoveMemory(&bmiHeader, bmi.ptr, BITMAPINFOHEADER.sizeof);
@@ -1334 +1334 @@
-                auto lpvMaskBits = OS.HeapAlloc(hHeap, OS.HEAP_ZERO_MEMORY, imageSize);
-                if (lpvMaskBits is null) DWT.error(DWT.ERROR_NO_HANDLES);
-static 
+
-                OS.GetDIBits(hBitmapDC, info.hbmMask, 0, height, lpvMaskBits, cast(BITMAPINFO*)bmi.ptr, OS.DIB_RGB_COLORS);
-                OS.MoveMemory(maskData.ptr, lpvMaskBits, imageSize);
@@ -1389 +1389 @@
-            */
-            auto handle = this.handle;
-static 
+
-                if (!isDib) {
-                    bool mustRestore = false;
@@ -1454 +1454 @@
-            } else {
-                /* Call with null lpBits to get the image size */
-static 
+
-                OS.GetDIBits(hBitmapDC, handle, 0, height, null, cast(BITMAPINFO*)bmi.ptr, OS.DIB_RGB_COLORS);
-                OS.MoveMemory(&bmiHeader, bmi.ptr, BITMAPINFOHEADER.sizeof);
@@ -1462 +1462 @@
-            /* Get the bitmap data */
-            if (isDib) {
-
-
-
-
-
+
+
+
-                } else {
-                    OS.MoveMemory(data.ptr, bm.bmBits, imageSize);
@@ -1474 +1472 @@
-                auto lpvBits = OS.HeapAlloc(hHeap, OS.HEAP_ZERO_MEMORY, imageSize);
-                if (lpvBits is null) DWT.error(DWT.ERROR_NO_HANDLES);
-static 
+
-                OS.GetDIBits(hBitmapDC, handle, 0, height, lpvBits, cast(BITMAPINFO*)bmi.ptr, OS.DIB_RGB_COLORS);
-                OS.MoveMemory(data.ptr, lpvBits, imageSize);
@@ -1484 +1482 @@
-                RGB[] rgbs = new RGB[numColors];
-                if (isDib) {
-static 
+
-                        /*
-                        * Feature on WinCE.  GetDIBColorTable is not supported.
@@ -1539 +1537 @@
-                OS.RealizePalette(hBitmapDC);
-            }
-static 
+
-                if (handle !is this.handle) {
-                    /* free temporary DIB */
@@ -1620 +1618 @@
-    bmiHeader.biPlanes = 1;
-    bmiHeader.biBitCount = cast(short)depth;
-static 
+
-    else bmiHeader.biCompression = OS.BI_RGB;
-    byte[] bmi = new byte[BITMAPINFOHEADER.sizeof + (OS.IsWinCE ? 12 : 0)];
-    OS.MoveMemory(bmi.ptr, &bmiHeader, BITMAPINFOHEADER.sizeof);
-    /* Set the rgb colors into the bitmap info */
-static 
+
-        int redMask = 0xFF00;
-        int greenMask = 0xFF0000;
@@ -1875 +1873 @@
-            image.handle = hIcon;
-            image.type = DWT.ICON;
-static 
+
-        }
-    } else {
@@ -2088 +2086 @@
-    * Note.  Not implemented on WinCE.
-    */
-static 
+
-    if (isDisposed()) DWT.error(DWT.ERROR_GRAPHIC_DISPOSED);
-    if (color is null) DWT.error(DWT.ERROR_NULL_ARGUMENT);
@@ -2104 +2102 @@
-    int maxColors = 1 << bm.bmBitsPixel;
-    byte[] colors = new byte[maxColors * 4];
-static 
+
-    int numColors = OS.GetDIBColorTable(hdcMem, 0, maxColors, cast(RGBQUAD*)colors.ptr);
-    int offset = transparentPixel * 4;
@@ -2110 +2108 @@
-    colors[offset + 1] = cast(byte)color.getGreen();
-    colors[offset + 2] = cast(byte)color.getRed();
-static 
+
-    OS.SetDIBColorTable(hdcMem, 0, numColors, cast(RGBQUAD*)colors.ptr);
-    OS.DeleteDC(hdcMem);

dwt/graphics/Region.d

@@ -120 +120 @@
-    if (isDisposed()) DWT.error(DWT.ERROR_GRAPHIC_DISPOSED);
-    if (pointArray is null) DWT.error(DWT.ERROR_NULL_ARGUMENT);
-static 
+
-    auto polyRgn = OS.CreatePolygonRgn(cast(POINT*)pointArray.ptr, pointArray.length / 2, OS.ALTERNATE);
-    OS.CombineRgn (handle, handle, polyRgn, OS.RGN_OR);
@@ -468 +468 @@
-    if (isDisposed()) DWT.error(DWT.ERROR_GRAPHIC_DISPOSED);
-    if (pointArray is null) DWT.error(DWT.ERROR_NULL_ARGUMENT);
-static 
+
-    auto polyRgn = OS.CreatePolygonRgn(cast(POINT*)pointArray.ptr, pointArray.length / 2, OS.ALTERNATE);
-    OS.CombineRgn (handle, handle, polyRgn, OS.RGN_DIFF);

dwt/internal/ImageList.d

@@ -35 +35 @@
-    this.style = style;
-    int flags = OS.ILC_MASK;
-static 
+
-        flags |= OS.ILC_COLOR;
-    } else {
@@ -120 +120 @@
-        //OS.MoveMemory(bmi, bmiHeader, BITMAPINFOHEADER.sizeof);
-        /* Set the rgb colors into the bitmap info */
-static 
+
-            int redMask = 0xFF00;
-            int greenMask = 0xFF0000;
@@ -146 +146 @@
-    OS.SelectObject (hdc2, hBitmap);
-    if (width !is bm.bmWidth || height !is bm.bmHeight) {
-static 
+
-        OS.StretchBlt (hdc2, 0, 0, width, height, hdc1, 0, 0, bm.bmWidth, bm.bmHeight, OS.SRCCOPY);
-    } else {
@@ -242 +242 @@
-        auto memHdc2 = OS.CreateCompatibleDC (hdc);
-        auto oldMemBitmap2 = OS.SelectObject (memHdc2, memDib2);
-static 
+
-        OS.StretchBlt (memHdc2, 0, 0, destWidth, destHeight, memHdc, 0, 0, srcWidth, srcHeight, OS.SRCCOPY);
-        OS.SelectObject (memHdc2, oldMemBitmap2);
@@ -280 +280 @@
-        auto hMask2 = OS.CreateBitmap (destWidth, destHeight, 1, 1, null);
-        OS.SelectObject (hdc2, hMask2);
-static 
+
-        OS.StretchBlt (hdc2, 0, 0, destWidth, destHeight, hdc1, 0, 0, srcWidth, srcHeight, OS.SRCCOPY);
-        OS.DeleteDC (hdc1);
@@ -331 +331 @@
-        OS.SelectObject (hdc2, hMask);
-        if (destWidth !is srcWidth || destHeight !is srcHeight) {
-static 
+
-            OS.StretchBlt (hdc2, 0, 0, destWidth, destHeight, hdc1, 0, 0, srcWidth, srcHeight, OS.SRCCOPY);
-        } else {
@@ -448 +448 @@
-        }
-        case DWT.ICON: {
-static 
+
-                OS.ImageList_ReplaceIcon (handle, index is count ? -1 : index, hImage);
-            } else {

dwt/ole/win32/OleFrame.d

@@ -244 +244 @@
-                        case OS.WM_KEYDOWN:
-                        case OS.WM_SYSKEYDOWN: {
-static 
+
-                                switch (msg.wParam) {
-                                    case OS.VK_SHIFT:

dwt/widgets/Canvas.d

@@ -198 +198 @@
-    OS.GetClientRect (handle, &clientRect);
-    if (OS.IntersectRect (&clientRect, &sourceRect, &clientRect)) {
-static 
+
-            OS.UpdateWindow (handle);
-        } else {
@@ -207 +207 @@
-    int deltaX = destX - x, deltaY = destY - y;
-    if (findImageControl () !is null) {
-static 
+
-            OS.InvalidateRect (handle, &sourceRect, true);
-        } else {
@@ -215 +215 @@
-        }
-        OS.OffsetRect (&sourceRect, deltaX, deltaY);
-static 
+
-            OS.InvalidateRect (handle, &sourceRect, true);
-        } else {

dwt/widgets/Combo.d

@@ -1609 +1609 @@
-public void setOrientation (int orientation) {
-    checkWidget();
-static 
+
-    if (OS.WIN32_VERSION < OS.VERSION (4, 10)) return;
-    int flags = DWT.RIGHT_TO_LEFT | DWT.LEFT_TO_RIGHT;
@@ -2173 +2173 @@
-        LRESULT result = super.WM_SIZE (wParam, lParam);
-        if (OS.IsWindowVisible (handle)) {
-static 
+
-                auto hwndText = OS.GetDlgItem (handle, CBID_EDIT);
-                if (hwndText !is null) OS.InvalidateRect (hwndText, null, true);

dwt/widgets/Composite.d

@@ -761 +761 @@
-        if (processID is OS.GetCurrentProcessId ()) {
-            if (display.msgHook is null) {
-static 
+
-                    //display.getMsgCallback = new Callback (display, "getMsgProc", 3);
-                    //display.getMsgProc = display.getMsgCallback.getAddress ();
@@ -1138 +1138 @@
-    /* Set the clipping bits */
-    int oldBits = 0, newBits = 0;
-static 
+
-        oldBits = OS.GetWindowLong (handle, OS.GWL_STYLE);
-        newBits = oldBits | OS.WS_CLIPSIBLINGS | OS.WS_CLIPCHILDREN;
@@ -1448 +1448 @@
-    * redraw the non-client area.
-    */
-static 
+
-        int cmd = wParam & 0xFFF0;
-        switch (cmd) {
@@ -1503 +1503 @@
-
-override LRESULT wmNotify (NMHDR* hdr, int wParam, int lParam) {
-static 
+
-        switch (hdr.code) {
-            /*

dwt/widgets/CoolBar.d

@@ -761 +761 @@
-    */
-    if (!OS.IsWindowVisible (handle)) return;
-static 
+
-        OS.InvalidateRect (handle, null, true);
-    } else {

dwt/widgets/Decorations.d

@@ -183 +183 @@
-void _setMaximized (bool maximized) {
-    swFlags = maximized ? OS.SW_SHOWMAXIMIZED : OS.SW_RESTORE;
-static 
+
-        /*
-        * Note: WinCE does not support SW_SHOWMAXIMIZED and SW_RESTORE. The
@@ -213 +213 @@
-
-void _setMinimized (bool minimized) {
-static 
+
-    swFlags = minimized ? OS.SW_SHOWMINNOACTIVE : OS.SW_RESTORE;
-    if (!OS.IsWindowVisible (handle)) return;
@@ -261 +261 @@
-        style &= ~(DWT.CLOSE | DWT.TITLE | DWT.MIN | DWT.MAX | DWT.RESIZE | DWT.BORDER);
-    }
-static 
+
-        /*
-        * Feature in WinCE PPC.  WS_MINIMIZEBOX or WS_MAXIMIZEBOX
@@ -457 +457 @@
-    */
-    if ((state & FOREIGN_HANDLE) is 0) {
-static 
+
-            auto hIcon = OS.LoadIcon (null, cast(wchar*)OS.IDI_APPLICATION);
-            OS.SendMessage (handle, OS.WM_SETICON, OS.ICON_SMALL, hIcon);
@@ -521 +521 @@
-override public Rectangle getBounds () {
-    checkWidget ();
-static 
+
-        if (OS.IsIconic (handle)) {
-            WINDOWPLACEMENT lpwndpl;
@@ -665 +665 @@
-override public Point getLocation () {
-    checkWidget ();
-static 
+
-        if (OS.IsIconic (handle)) {
-            WINDOWPLACEMENT lpwndpl;
@@ -868 +868 @@
-
-override void setBounds (int x, int y, int width, int height, int flags, bool defer) {
-static 
+
-        swFlags = OS.SW_RESTORE;
-    } else {
@@ -989 +989 @@
-    * On WinCE PPC, icons in windows are not displayed.
-    */
-static 
+
-    if (smallImage !is null) smallImage.dispose ();
-    if (largeImage !is null) largeImage.dispose ();
@@ -1066 +1066 @@
-    * The fix is to force a redraw.
-    */
-static 
+
-        if (hSmallIcon is null && hLargeIcon is null && (style & DWT.BORDER) !is 0) {
-            int flags = OS.RDW_FRAME | OS.RDW_INVALIDATE;

dwt/widgets/Display.d

@@ -654 +654 @@
-
-int asciiKey (int key) {
-static 
+
-
-    /* Get the current keyboard. */
@@ -1103 +1103 @@
-        auto hMask2 = OS.CreateBitmap (destWidth, destHeight, 1, 1, null);
-        OS.SelectObject (hdc2, hMask2);
-static 
+
-        OS.StretchBlt (hdc2, 0, 0, destWidth, destHeight, hdc1, 0, 0, srcWidth, srcHeight, OS.SRCCOPY);
-        OS.DeleteDC (hdc1);
@@ -2318 +2318 @@
-    if (systemFont !is null) return systemFont;
-    HFONT hFont;
-static 
+
-        NONCLIENTMETRICS info;
-        info.cbSize = NONCLIENTMETRICS.sizeof;
@@ -2402 +2402 @@
-    checkDevice ();
-    if (tray !is null) return tray;
-static 
+
-    return tray;
-}
@@ -2877 +2877 @@
-                    case OS.WM_KEYDOWN:
-                    case OS.WM_SYSKEYDOWN: {
-static 
+
-                            switch (keyMsg.wParam) {
-                                case OS.VK_SHIFT:
@@ -3249 +3249 @@
-                    case DWT.LF: return false;
-                    default: {
-static 
+
-                            inputs.wVk = cast(int)OS.CharUpper (cast(wchar*) key);
-                        } else {
@@ -3493 +3493 @@
-
-    /* Unhook the idle hook */
-static 
+
-        if (idleHook !is null) OS.UnhookWindowsHookEx (idleHook);
-        idleHook = null;
@@ -3869 +3869 @@
-    }
-    if (systemFont !is null) {
-static 
+
-            NONCLIENTMETRICS info;
-            info.cbSize = NONCLIENTMETRICS.sizeof;
@@ -4138 +4138 @@
-
-int shiftedKey (int key) {
-static 
+
-
-    /* Clear the virtual keyboard and press the shift key */
@@ -4403 +4403 @@
-
-void wakeThread () {
-static