diff dwtx/jface/action/ActionContributionItem.d @ 72:5df4896124c7

JFace and its examples do compile
author Frank Benoit <benoit@tionex.de>
date Thu, 22 May 2008 17:56:17 +0200
parents 4878bef4a38e
children 7ffeace6c47f
line wrap: on
line diff
--- a/dwtx/jface/action/ActionContributionItem.d	Thu May 22 04:03:58 2008 +0200
+++ b/dwtx/jface/action/ActionContributionItem.d	Thu May 22 17:56:17 2008 +0200
@@ -564,7 +564,7 @@
             ExternalActionManager.IExecuteCallback callback = null;
             String actionDefinitionId = action.getActionDefinitionId();
             if (actionDefinitionId !is null) {
-                Object obj = ExternalActionManager.getInstance()
+                Object obj = cast(Object) ExternalActionManager.getInstance()
                         .getCallback();
                 if (null !is cast(ExternalActionManager.IExecuteCallback)obj ) {
                     callback = cast(ExternalActionManager.IExecuteCallback) obj;
@@ -602,12 +602,12 @@
                 action.runWithEvent(e);
 
                 if (callback !is null) {
-                    if (result is null || result.equals(Boolean.TRUE)) {
+                    if (result is null || result.opEquals(Boolean.TRUE)) {
                         callback.postExecuteSuccess(action, Boolean.TRUE);
                     } else {
                         callback.postExecuteFailure(action,
                                 new ExecutionException(action.getText()
-                                        + " returned failure.")); //$NON-NLS-1$
+                                        ~ " returned failure.")); //$NON-NLS-1$
                     }
                 }
 
@@ -622,7 +622,7 @@
                 if (callback !is null) {
                     callback.notEnabled(action, new NotEnabledException(action
                             .getText()
-                            + " is not enabled.")); //$NON-NLS-1$
+                            ~ " is not enabled.")); //$NON-NLS-1$
                 }
             }
         }
@@ -1326,12 +1326,20 @@
                 final Menu subMenu = new Menu(proxy);
                 subMenu.setData(itemMenu);
                 proxyItem.setMenu(subMenu);
-                subMenu.addListener(DWT.Show, dgListener( (Event event,Menu subMenu_,Menu itemMenu_) {
-                    event.widget.removeListener(DWT.Show, this);
-                    if (event.type is DWT.Show) {
-                        copyMenu(itemMenu_, subMenu_);
+                subMenu.addListener(DWT.Show, new class(subMenu, itemMenu) Listener {
+                    Menu subMenu_;
+                    Menu itemMenu_;
+                    this(Menu a,Menu b){
+                        subMenu_=a;
+                        itemMenu_=b;
                     }
-                }, subMenu, itemMenu));
+                    void handleEvent(Event event){
+                        event.widget.removeListener(DWT.Show, this);
+                        if (event.type is DWT.Show) {
+                            copyMenu(itemMenu_, subMenu_);
+                        }
+                    }
+                });
                 subMenu.addListener(DWT.Help, passThrough);
                 subMenu.addListener(DWT.Hide, passThrough);
             }