Mercurial > projects > dwt-mac

changeset 56:a470e49a1890

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Updated Menu to 3.514
author Jacob Carlborg <doob@me.com>
date Mon, 08 Dec 2008 21:51:26 +0100
parents 6309d49b16b7
children 4444d15131d5
files dwt/internal/cocoa/OS.d dwt/widgets/Menu.d
diffstat 2 files changed, 9 insertions(+), 8 deletions(-) [+]
line wrap: on
line diff
--- a/dwt/internal/cocoa/OS.d	Mon Dec 08 21:46:26 2008 +0100
+++ b/dwt/internal/cocoa/OS.d	Mon Dec 08 21:51:26 2008 +0100
@@ -27,6 +27,7 @@
 import dwt.internal.cocoa.NSBitmapImageRep;
 import dwt.internal.cocoa.NSButtonCell;
 import dwt.internal.cocoa.NSCell;
+import dwt.internal.cocoa.NSEvent;
 import dwt.internal.cocoa.NSImage;
 import dwt.internal.cocoa.NSParagraphStyle;
 import dwt.internal.cocoa.NSPoint;
@@ -2575,7 +2576,7 @@
 public static const double NSAppKitVersionNumberWithPatternColorLeakFix = 641.00000000000000;
 public static const int NSApplicationActivatedEventType = 1;
 public static const int NSApplicationDeactivatedEventType = 2;
-public static const int NSApplicationDefined = 15;
+alias NSEventType.NSApplicationDefined NSApplicationDefined;
 public static const int NSApplicationDefinedMask = 32768;
 public static const int NSApplicationDelegateReplyCancel = 1;
 public static const int NSApplicationDelegateReplyFailure = 2;
--- a/dwt/widgets/Menu.d	Mon Dec 08 21:46:26 2008 +0100
+++ b/dwt/widgets/Menu.d	Mon Dec 08 21:51:26 2008 +0100
@@ -32,7 +32,7 @@
 
 import dwt.dwthelper.System;
 import dwt.dwthelper.utils;
-import dwt.internal.cocoa.NSInteger;
+import dwt.internal.objc.cocoa.Cocoa;
 import dwt.widgets.TypedListener;
 import dwt.widgets.Event;
 import dwt.widgets.MenuItem;
@@ -238,7 +238,7 @@
         } else {
             location = window.mouseLocationOutsideOfEventStream();
         }
-        NSEvent nsEvent = NSEvent.otherEventWithType(NSApplicationDefined, location, 0, 0.0, window.windowNumber(), window.graphicsContext(), cast(short)0, 0, 0);
+        NSEvent nsEvent = NSEvent.otherEventWithType(OS.NSApplicationDefined, location, 0, 0.0, window.windowNumber(), window.graphicsContext(), cast(short)0, 0, 0);
         NSMenu.popUpContextMenu(nsMenu, nsEvent, shell.view);
     } else {
         nsMenu.cancelTracking ();
@@ -669,18 +669,18 @@
 
 void menu_willHighlightItem(objc.id id, objc.SEL sel, objc.id menu, objc.id itemID) {
     Widget widget = display.getWidget(itemID);
-    if (widget instanceof MenuItem) {
-        MenuItem item = (MenuItem)widget;
+    if (cast(MenuItem) widget) {
+        MenuItem item = cast(MenuItem)widget;
         item.sendEvent (DWT.Arm);
     }
 }
 
-void menuNeedsUpdate(int /*long*/ id, int /*long*/ sel, int /*long*/ menu) {
+void menuNeedsUpdate(objc.id id, objc.SEL sel, objc.id menu) {
     //This code is intentionally commented
     //sendEvent (DWT.Show);
 }
 
-void menuWillOpen(int /*long*/ id, int /*long*/ sel, int /*long*/ menu) {
+void menuWillOpen(objc.id id, objc.SEL sel, objc.id menu) {
     visible = true;
     sendEvent (DWT.Show);
     for (int i=0; i<items.length; i++) {
@@ -695,7 +695,7 @@
     }
 }
 
-void menuDidClose(int /*long*/ id, int /*long*/ sel, int /*long*/ menu) {
+void menuDidClose(objc.id id, objc.SEL sel, objc.id menu) {
     sendEvent (DWT.Hide);
     visible = false;
     for (int i=0; i<items.length; i++) {