Changeset 59:dc7db4338dbe

Timestamp:

02/04/08 07:39:10 (10 months ago)

Author:

Frank Benoit <benoit@tionex.de>

branch:

default

Message:

MenuItem?

Files:

• dwt/DWTError.d (modified) (1 diff)
• dwt/DWTException.d (modified) (1 diff)
• dwt/graphics/TextLayout.d (modified) (1 diff)
• dwt/internal/win32/OS.d (modified) (3 diffs)
• dwt/widgets/MenuItem.d (modified) (38 diffs)

dwt/DWTError.d

@@ -144 +144 @@
-public void printStackTrace () {
-    Stderr.formatln( "stacktrace follows (if feature compiled in)" );
-this
+info
-        Stderr.formatln( "{}", msg );
-    }
-    if ( throwable !is null) {
-        Stderr.formatln ("*** Stack trace of contained error ***"); //$NON-NLS-1$
-
+.info
-            Stderr.formatln( "{}", msg );
-        }

dwt/DWTException.d

@@ -135 +135 @@
-public void printStackTrace () {
-    Stderr.formatln( "stacktrace follows (if feature compiled in)" );
-this
+info
-        Stderr.formatln( "{}", msg );
-    }
-    if ( throwable !is null) {
-        Stderr.formatln ("*** Stack trace of contained exception ***"); //$NON-NLS-1$
-
+.info
-            Stderr.formatln( "{}", msg );
-        }

dwt/graphics/TextLayout.d

@@ -201 +201 @@
-void breakRun(StyleItem run) {
-    if (run.psla !is null) return;
-
+0, 
-    auto hHeap = OS.GetProcessHeap();
-    run.psla = cast(SCRIPT_LOGATTR*)OS.HeapAlloc(hHeap, OS.HEAP_ZERO_MEMORY, SCRIPT_LOGATTR.sizeof * chars.length);

dwt/internal/win32/OS.d

@@ -4804 +4804 @@
-}
-
-
-
-
-
+, bool terminated = false 
+, terminated
+
+, bool terminated = false 
-    wchar[] ret;
-    try{
@@ -4815 +4815 @@
-        ret = "";
-    }
-
+
+
+
-    return ret;
-}
@@ -4824 +4826 @@
-
-public wchar* StrToWCHARz(char[] sc, uint* length = null ) {
-toString16z( StrToWCHARs(sc))
+StrToWCHARs(sc, true ).ptr
-}
-

dwt/widgets/MenuItem.d

@@ -13 +13 @@
-module dwt.widgets.MenuItem;
-
-import dwt.widgets.Item;
-import dwt.widgets.Widget;
-import dwt.widgets.Menu;
-import dwt.widgets.Decorations;
-import dwt.internal.win32.OS;
-
-class MenuItem : Item {
-    Menu parent, menu;
-    HBITMAP hBitmap;
-    int accelerator;
-    int id;
-    public this (Widget parent, int style) {
-        super (parent, style);
-    }
-public bool getEnabled () ;
-public bool isEnabled () ;
-LRESULT wmCommandChild (int wParam, int lParam) ;
-LRESULT wmDrawChild (int wParam, int lParam) ;
-LRESULT wmMeasureChild (int wParam, int lParam) ;
-void fillAccel (ACCEL* accel) ;
-int widgetStyle () ;
-void fixMenus (Decorations newParent) ;
-void releaseMenu () ;
-}
-/++
-import dwt.DWT;
-import dwt.DWTException;
@@ -48 +23 @@
-import dwt.graphics.Image;
-import dwt.graphics.Rectangle;
-import dwt.internal.win32.ACCEL;
-import dwt.internal.win32.DRAWITEMSTRUCT;
-import dwt.internal.win32.LRESULT;
-import dwt.internal.win32.MEASUREITEMSTRUCT;
-import dwt.internal.win32.MENUBARINFO;
-import dwt.internal.win32.MENUINFO;
-import dwt.internal.win32.MENUITEMINFO;
-import dwt.internal.win32.OS;
-
-
-
+
+
+
+
+
+
+
+
+
+
-
-/**
@@ -77 +52 @@
- */
-
-extends
+:
-    Menu parent, menu;
-
+
+
-    /*
-    * Feature in Windows.  On Windows 98, it is necessary
@@ -88 +64 @@
-    * everywhere but on Windows 98.
-    */
-
-
+
+
+
+
+
+
-
-/**
@@ -125 +105 @@
- * @see Widget#getStyle
- */
-MenuItem
+this
-    super (parent, checkStyle (style));
-    this.parent = parent;
@@ -167 +147 @@
- * @see Widget#getStyle
- */
-MenuItem
+this
-    super (parent, checkStyle (style));
-    this.parent = parent;
@@ -173 +153 @@
-}
-
-MenuItem
+this
-    super (parent, checkStyle (style));
-    this.parent = parent;
@@ -284 +264 @@
-    int fVirt = OS.FVIRTKEY;
-    int key = accelerator & DWT.KEY_MASK;
-int
+auto
-    if (vKey !is 0) {
-        key = vKey;
@@ -298 +278 @@
-            case 127: key = OS.VK_DELETE; break;
-            default: {
-
+cast
-                if (key is 0) return;
-
-OS.CharUpper ((short
+static 
+cast(int) OS.CharUpper (cast(TCHAR*
-                } else {
-(short
+cast(TCHAR
-                    if (vKey is -1) {
-                        fVirt = 0;
@@ -313 +293 @@
-        }
-    }
-
-
-
+cast
+cast
+cast
-    if ((accelerator & DWT.ALT) !is 0) accel.fVirt |= OS.FALT;
-    if ((accelerator & DWT.SHIFT) !is 0) accel.fVirt |= OS.FSHIFT;
@@ -368 +348 @@
-            return new Rectangle (0, 0, 0, 0);
-        }
-int
- = new MENUBARINFO ()
+auto
+
-        info1.cbSize = MENUBARINFO.sizeof;
-
+&
-            return new Rectangle (0, 0, 0, 0);
-        }
- = new MENUBARINFO ()
+
-        info2.cbSize = MENUBARINFO.sizeof;
-
+&
-            return new Rectangle (0, 0, 0, 0);
-        }
-left - info1
-top - info1
-ight - info2
-bottom - info2
+rcBar.left - info1.rcBar
+rcBar.top - info1.rcBar
+cBar.right - info2.rcBar
+rcBar.bottom - info2.rcBar
-        return new Rectangle (x, y, width, height);
-    } else {
-int
- = new RECT ()
-0, hMenu, 0, 
+auto
+
+null, hMenu, 0, &
-            return new Rectangle (0, 0, 0, 0);
-        }
- = new RECT ()
-0, hMenu, index, 
+
+null, hMenu, index, &
-            return new Rectangle (0, 0, 0, 0);
-        }
@@ -419 +399 @@
-public bool getEnabled () {
-    checkWidget ();
- || OS.IsSP) && parent.hwndCB !is 0
-int
- = new TBBUTTONINFO ()
+_ || OS.IsSP_) && parent.hwndCB !is null
+auto
+
-        info.cbSize = TBBUTTONINFO.sizeof;
-        info.dwMask = OS.TBIF_STATE;
-
+&
-        return (info.fsState & OS.TBSTATE_ENABLED) !is 0;
-    }
-int
- = new MENUITEMINFO ()
+auto
+
-    info.cbSize = MENUITEMINFO.sizeof;
-    info.fMask = OS.MIIM_STATE;
@@ -435 +415 @@
-        int index = parent.indexOf (this);
-        if (index is -1) error (DWT.ERROR_CANNOT_GET_ENABLED);
-OS.GetMenuItemInfo (hMenu, index, true, 
+cast(bool) OS.GetMenuItemInfo (hMenu, index, true, &
-    } else {
-OS.GetMenuItemInfo (hMenu, id, false, 
+cast(bool) OS.GetMenuItemInfo (hMenu, id, false, &
-    }
-    if (!success) error (DWT.ERROR_CANNOT_GET_ENABLED);
@@ -462 +442 @@
-}
-
-String
+char[]
-    if ((style & DWT.SEPARATOR) !is 0) return "|";
-    return super.getNameText ();
@@ -499 +479 @@
-    checkWidget ();
-    if ((style & (DWT.CHECK | DWT.RADIO)) is 0) return false;
- || OS.IsSP) && parent.hwndCB !is 0
-int
- = new MENUITEMINFO ()
+_ || OS.IsSP_) && parent.hwndCB !is null
+auto
+
-    info.cbSize = MENUITEMINFO.sizeof;
-    info.fMask = OS.MIIM_STATE;
-OS.GetMenuItemInfo (hMenu, id, false, 
+cast(bool) OS.GetMenuItemInfo (hMenu, id, false, &
-    if (!success) error (DWT.ERROR_CANNOT_GET_SELECTION);
-
+ 
-}
-
@@ -543 +523 @@
-
-void releaseMenu () {
-
+_
-    menu = null;
-}
@@ -555 +535 @@
-override void releaseWidget () {
-    super.releaseWidget ();
-0
-0
+null
+null
-    if (accelerator !is 0) {
-        parent.destroyAccelerators ();
@@ -684 +664 @@
-public void setEnabled (bool enabled) {
-    checkWidget ();
- || OS.IsSP) && parent.hwndCB !is 0
-int
- = new TBBUTTONINFO ()
+_ || OS.IsSP_) && parent.hwndCB !is null
+auto
+
-        info.cbSize = TBBUTTONINFO.sizeof;
-        info.dwMask = OS.TBIF_STATE;
-
+&
-        info.fsState &= ~OS.TBSTATE_ENABLED;
-        if (enabled) info.fsState |= OS.TBSTATE_ENABLED;
-
+&
-    } else {
-int
-
+auto
+static 
-            int index = parent.indexOf (this);
-            if (index is -1) return;
@@ -701 +681 @@
-            OS.EnableMenuItem (hMenu, index, uEnable);
-        } else {
- = new MENUITEMINFO ()
+
-            info.cbSize = MENUITEMINFO.sizeof;
-            info.fMask = OS.MIIM_STATE;
-OS.GetMenuItemInfo (hMenu, id, false, 
+cast(bool) OS.GetMenuItemInfo (hMenu, id, false, &
-            if (!success) error (DWT.ERROR_CANNOT_SET_ENABLED);
-            int bits = OS.MFS_DISABLED | OS.MFS_GRAYED;
@@ -714 +694 @@
-                info.fState |= bits;
-            }
-OS.SetMenuItemInfo (hMenu, id, false, 
+cast(bool) OS.SetMenuItemInfo (hMenu, id, false, &
-            if (!success) {
-                /*
@@ -753 +733 @@
-    if ((style & DWT.SEPARATOR) !is 0) return;
-    super.setImage (image);
-
- || OS.IsSP) && parent.hwndCB !is 0
+static 
+_ || OS.IsSP_) && parent.hwndCB !is null
-            int hwndCB = parent.hwndCB;
- = new TBBUTTONINFO ()
+
-            info.cbSize = TBBUTTONINFO.sizeof;
-            info.dwMask = OS.TBIF_IMAGE;
-            info.iImage = parent.imageIndex (image);
-
+&
-        }
-        return;
-    }
-    if (OS.WIN32_VERSION < OS.VERSION (4, 10)) return;
- = new MENUITEMINFO ()
+
-    info.cbSize = MENUITEMINFO.sizeof;
-    info.fMask = OS.MIIM_BITMAP;
@@ -772 +752 @@
-    } else {
-        if (!OS.IsWinCE && OS.WIN32_VERSION >= OS.VERSION (6, 0)) {
-0
-0
+null
+null
-        } else {
-            info.hbmpItem = OS.HBMMENU_CALLBACK;
-        }
-    }
-int
-
+auto
+&
-    parent.redraw ();
-}
@@ -832 +812 @@
-
-    /* Assign the new menu in the OS */
- || OS.IsSP) && parent.hwndCB !is 0
-
-int
-int hMenu = menu is null ? 0
+_ || OS.IsSP_) && parent.hwndCB !is null
+_
+HWND
+HMENU hMenu = menu is null ? null
-            OS.SendMessage (hwndCB, OS.SHCMBM_SETSUBMENU, id, hMenu);
-        }
-
+_
-    } else {
-        /*
@@ -848 +828 @@
-        * the submenu and then insert the item with InsertMenuItem ().
-        */
-int
- = new MENUITEMINFO ()
+HMENU
+
-        info.cbSize = MENUITEMINFO.sizeof;
-        info.fMask = OS.MIIM_DATA;
-        int index = 0;
-
+&
-            if (info.dwItemData is id) break;
-            index++;
@@ -870 +850 @@
-        if (!OS.IsWinCE && OS.WIN32_VERSION >= OS.VERSION (4, 10)) {
-            info.fMask = OS.MIIM_BITMAP;
-
-0
+&
+null
-            if (restoreBitmap) {
-0
-OS.SetMenuItemInfo (hMenu, id, false, 
+null
+cast(bool) OS.SetMenuItemInfo (hMenu, id, false, &
-            }
-        }
-
-        int cch = 128;
-int
+auto
-        int byteCount = cch * TCHAR.sizeof;
-int pszText =
+auto pszText = cast(TCHAR*)
-        info.fMask = OS.MIIM_STATE | OS.MIIM_ID | OS.MIIM_TYPE | OS.MIIM_DATA;
-        info.dwTypeData = pszText;
-        info.cch = cch;
-OS.GetMenuItemInfo (hMenu, index, true, 
+cast(bool) OS.GetMenuItemInfo (hMenu, index, true, &
-        if (menu !is null) {
-            menu.cascade = this;
@@ -892 +872 @@
-        }
-        OS.RemoveMenu (hMenu, index, OS.MF_BYPOSITION);
-
+static 
-            /*
-            * On WinCE, InsertMenuItem() is not available.  The fix is to
@@ -919 +899 @@
-            }
-        } else {
-OS.InsertMenuItem (hMenu, index, true, 
+cast(bool) OS.InsertMenuItem (hMenu, index, true, &
-            /*
-            * Restore the bitmap that was removed to work around a problem
@@ -937 +917 @@
-                        }
-                    }
-OS.SetMenuItemInfo (hMenu, id, false, 
+cast(bool) OS.SetMenuItemInfo (hMenu, id, false, &
-                }
-            }
-        }
-0
+null 
-        if (!success) error (DWT.ERROR_CANNOT_SET_MENU);
-    }
@@ -972 +952 @@
-    checkWidget ();
-    if ((style & (DWT.CHECK | DWT.RADIO)) is 0) return;
- || OS.IsSP) && parent.hwndCB !is 0
-int
+_ || OS.IsSP_) && parent.hwndCB !is null
+auto
-    if (OS.IsWinCE) {
-        int index = parent.indexOf (this);
@@ -980 +960 @@
-        OS.CheckMenuItem (hMenu, index, uCheck);
-    } else {
- = new MENUITEMINFO ()
+
-        info.cbSize = MENUITEMINFO.sizeof;
-        info.fMask = OS.MIIM_STATE;
-OS.GetMenuItemInfo (hMenu, id, false, 
+cast(bool) OS.GetMenuItemInfo (hMenu, id, false, &
-        if (!success) error (DWT.ERROR_CANNOT_SET_SELECTION);
-        info.fState &= ~OS.MFS_CHECKED;
-        if (selected) info.fState |= OS.MFS_CHECKED;
-OS.SetMenuItemInfo (hMenu, id, false, 
+cast(bool) OS.SetMenuItemInfo (hMenu, id, false, &
-        if (!success) {
-            /*
@@ -1042 +1022 @@
- * @see #setAccelerator
- */
-String
+char[]
-    checkWidget ();
-    if (string is null) error (DWT.ERROR_NULL_ARGUMENT);
-    if ((style & DWT.SEPARATOR) !is 0) return;
-.equals (string)
+==/*eq*/string 
-    super.setText (string);
-int
-int pszText = 0
+auto
+TCHAR* pszText
-    bool success = false;
- || OS.IsSP) && parent.hwndCB !is 0
+_ || OS.IsSP_) && parent.hwndCB !is null
-        /*
-        * Bug in WinCE PPC.  Tool items on the menubar don't resize
@@ -1059 +1039 @@
-        */
-        if (string.indexOf ('&') !is -1) {
- = string.length ()
-
-
+_ = string.length
+_
+_
-            int i = 0, j = 0;
-
+_
-                if (text[i] !is '&') text [j++] = text [i];
-            }
-new String (text, 0, j)
+text[ 0 .. j ].dup
-        }
-        /* Use the character encoding for the default locale */
- buffer = new TCHAR
-() 
-
-
-int
- = new TBBUTTONINFO ()
+[] buffer = StrToTCHARs
+
+cast(TCHAR*) 
+.ptr
+auto
+
-        info2.cbSize = TBBUTTONINFO.sizeof;
-        info2.dwMask = OS.TBIF_TEXT;
-        info2.pszText = pszText;
-
+&
-    } else {
- = new MENUITEMINFO ()
+
-        info.cbSize = MENUITEMINFO.sizeof;
-int
+auto
-
-        /*
@@ -1093 +1073 @@
-        if (!OS.IsWinCE && OS.WIN32_VERSION >= OS.VERSION (4, 10)) {
-            info.fMask = OS.MIIM_BITMAP;
-
-0
+&
+null
-        }
-
-        /* Use the character encoding for the default locale */
- buffer = new TCHAR
-() 
-
-
+[] buffer = StrToTCHARs
+
+cast(TCHAR*) 
+.ptr
-        info.fMask = OS.MIIM_TYPE;
-        info.fType = widgetStyle ();
-        info.dwTypeData = pszText;
-OS.SetMenuItemInfo (hMenu, id, false, 
+cast(bool) OS.SetMenuItemInfo (hMenu, id, false, &
-
-        /*
@@ -1124 +1104 @@
-                    }
-                }
-OS.SetMenuItemInfo (hMenu, id, false, 
+cast(bool) OS.SetMenuItemInfo (hMenu, id, false, &
-            }
-        }
-    }
-0
+null
-    if (!success) error (DWT.ERROR_CANNOT_SET_TEXT);
-    parent.redraw ();
@@ -1165 +1145 @@
-    setInputState (event, DWT.Selection);
-    postEvent (DWT.Selection, event);
-null
+LRESULT.NULL
-}
-
-LRESULT wmDrawChild (int wParam, int lParam) {
- struct = new DRAWITEMSTRUCT ()
-OS.MoveMemory (struct
+* struct_ = cast(DRAWITEMSTRUCT*)lParam
+//OS.MoveMemory (struct_
-    if (image !is null) {
-        GCData data = new GCData();
-        data.device = display;
-
+_
-        /*
-        * Bug in Windows.  When a bitmap is included in the
@@ -1181 +1161 @@
-        * the item is in a menu bar.
-        */
-
+_.rcItem
-        Image image = getEnabled () ? this.image : new Image (display, this.image, DWT.IMAGE_DISABLE);
-
+_.rcItem
-        if (this.image !is image) image.dispose ();
-        gc.dispose ();
-    }
-
-null
+_
+LRESULT.NULL
-}
-
-LRESULT wmMeasureChild (int wParam, int lParam) {
- struct = new MEASUREITEMSTRUCT ()
-OS.MoveMemory (struct
+* struct_ = cast(MEASUREITEMSTRUCT*)lParam
+//OS.MoveMemory (struct_
-    int width = 0, height = 0;
-    if (image !is null) {
@@ -1210 +1190 @@
-        * the width of the widest bitmap in WM_MEASURECHILD.
-        */
- = new MENUINFO ()
+
-        lpcmi.cbSize = MENUINFO.sizeof;
-        lpcmi.fMask = OS.MIM_STYLE;
-int
-
+auto
+&
-        if ((lpcmi.dwStyle & OS.MNS_CHECKORBMP) is 0) {
-            MenuItem [] items = parent.getItems ();
@@ -1227 +1207 @@
-    }
-    if (width !is 0 || height !is 0) {
-
-
-OS.MoveMemory (lParam, struct
-
-null
-
-
-
-
+_
+_
+//OS.MoveMemory (lParam, struct_
+
+LRESULT.NULL
+
+
+
+