--- a/dwt-cocoa-bindings/bindings.h	Tue Oct 21 15:20:04 2008 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,26 +0,0 @@
-//
-//  bindings.h
-//  dwt-cocoa-bindings
-//
-//  Created by doob on 8/24/08.
-//  Copyright 2008 Jacob Carlborg. All rights reserved.
-//
-
-#import <Cocoa/Cocoa.h>
-
-id DCB_NSDefaultRunLoopMode (void);
-
-id DCB_NSDeviceRGBColorSpace(void);
-id DCB_NSAccessibilityPositionAttribute (void);
-id DCB_NSAccessibilitySizeAttribute (void);
-id DCB_NSBackgroundColorAttributeName (void);
-id DCB_NSBaselineOffsetAttributeName (void);
-id DCB_NSDeviceResolution (void);
-id DCB_NSFontAttributeName (void);
-id DCB_NSForegroundColorAttributeName (void);
-id DCB_NSLinkAttributeName (void);
-id DCB_NSParagraphStyleAttributeName (void);
-id DCB_NSStrikethroughColorAttributeName (void);
-id DCB_NSStrikethroughStyleAttributeName (void);
-id DCB_NSUnderlineColorAttributeName (void);
-id DCB_NSUnderlineStyleAttributeName (void);
\ No newline at end of file

--- a/dwt-cocoa-bindings/bindings.m	Tue Oct 21 15:20:04 2008 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,84 +0,0 @@
-//
-//  bindings.m
-//  dwt-cocoa-bindings
-//
-//  Created by doob on 8/24/08.
-//  Copyright 2008 Jacob Carlborg. All rights reserved.
-//
-
-#import "bindings.h"
-
-id DCB_NSDefaultRunLoopMode (void)
-{
-	return (id)NSDefaultRunLoopMode;
-}
-
-id DCB_NSDeviceRGBColorSpace(void)
-{
-	return (id)NSDeviceRGBColorSpace;
-}
-
-id DCB_NSAccessibilityPositionAttribute (void)
-{
-	return (id)NSAccessibilityPositionAttribute;
-}
-
-id DCB_NSAccessibilitySizeAttribute (void)
-{
-	return (id)NSAccessibilitySizeAttribute;
-}
-
-id DCB_NSBackgroundColorAttributeName (void)
-{
-	return (id)NSBackgroundColorAttributeName;
-}
-
-id DCB_NSBaselineOffsetAttributeName (void)
-{
-	return (id)NSBaselineOffsetAttributeName;
-}
-
-id DCB_NSDeviceResolution (void)
-{
-	return (id)NSDeviceResolution;
-}
-
-id DCB_NSFontAttributeName (void)
-{
-	return (id)NSFontAttributeName;
-}
-
-id DCB_NSForegroundColorAttributeName (void)
-{
-	return (id)NSForegroundColorAttributeName;
-}
-
-id DCB_NSLinkAttributeName (void)
-{
-	return (id)NSLinkAttributeName;
-}
-
-id DCB_NSParagraphStyleAttributeName (void)
-{
-	return (id)NSParagraphStyleAttributeName;
-}
-
-id DCB_NSStrikethroughColorAttributeName (void)
-{
-	return (id)NSStrikethroughColorAttributeName;
-}
-
-id DCB_NSStrikethroughStyleAttributeName (void)
-{
-	return (id)NSStrikethroughStyleAttributeName;
-}
-
-id DCB_NSUnderlineColorAttributeName (void)
-{
-	return (id)NSUnderlineColorAttributeName;
-}
-
-id DCB_NSUnderlineStyleAttributeName (void)
-{
-	return (id)NSUnderlineStyleAttributeName;
-}

--- a/dwt/DWT.d	Tue Oct 21 15:20:04 2008 +0200
+++ b/dwt/DWT.d	Mon Dec 01 17:07:00 2008 +0100
@@ -1,5 +1,5 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2007 IBM Corporation and others.
+/*******************************************************************************
+ * Copyright (c) 2000, 2008 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -9,7 +9,7 @@
  *     IBM Corporation - initial API and implementation
  *     
  * Port to the D programming language:
- *     Jacob Carlborg <jacob.carlborg@gmail.com>
+ *     Jacob Carlborg <doob@me.com>
  *******************************************************************************/
 module dwt.DWT;
 
@@ -40,6 +40,8 @@
  * <em>HINT</em> may change from release to release, although we typically
  * will not withdraw support for a <em>HINT</em> once it is made available.
  * </p>
+ *
+ * @see <a href="http://www.eclipse.org/swt/">Sample code and further information</a>
  */
 
 /* NOTE:
@@ -414,7 +416,9 @@
      * @see dwt.widgets.Display#addFilter
      * @see dwt.widgets.Event
      * 
+     * @see dwt.custom.CCombo#addVerifyListener
      * @see dwt.widgets.Combo#addVerifyListener
+     * @see dwt.custom.StyledText#addVerifyListener
      * @see dwt.widgets.Text#addVerifyListener
      * @see dwt.events.VerifyListener#verifyText
      * @see dwt.events.VerifyEvent
@@ -3692,7 +3696,7 @@
 
     /**
      * Returns the DWT version number as an integer.
-     * Example: "DWT051" is 51
+     * Example: "SWT051" is 51
      *
      * @return the DWT version number
      */
@@ -3877,7 +3881,7 @@
          * to stop the compiler from inlining.
          */
         String platform = getPlatform();
-        if ("carbon".equals(platform)) { //$NON-NLS-1$
+    if ("carbon".equals (platform) || "cocoa".equals (platform)) { //$NON-NLS-1$ //$NON-NLS-2$
             MOD1 = COMMAND;
             MOD2 = SHIFT;
             MOD3 = ALT;

--- a/dwt/DWTError.d	Tue Oct 21 15:20:04 2008 +0200
+++ b/dwt/DWTError.d	Mon Dec 01 17:07:00 2008 +0100
@@ -1,5 +1,5 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
+/*******************************************************************************
+ * Copyright (c) 2000, 2008 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -29,11 +29,11 @@
  * throwable that caused the problem (if this information is
  * available (i.e. it may be null)).
  * <p>
- * SWTErrors are thrown when something fails internally which
+ * DWTErrors are thrown when something fails internally which
  * either leaves DWT in an unknown state (eg. the o/s call to
  * remove an item from a list returns an error code) or when DWT
  * is left in a known-to-be-unrecoverable state (eg. it runs out
- * of callback resources). SWTErrors should not occur in typical
+ * of callback resources). DWTErrors should not occur in typical
  * programs, although "high reliability" applications should
  * still catch them.
  * </p><p>
@@ -45,6 +45,7 @@
  *
  * @see DWTException
  * @see DWT#error(int)
+ * @see <a href="http://www.eclipse.org/swt/">Sample code and further information</a>
  */
 
 public class DWTError : Error {

--- a/dwt/DWTException.d	Tue Oct 21 15:20:04 2008 +0200
+++ b/dwt/DWTException.d	Mon Dec 01 17:07:00 2008 +0100
@@ -1,5 +1,5 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
+/*******************************************************************************
+ * Copyright (c) 2000, 2008 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -29,13 +29,14 @@
  * exception that caused the problem (if this information is
  * available (i.e. it may be null)).
  * <p>
- * SWTExceptions are thrown when something fails internally,
+ * DWTExceptions are thrown when something fails internally,
  * but DWT is left in a known stable state (eg. a widget call
  * was made from a non-u/i thread, or there is failure while
  * reading an Image because the source file was corrupt).
  * </p>
  *
  * @see DWTError
+ * @see <a href="http://www.eclipse.org/swt/">Sample code and further information</a>
  */
 
 public class DWTException : RuntimeException {

--- a/dwt/accessibility/ACC.d	Tue Oct 21 15:20:04 2008 +0200
+++ b/dwt/accessibility/ACC.d	Mon Dec 01 17:07:00 2008 +0100
@@ -1,5 +1,5 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
+/*******************************************************************************
+ * Copyright (c) 2000, 2008 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -9,13 +9,15 @@
  *     IBM Corporation - initial API and implementation
  *     
  * Port to the D programming language:
- *     Jacob Carlborg <jacob.carlborg@gmail.com>
+ *     Jacob Carlborg <doob@me.com>
  *******************************************************************************/
 module dwt.accessibility.ACC;
 
 /**
  * Class ACC contains all the constants used in defining an
  * Accessible object.
+ *
+ * @see <a href="http://www.eclipse.org/swt/">Sample code and further information</a>
  * 
  * @since 2.0
  */

--- a/dwt/accessibility/Accessible.d	Tue Oct 21 15:20:04 2008 +0200
+++ b/dwt/accessibility/Accessible.d	Mon Dec 01 17:07:00 2008 +0100
@@ -1,5 +1,5 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
+/*******************************************************************************
+ * Copyright (c) 2000, 2008 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -9,13 +9,37 @@
  *     IBM Corporation - initial API and implementation
  *     
  * Port to the D programming language:
- *     Jacob Carlborg <jacob.carlborg@gmail.com>
+ *     Jacob Carlborg <doob@me.com>
  *******************************************************************************/
 module dwt.accessibility.Accessible;
 
 import dwt.dwthelper.utils;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.Vector;
+
+import dwt.DWT;
 import dwt.DWTException;
+import dwt.graphics.Point;
+import dwt.graphics.Rectangle;
+import dwt.internal.cocoa.NSArray;
+import dwt.internal.cocoa.NSMutableArray;
+import dwt.internal.cocoa.NSNumber;
+import dwt.internal.cocoa.NSObject;
+import dwt.internal.cocoa.NSPoint;
+import dwt.internal.cocoa.NSRange;
+import dwt.internal.cocoa.NSSize;
+import dwt.internal.cocoa.NSString;
+import dwt.internal.cocoa.NSValue;
+import dwt.internal.cocoa.OS;
+import dwt.internal.cocoa.id;
+import dwt.widgets.Composite;
 import dwt.widgets.Control;
+import dwt.widgets.Display;
+import dwt.widgets.Monitor;
+import dwt.widgets.Shell;
 
 import dwt.accessibility.AccessibleListener;
 import dwt.accessibility.AccessibleControlListener;
@@ -39,13 +63,55 @@
  * @see AccessibleEvent
  * @see AccessibleControlListener
  * @see AccessibleControlEvent
+ * @see <a href="http://www.eclipse.org/swt/snippets/#accessibility">Accessibility snippets</a>
+ * @see <a href="http://www.eclipse.org/swt/">Sample code and further information</a>
  * 
  * @since 2.0
  */
 public class Accessible {
+
+    static NSString[] baseAttributes = { 
+        OS.NSAccessibilityRoleAttribute,
+        OS.NSAccessibilityRoleDescriptionAttribute,
+        OS.NSAccessibilityHelpAttribute,
+        OS.NSAccessibilityFocusedAttribute,
+        OS.NSAccessibilityParentAttribute,
+        OS.NSAccessibilityChildrenAttribute,
+        OS.NSAccessibilityPositionAttribute,
+        OS.NSAccessibilitySizeAttribute,
+        OS.NSAccessibilityWindowAttribute,
+        OS.NSAccessibilityTopLevelUIElementAttribute
+    };
+
+    static NSString[] baseTextAttributes = {
+        OS.NSAccessibilityNumberOfCharactersAttribute,
+        OS.NSAccessibilitySelectedTextAttribute,
+        OS.NSAccessibilitySelectedTextRangeAttribute,
+        OS.NSAccessibilityInsertionPointLineNumberAttribute,
+        OS.NSAccessibilitySelectedTextRangesAttribute,
+        OS.NSAccessibilityVisibleCharacterRangeAttribute,
+        OS.NSAccessibilityValueAttribute,
+    };
+    
+    static NSString[] baseParameterizedAttributes = {
+        OS.NSAccessibilityStringForRangeParameterizedAttribute,
+        OS.NSAccessibilityRangeForLineParameterizedAttribute,
+    };
+    
+
+    NSMutableArray attributeNames = null;
+    NSMutableArray parameterizedAttributeNames = null;
+    NSMutableArray actionNames = null;
+
+    Vector accessibleListeners = new Vector();
+    Vector accessibleControlListeners = new Vector();
+    Vector accessibleTextListeners = new Vector ();
     Control control;
 
+    Map /*<Integer, SWTAccessibleDelegate>*/ children = new HashMap();
+    
     this (Control control) {
+    
         this.control = control;
     }
     
@@ -88,28 +154,9 @@
      * @see #removeAccessibleListener
      */
     public void addAccessibleListener (AccessibleListener listener) {
-    }
-
-    /**
-     * Removes the listener from the collection of listeners who will
-     * be notified when an accessible client asks for certain strings,
-     * such as name, description, help, or keyboard shortcut.
-     *
-     * @param listener the listener that should no longer be notified when the receiver
-     * is asked for a name, description, help, or keyboard shortcut string
-     *
-     * @exception IllegalArgumentException <ul>
-     *    <li>ERROR_NULL_ARGUMENT - if the listener is null</li>
-     * </ul>
-     * @exception DWTException <ul>
-     *    <li>ERROR_WIDGET_DISPOSED - if the receiver's control has been disposed</li>
-     *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver's control</li>
-     * </ul>
-     *
-     * @see AccessibleListener
-     * @see #addAccessibleListener
-     */
-    public void removeAccessibleListener (AccessibleListener listener) {
+        checkWidget();
+        if (listener is null) DWT.error(DWT.ERROR_NULL_ARGUMENT);
+        accessibleListeners.addElement(listener);
     }
 
     /**
@@ -133,29 +180,10 @@
      * @see AccessibleControlListener
      * @see #removeAccessibleControlListener
      */
-    public void addAccessibleControlListener (AccessibleControlListener listener) {
-    }
-
-    /**
-     * Removes the listener from the collection of listeners who will
-     * be notified when an accessible client asks for custom control
-     * specific information.
-     *
-     * @param listener the listener that should no longer be notified when the receiver
-     * is asked for custom control specific information
-     *
-     * @exception IllegalArgumentException <ul>
-     *    <li>ERROR_NULL_ARGUMENT - if the listener is null</li>
-     * </ul>
-     * @exception DWTException <ul>
-     *    <li>ERROR_WIDGET_DISPOSED - if the receiver's control has been disposed</li>
-     *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver's control</li>
-     * </ul>
-     *
-     * @see AccessibleControlListener
-     * @see #addAccessibleControlListener
-     */
-    public void removeAccessibleControlListener (AccessibleControlListener listener) {
+    public void addAccessibleControlListener(AccessibleControlListener listener) {
+        checkWidget();
+        if (listener is null) DWT.error(DWT.ERROR_NULL_ARGUMENT);
+        accessibleControlListeners.addElement(listener);
     }
 
     /**
@@ -182,6 +210,1053 @@
      * @since 3.0
      */
     public void addAccessibleTextListener (AccessibleTextListener listener) {
+        checkWidget ();
+        if (listener is null) DWT.error (DWT.ERROR_NULL_ARGUMENT);
+        accessibleTextListeners.addElement (listener);      
+    }
+    
+    public id internal_accessibilityActionDescription(NSString action, int childID) {
+        // TODO No action support for now.
+        return NSString.stringWith("");
+    }
+
+    public NSArray internal_accessibilityActionNames(int childID) {
+        // The supported action list depends on the role played by the control.
+        AccessibleControlEvent event = new AccessibleControlEvent(this);
+        event.childID = childID;
+        event.detail = -1;
+        for (int i = 0; i < accessibleControlListeners.size(); i++) {
+            AccessibleControlListener listener = (AccessibleControlListener) accessibleControlListeners.elementAt(i);
+            listener.getRole(event);
+        }
+
+        // No accessible listener is overriding the role of the control, so let Cocoa return the default set for the control.
+        if (event.detail is -1) {
+            return null;
+        }
+        
+        if ((childID is ACC.CHILDID_SELF) && (actionNames !is null)) {
+            return retainedAutoreleased(actionNames);
+        }
+        
+        NSMutableArray returnValue = NSMutableArray.arrayWithCapacity(5);
+        
+        switch (event.detail) {
+        case ACC.ROLE_PUSHBUTTON:
+        case ACC.ROLE_RADIOBUTTON:
+        case ACC.ROLE_CHECKBUTTON:
+        case ACC.ROLE_TABITEM:
+            returnValue.addObject(OS.NSAccessibilityPressAction);
+            break;
+        }
+
+        switch (event.detail) {
+        case ACC.ROLE_COMBOBOX:
+            returnValue.addObject(OS.NSAccessibilityConfirmAction);
+            break;
+        }
+
+
+        if (childID is ACC.CHILDID_SELF) {
+            actionNames = returnValue;
+            actionNames.retain();
+            return retainedAutoreleased(actionNames);
+        } else {
+            // Caller must retain if they want to hold on to it.
+            return returnValue;
+        }
+    }
+
+    public NSArray internal_accessibilityAttributeNames(int childID) {
+        // The supported attribute set depends on the role played by the control.
+        // We may need to add or remove from the base set as needed.
+        AccessibleControlEvent event = new AccessibleControlEvent(this);
+        event.childID = childID;
+        event.detail = -1;
+        for (int i = 0; i < accessibleControlListeners.size(); i++) {
+            AccessibleControlListener listener = (AccessibleControlListener) accessibleControlListeners.elementAt(i);
+            listener.getRole(event);
+        }
+
+        // No accessible listener is overriding the role of the control, so let Cocoa
+        // return the default set for the control.
+        if (event.detail is -1)
+            return null;
+        
+        if ((childID is ACC.CHILDID_SELF) && (attributeNames !is null)) {
+            return retainedAutoreleased(attributeNames);
+        }
+        
+        NSMutableArray returnValue = NSMutableArray.arrayWithCapacity(baseAttributes.length);
+
+        /* Add our list of supported attributes to the array.
+         * Make sure each attribute name is not already in the array before appending.
+         */
+        for (int i = 0; i < baseAttributes.length; i++) {
+            if (!returnValue.containsObject(baseAttributes[i])) {
+                returnValue.addObject(baseAttributes[i]);
+            }
+        }
+        
+        if (accessibleTextListeners.size() > 0) {
+            for (int i = 0; i < baseTextAttributes.length; i++) {
+                if (!returnValue.containsObject(baseTextAttributes[i])) {
+                    returnValue.addObject(baseTextAttributes[i]);
+                }
+            }
+        }
+        
+        // The following are expected to have a value (AXValue)
+        switch (event.detail) {
+        case ACC.ROLE_CHECKBUTTON:
+        case ACC.ROLE_RADIOBUTTON:
+        case ACC.ROLE_LABEL:
+        case ACC.ROLE_TABITEM:
+        case ACC.ROLE_TABFOLDER:
+            returnValue.addObject(OS.NSAccessibilityValueAttribute);
+            break;
+        }
+        
+        // The following are expected to report their enabled status (AXEnabled)
+        switch (event.detail) {
+        case ACC.ROLE_CHECKBUTTON:
+        case ACC.ROLE_RADIOBUTTON:
+        case ACC.ROLE_LABEL:
+        case ACC.ROLE_TABITEM:
+        case ACC.ROLE_PUSHBUTTON:
+        case ACC.ROLE_COMBOBOX:
+            returnValue.addObject(OS.NSAccessibilityEnabledAttribute);
+            break;
+        }
+        
+        // The following are expected to report a title (AXTitle)
+        switch (event.detail) {
+        case ACC.ROLE_CHECKBUTTON:
+        case ACC.ROLE_RADIOBUTTON:
+        case ACC.ROLE_PUSHBUTTON:
+        case ACC.ROLE_TABITEM:
+            returnValue.addObject(OS.NSAccessibilityTitleAttribute);
+            break;
+        }
+            
+        // Accessibility verifier says these attributes must be reported for combo boxes.
+        if (event.detail is ACC.ROLE_COMBOBOX) {
+            returnValue.addObject(OS.NSAccessibilityExpandedAttribute);
+        }
+        
+        // Accessibility verifier says these attributes must be reported for tab folders.
+        if (event.detail is ACC.ROLE_TABFOLDER) {
+            returnValue.addObject(OS.NSAccessibilityContentsAttribute);
+            returnValue.addObject(OS.NSAccessibilityTabsAttribute);
+        }
+
+        /*
+         * Only report back sub-roles when the DWT role maps to a sub-role.
+         */
+        if (event.detail !is -1) {
+            String osRole = roleToOs(event.detail);
+            
+            if (osRole.indexOf(':') is -1)
+                returnValue.removeObject(OS.NSAccessibilitySubroleAttribute);
+        }
+
+        /*
+         * Children never return their own children, so remove that attribute.
+         */
+        if (childID !is ACC.CHILDID_SELF) {
+            returnValue.removeObject(OS.NSAccessibilityChildrenAttribute);
+        }
+        
+        if (childID is ACC.CHILDID_SELF) {
+            attributeNames = returnValue;
+            attributeNames.retain();
+            return retainedAutoreleased(attributeNames);
+        } else {
+            // Caller must retain if necessary.
+            return returnValue;
+        }
+    }
+
+    public id internal_accessibilityAttributeValue(NSString attribute, int childID) {
+        if (attribute.isEqualToString(OS.NSAccessibilityRoleAttribute)) return getRoleAttribute(childID);
+        if (attribute.isEqualToString(OS.NSAccessibilitySubroleAttribute)) return getSubroleAttribute(childID);
+        if (attribute.isEqualToString(OS.NSAccessibilityRoleDescriptionAttribute)) return getRoleDescriptionAttribute(childID);
+        if (attribute.isEqualToString(OS.NSAccessibilityExpandedAttribute)) return getExpandedAttribute(childID);
+        if (attribute.isEqualToString(OS.NSAccessibilityHelpAttribute)) return getHelpAttribute(childID);
+        if (attribute.isEqualToString(OS.NSAccessibilityTitleAttribute)) return getTitleAttribute(childID);
+        if (attribute.isEqualToString(OS.NSAccessibilityValueAttribute)) return getValueAttribute(childID);
+        if (attribute.isEqualToString(OS.NSAccessibilityEnabledAttribute)) return getEnabledAttribute(childID);
+        if (attribute.isEqualToString(OS.NSAccessibilityFocusedAttribute)) return getFocusedAttribute(childID);
+        if (attribute.isEqualToString(OS.NSAccessibilityParentAttribute)) return getParentAttribute(childID);
+        if (attribute.isEqualToString(OS.NSAccessibilityChildrenAttribute)) return getChildrenAttribute(childID);
+        if (attribute.isEqualToString(OS.NSAccessibilityContentsAttribute)) return getChildrenAttribute(childID);
+        // FIXME:  There's no specific API just for tabs, which won't include the buttons (if any.)
+        if (attribute.isEqualToString(OS.NSAccessibilityTabsAttribute)) return getTabsAttribute(childID);
+        if (attribute.isEqualToString(OS.NSAccessibilityWindowAttribute)) return getWindowAttribute(childID);
+        if (attribute.isEqualToString(OS.NSAccessibilityTopLevelUIElementAttribute)) return getTopLevelUIElementAttribute(childID);
+        if (attribute.isEqualToString(OS.NSAccessibilityPositionAttribute)) return getPositionAttribute(childID);
+        if (attribute.isEqualToString(OS.NSAccessibilitySizeAttribute)) return getSizeAttribute(childID);
+        if (attribute.isEqualToString(OS.NSAccessibilityDescriptionAttribute)) return getDescriptionAttribute(childID);
+        if (attribute.isEqualToString(OS.NSAccessibilityNumberOfCharactersAttribute)) return getNumberOfCharactersAttribute(childID);
+        if (attribute.isEqualToString(OS.NSAccessibilitySelectedTextAttribute)) return getSelectedTextAttribute(childID);
+        if (attribute.isEqualToString(OS.NSAccessibilitySelectedTextRangeAttribute)) return getSelectedTextRangeAttribute(childID);
+        if (attribute.isEqualToString(OS.NSAccessibilityInsertionPointLineNumberAttribute)) return getInsertionPointLineNumberAttribute(childID);
+        if (attribute.isEqualToString(OS.NSAccessibilitySelectedTextRangesAttribute)) return getSelectedTextRangesAttribute(childID);
+        if (attribute.isEqualToString(OS.NSAccessibilityVisibleCharacterRangeAttribute)) return getVisibleCharacterRangeAttribute(childID);
+        
+        // If this object don't know how to get the value it's up to the control itself to return an attribute value.
+        return null;
+    }
+    
+    public id internal_accessibilityAttributeValue_forParameter(NSString attribute, id parameter, int childID) {
+        if (attribute.isEqualToString(OS.NSAccessibilityStringForRangeParameterizedAttribute)) return getStringForRangeAttribute(parameter, childID);
+        if (attribute.isEqualToString(OS.NSAccessibilityRangeForLineParameterizedAttribute)) return getRangeForLineParameterizedAttribute(parameter, childID);      
+        return null;
+    }
+
+    // Returns the UI Element that has the focus. You can assume that the search for the focus has already been narrowed down to the receiver.
+    // Override this method to do a deeper search with a UIElement - e.g. a NSMatrix would determine if one of its cells has the focus.
+    public id internal_accessibilityFocusedUIElement(int childID) {
+        AccessibleControlEvent event = new AccessibleControlEvent(this);
+        event.childID = ACC.CHILDID_MULTIPLE; // set to invalid value, to test if the application sets it in getFocus()
+        event.accessible = null;
+        for (int i = 0; i < accessibleControlListeners.size(); i++) {
+            AccessibleControlListener listener = (AccessibleControlListener) accessibleControlListeners.elementAt(i);
+            listener.getFocus(event);
+        }
+        
+        // The listener did not respond, so let Cocoa figure it out.
+        if (event.childID is ACC.CHILDID_MULTIPLE)
+            return null;
+        
+        /* The application can optionally answer an accessible. */
+        if (event.accessible !is null) {
+            return new id(OS.NSAccessibilityUnignoredAncestor(event.accessible.control.view.id));
+        }
+        
+        /* Or the application can answer a valid child ID, including CHILDID_SELF and CHILDID_NONE. */
+        if (event.childID is ACC.CHILDID_SELF || event.childID is ACC.CHILDID_NONE) {
+            return new id(OS.NSAccessibilityUnignoredAncestor(control.view.id));
+        }   
+
+        return new id(OS.NSAccessibilityUnignoredAncestor(childIDToOs(event.childID).id));
+    }
+
+    // Returns the deepest descendant of the UIElement hierarchy that contains the point. 
+    // You can assume the point has already been determined to lie within the receiver.
+    // Override this method to do deeper hit testing within a UIElement - e.g. a NSMatrix would test its cells. The point is bottom-left relative screen coordinates.
+    public id internal_accessibilityHitTest(NSPoint point, int childID) {
+        AccessibleControlEvent event = new AccessibleControlEvent(this);
+        event.x = (int) point.x;
+        Monitor primaryMonitor = Display.getCurrent().getPrimaryMonitor();
+        event.y = (int) (primaryMonitor.getBounds().height - point.y);
+    
+        // Set an impossible value to determine if anything responded to the event.
+        event.childID = ACC.CHILDID_MULTIPLE;
+        for (int i = 0; i < accessibleControlListeners.size(); i++) {
+            AccessibleControlListener listener = (AccessibleControlListener) accessibleControlListeners.elementAt(i);
+            listener.getChildAtPoint(event);
+        }
+        
+        // The listener did not respond, so let Cocoa figure it out.
+        if (event.childID is ACC.CHILDID_MULTIPLE)
+            return null;
+        
+        if (event.accessible !is null) {
+            return new id(OS.NSAccessibilityUnignoredAncestor(event.accessible.control.view.id));
+        }
+    
+        if (event.childID is ACC.CHILDID_SELF || event.childID is ACC.CHILDID_NONE) {
+            return new id(OS.NSAccessibilityUnignoredAncestor(control.view.id));
+        }
+    
+        return new id(OS.NSAccessibilityUnignoredAncestor(childIDToOs(event.childID).id));
+    }
+
+    public bool internal_accessibilityIsAttributeSettable(NSString attribute, int childID) {
+        return false;
+    }
+
+    // Return YES if the UIElement doesn't show up to the outside world - i.e. its parent should return the UIElement's children as its own - cutting the UIElement out. E.g. NSControls are ignored when they are single-celled.
+    public bool internal_accessibilityIsIgnored(int childID) {
+        return false;
+    }
+
+    // parameterized attribute methods
+    public NSArray internal_accessibilityParameterizedAttributeNames(int childID) {
+
+        if ((childID is ACC.CHILDID_SELF) && (parameterizedAttributeNames !is null)) {
+            return retainedAutoreleased(parameterizedAttributeNames);
+        }
+
+        NSMutableArray returnValue = NSMutableArray.arrayWithCapacity(4);
+
+        if (accessibleTextListeners.size() > 0) {
+            for (int i = 0; i < baseParameterizedAttributes.length; i++) {
+                if (!returnValue.containsObject(baseParameterizedAttributes[i])) {
+                    returnValue.addObject(baseParameterizedAttributes[i]);
+                }
+            }
+
+        }
+
+        if (childID is ACC.CHILDID_SELF) {
+            parameterizedAttributeNames = returnValue;
+            parameterizedAttributeNames.retain();
+            return retainedAutoreleased(parameterizedAttributeNames);
+        } else {
+            // Caller must retain if they want to keep it.
+            return returnValue;
+        }
+    }
+
+    public void internal_accessibilityPerformAction(NSString action, int childID) {
+        // TODO Auto-generated method stub
+        // No action support for now.
+    }
+
+    /**
+     * Returns the control for this Accessible object. 
+     *
+     * @return the receiver's control
+     * @since 3.0
+     */
+    public Control getControl() {
+        return control;
+    }
+
+    /**
+     * Invokes platform specific functionality to dispose an accessible object.
+     * <p>
+     * <b>IMPORTANT:</b> This method is <em>not</em> part of the public
+     * API for <code>Accessible</code>. It is marked public only so that it
+     * can be shared within the packages provided by DWT. It is not
+     * available on all platforms, and should never be called from
+     * application code.
+     * </p>
+     */
+    public void internal_dispose_Accessible() {
+        if (actionNames !is null) actionNames.release();
+        actionNames = null;
+        if (attributeNames !is null) attributeNames.release();
+        attributeNames = null;
+        if (parameterizedAttributeNames !is null) parameterizedAttributeNames.release();
+        parameterizedAttributeNames = null;
+        
+        Collection delegates = children.values();
+        Iterator iter = delegates.iterator();
+        while (iter.hasNext()) {
+            SWTAccessibleDelegate childDelegate = (SWTAccessibleDelegate)iter.next();
+            childDelegate.internal_dispose_SWTAccessibleDelegate();
+        }
+        
+        children.clear();
+    }
+    
+    id getExpandedAttribute(int childID) {
+        // TODO: May need to expand the API so the combo box state can be reported.
+        return NSNumber.numberWithBool(false);
+    }
+
+    id getHelpAttribute (int childID) {
+        id returnValue = null;
+        AccessibleEvent event = new AccessibleEvent(this);
+        event.childID = childID;
+        for (int i = 0; i < accessibleListeners.size(); i++) {
+            AccessibleListener listener = (AccessibleListener) accessibleListeners.elementAt(i);
+            listener.getHelp(event);
+        }
+        
+        if (event.result !is null) {
+            returnValue = NSString.stringWith(event.result);
+        }
+        
+        return returnValue;
+    }
+    
+    NSString getRoleAttribute(int childID) {
+        NSString returnValue = null;
+        AccessibleControlEvent event = new AccessibleControlEvent(this);
+        event.childID = childID;
+        event.detail = -1;
+        for (int i = 0; i < accessibleControlListeners.size(); i++) {
+            AccessibleControlListener listener = (AccessibleControlListener) accessibleControlListeners.elementAt(i);
+            listener.getRole(event);
+        }
+        if (event.detail !is -1) {
+            String appRole = roleToOs (event.detail);
+            int index = appRole.indexOf(':');
+            if (index !is -1) appRole = appRole.substring(0, index);
+            returnValue = NSString.stringWith(appRole);
+        }
+
+        return returnValue;
+    }
+    
+    id getSubroleAttribute (int childID) {
+        id returnValue = null;
+        AccessibleControlEvent event = new AccessibleControlEvent(this);
+        event.childID = childID;
+        event.detail = -1;
+        for (int i = 0; i < accessibleControlListeners.size(); i++) {
+            AccessibleControlListener listener = (AccessibleControlListener) accessibleControlListeners.elementAt(i);
+            listener.getRole(event);
+        }
+        if (event.detail !is -1) {
+            String appRole = roleToOs (event.detail);
+            int index = appRole.indexOf(':');
+            if (index !is -1) {
+                appRole = appRole.substring(index + 1);
+                returnValue = NSString.stringWith(appRole);
+            }
+        }
+        return returnValue;
+    }
+    
+    id getRoleDescriptionAttribute (int childID) {
+        id returnValue = null;
+        AccessibleControlEvent event = new AccessibleControlEvent(this);
+        event.childID = childID;
+        event.detail = -1;
+        for (int i = 0; i < accessibleControlListeners.size(); i++) {
+            AccessibleControlListener listener = (AccessibleControlListener) accessibleControlListeners.elementAt(i);
+            listener.getRole(event);
+        }
+        if (event.detail !is -1) {
+            String appRole = roleToOs (event.detail);
+            String appSubrole = null;
+            int index = appRole.indexOf(':');
+            if (index !is -1) {
+                appSubrole = appRole.substring(index + 1);
+                appRole = appRole.substring(0, index);
+            }
+            NSString nsAppRole = NSString.stringWith(appRole);
+            NSString nsAppSubrole = null;
+            
+            if (appSubrole !is null) nsAppSubrole = NSString.stringWith(appSubrole);
+            returnValue = new NSString(OS.NSAccessibilityRoleDescription (((nsAppRole !is null) ? nsAppRole.id : 0), (nsAppSubrole !is null) ? nsAppSubrole.id : 0));
+        }
+        return returnValue;
+    }
+    
+    id getTitleAttribute (int childID) {
+        
+        id returnValue = null;//NSString.stringWith("");
+        
+        /*
+        * Feature of the Macintosh.  The text of a Label is returned in its value,
+        * not its title, so ensure that the role is not Label before asking for the title.
+        */
+        AccessibleControlEvent roleEvent = new AccessibleControlEvent(this);
+        roleEvent.childID = childID;
+        roleEvent.detail = -1;
+        for (int i = 0; i < accessibleControlListeners.size(); i++) {
+            AccessibleControlListener listener = (AccessibleControlListener) accessibleControlListeners.elementAt(i);
+            listener.getRole(roleEvent);
+        }
+        if (roleEvent.detail !is ACC.ROLE_LABEL) {
+            AccessibleEvent event = new AccessibleEvent(this);
+            event.childID = childID;
+            event.result = null;
+            for (int i = 0; i < accessibleListeners.size(); i++) {
+                AccessibleListener listener = (AccessibleListener) accessibleListeners.elementAt(i);
+                listener.getName(event);
+            }
+            
+            if (event.result !is null)
+                returnValue = NSString.stringWith(event.result);
+        }
+        return returnValue;
+    }
+    
+    id getValueAttribute (int childID) {
+        id returnValue = null;
+        AccessibleControlEvent event = new AccessibleControlEvent(this);
+        event.childID = childID;
+        event.detail = -1;
+        event.result = null; //TODO: could pass the OS value to the app
+        for (int i = 0; i < accessibleControlListeners.size(); i++) {
+            AccessibleControlListener listener = (AccessibleControlListener) accessibleControlListeners.elementAt(i);
+            listener.getRole(event);
+            listener.getValue(event);
+        }
+        int role = event.detail;
+        String value = event.result;
+
+        switch (role) {
+        case ACC.ROLE_RADIOBUTTON: // 1 = on, 0 = off
+        case ACC.ROLE_CHECKBUTTON: // 1 = checked, 0 = unchecked, 2 = mixed
+        case ACC.ROLE_SCROLLBAR: // numeric value representing the position of the scroller
+        case ACC.ROLE_SLIDER: // the value associated with the position of the slider thumb
+        case ACC.ROLE_PROGRESSBAR: // the value associated with the fill level of the progress bar
+            if (value !is null) {
+                try {
+                    int number = Integer.parseInt(value);
+                    returnValue = NSNumber.numberWithInt(number);
+                } catch (NumberFormatException ex) {
+                    if (value.equalsIgnoreCase("true")) {
+                        returnValue = NSNumber.numberWithBool(true);
+                    } else if (value.equalsIgnoreCase("false")) {
+                        returnValue = NSNumber.numberWithBool(false);
+                    }
+                }
+            } else {
+                returnValue = NSNumber.numberWithBool(false);
+            }
+            break;
+        case ACC.ROLE_TABFOLDER: // the accessibility object representing the currently selected tab item
+        case ACC.ROLE_TABITEM:  // 1 = selected, 0 = not selected
+            AccessibleControlEvent ace = new AccessibleControlEvent(this);
+            ace.childID = -4;
+            for (int i = 0; i < accessibleControlListeners.size(); i++) {
+                AccessibleControlListener listener = (AccessibleControlListener) accessibleControlListeners.elementAt(i);
+                listener.getSelection(ace);
+            }
+            if (ace.childID >= ACC.CHILDID_SELF) {
+                if (role is ACC.ROLE_TABITEM) {
+                    returnValue = NSNumber.numberWithBool(ace.childID is childID);
+                } else {
+                    returnValue = new id(OS.NSAccessibilityUnignoredAncestor(childIDToOs(ace.childID).id));
+                }
+            } else {
+                returnValue = NSNumber.numberWithBool(false);               
+            }
+            break;
+        case ACC.ROLE_COMBOBOX: // text of the currently selected item
+        case ACC.ROLE_TEXT: // text in the text field
+            if (value !is null) returnValue = NSString.stringWith(value);
+            break;
+        case ACC.ROLE_LABEL: // text in the label
+            /* On a Mac, the 'value' of a label is the same as the 'name' of the label. */
+            AccessibleEvent e = new AccessibleEvent(this);
+            e.childID = childID;
+            e.result = null;
+            for (int i = 0; i < accessibleListeners.size(); i++) {
+                AccessibleListener listener = (AccessibleListener) accessibleListeners.elementAt(i);
+                listener.getName(e);
+            }
+            if (e.result !is null) {
+                returnValue = NSString.stringWith(e.result);
+            } else {
+                if (value !is null) returnValue = NSString.stringWith(value);
+            }
+            break;
+        }
+        
+        return returnValue;
+    }
+    
+    id getEnabledAttribute (int childID) {
+        AccessibleControlEvent event = new AccessibleControlEvent(this);
+        event.detail = -1;
+        for (int i = 0; i < accessibleControlListeners.size(); i++) {
+            AccessibleControlListener listener = (AccessibleControlListener) accessibleControlListeners.elementAt(i);
+            listener.getState(event);
+        }
+
+        return NSNumber.numberWithBool(control.isEnabled());
+    }
+    
+    id getFocusedAttribute (int childID) {
+        AccessibleControlEvent event = new AccessibleControlEvent(this);
+        event.childID = ACC.CHILDID_MULTIPLE; // set to invalid value, to test if the application sets it in getFocus()
+        event.accessible = null;
+        for (int i = 0; i < accessibleControlListeners.size(); i++) {
+            AccessibleControlListener listener = (AccessibleControlListener) accessibleControlListeners.elementAt(i);
+            listener.getFocus(event);
+        }
+
+        /* The application can optionally answer an accessible. */
+        // FIXME:
+//      if (event.accessible !is null) {
+//          bool hasFocus = (event.accessible.childID is childID) && (event.accessible.control is this.control);
+//          return NSNumber.numberWithBool(hasFocus);
+//      }
+        
+        /* Or the application can answer a valid child ID, including CHILDID_SELF and CHILDID_NONE. */
+        if (event.childID is ACC.CHILDID_SELF) {
+            bool hasFocus = (event.childID is childID);
+            return NSNumber.numberWithBool(hasFocus);
+        }
+        if (event.childID is ACC.CHILDID_NONE) {
+            return NSNumber.numberWithBool(false);
+        }
+        if (event.childID !is ACC.CHILDID_MULTIPLE) {
+            /* Other valid childID. */
+            return NSNumber.numberWithBool(event.childID is childID);
+        }
+
+        // Invalid childID at this point means the application did not implement getFocus, so 
+        // let the default handler return the native focus.
+        bool hasFocus = (this.control.view.window().firstResponder() is control.view);
+        return NSNumber.numberWithBool(hasFocus);
+    }
+    
+    id getParentAttribute (int childID) {
+        // Returning null here means 'let Cocoa figure it out.'
+        if (childID is ACC.CHILDID_SELF)
+            return null;
+        else
+            return new id(OS.NSAccessibilityUnignoredAncestor(control.view.id));
+    }
+    
+    id getChildrenAttribute (int childID) {
+        id returnValue = null;
+        if (childID is ACC.CHILDID_SELF) {
+            AccessibleControlEvent event = new AccessibleControlEvent(this);
+            event.childID = childID;
+            event.detail = -1; // set to impossible value to test if app resets
+            for (int i = 0; i < accessibleControlListeners.size(); i++) {
+                AccessibleControlListener listener = (AccessibleControlListener) accessibleControlListeners.elementAt(i);
+                listener.getChildCount(event);
+            }
+            if (event.detail > 0) {
+                for (int i = 0; i < accessibleControlListeners.size(); i++) {
+                    AccessibleControlListener listener = (AccessibleControlListener) accessibleControlListeners.elementAt(i);
+                    listener.getChildren(event);
+                }
+                Object [] appChildren = event.children;
+                if (appChildren !is null && appChildren.length > 0) {
+                    /* return an NSArray of NSAccessible objects. */
+                    NSMutableArray childArray = NSMutableArray.arrayWithCapacity(appChildren.length);
+
+                    for (int i = 0; i < appChildren.length; i++) {
+                        Object child = appChildren[i];
+                        if (child instanceof Integer) {
+                            id accChild = childIDToOs(((Integer)child).intValue());                         
+                            childArray.addObject(accChild);
+                        } else {
+                            childArray.addObject(((Accessible)child).control.view);
+                        }
+                    }
+
+                    returnValue = new id(OS.NSAccessibilityUnignoredChildren(childArray.id));
+                }
+            }
+        } else {
+            // Lightweight children have no children of their own.
+            // Don't return null if there are no children -- always return an empty array.
+            returnValue = NSArray.array();
+        }
+
+        // Returning null here means we want the control itself to determine its children. If the accessible listener
+        // implemented getChildCount/getChildren, references to those objects would have been returned above.
+        return returnValue;
+    }
+    
+    id getTabsAttribute (int childID) {
+        id returnValue = null;
+        if (childID is ACC.CHILDID_SELF) {
+            AccessibleControlEvent event = new AccessibleControlEvent(this);
+            event.childID = childID;
+            event.detail = -1; // set to impossible value to test if app resets
+            for (int i = 0; i < accessibleControlListeners.size(); i++) {
+                AccessibleControlListener listener = (AccessibleControlListener) accessibleControlListeners.elementAt(i);
+                listener.getChildCount(event);
+            }
+            if (event.detail > 0) {
+                for (int i = 0; i < accessibleControlListeners.size(); i++) {
+                    AccessibleControlListener listener = (AccessibleControlListener) accessibleControlListeners.elementAt(i);
+                    listener.getChildren(event);
+                }
+                Object [] appChildren = event.children;
+                if (appChildren !is null && appChildren.length > 0) {
+                    /* return an NSArray of NSAccessible objects. */
+                    NSMutableArray childArray = NSMutableArray.arrayWithCapacity(appChildren.length);
+
+                    for (int i = 0; i < appChildren.length; i++) {
+                        Object child = appChildren[i];
+                        if (child instanceof Integer) {
+                            int subChildID = ((Integer)child).intValue();
+                            event.childID = subChildID;
+                            event.detail = -1;
+                            for (int j = 0; j < accessibleControlListeners.size(); j++) {
+                                AccessibleControlListener listener = (AccessibleControlListener) accessibleControlListeners.elementAt(j);
+                                listener.getRole(event);
+                            }
+                            
+                            if (event.detail is ACC.ROLE_TABITEM) {
+                                id accChild = childIDToOs(((Integer)child).intValue());                         
+                                childArray.addObject(accChild);
+                            }
+                        } else {
+                            childArray.addObject(((Accessible)child).control.view);
+                        }
+                    }
+
+                    returnValue = new id(OS.NSAccessibilityUnignoredChildren(childArray.id));
+                }
+            }
+        } else {
+            // Lightweight children have no children of their own.
+            // Don't return null if there are no children -- always return an empty array.
+            returnValue = NSArray.array();
+        }
+
+        // Returning null here means we want the control itself to determine its children. If the accessible listener
+        // implemented getChildCount/getChildren, references to those objects would have been returned above.
+        return returnValue;
+    }
+    
+    id getWindowAttribute (int childID) {
+        return control.view.window();
+    }
+    
+    id getTopLevelUIElementAttribute (int childID) {
+        return control.view.window();
+    }
+    
+    id getPositionAttribute (int childID) {
+        id returnValue = null;
+        AccessibleControlEvent event = new AccessibleControlEvent(this);
+        event.childID = childID;
+        event.width = -1;
+        
+        for (int i = 0; i < accessibleControlListeners.size(); i++) {
+            AccessibleControlListener listener = (AccessibleControlListener) accessibleControlListeners.elementAt(i);
+            listener.getLocation(event);
+        }
+
+        Monitor primaryMonitor = Display.getCurrent().getPrimaryMonitor();
+        
+        NSPoint osPositionAttribute = new NSPoint ();
+        if (event.width !is -1) {
+            // The point returned is the lower-left coordinate of the widget in lower-left relative screen coordinates.
+            osPositionAttribute.x = event.x;
+            osPositionAttribute.y = primaryMonitor.getBounds().height - event.y - event.height;
+            returnValue = NSValue.valueWithPoint(osPositionAttribute);
+        } else {
+            if (childID !is ACC.CHILDID_SELF) {
+                Point pt = null;
+                Rectangle location = control.getBounds();
+
+                if (control.getParent() !is null)
+                    pt = control.getParent().toDisplay(location.x, location.y);
+                else 
+                    pt = ((Shell)control).toDisplay(location.x, location.y);
+
+                osPositionAttribute.x = pt.x;
+                osPositionAttribute.y = pt.y;
+                returnValue = NSValue.valueWithPoint(osPositionAttribute);
+            }
+        }
+        
+        return returnValue;
+    }
+    
+    id getSizeAttribute (int childID) {
+        id returnValue = null;
+        AccessibleControlEvent event = new AccessibleControlEvent(this);
+        event.childID = childID;
+        event.width = -1;
+
+        for (int i = 0; i < accessibleControlListeners.size(); i++) {
+            AccessibleControlListener listener = (AccessibleControlListener) accessibleControlListeners.elementAt(i);
+            listener.getLocation(event);
+        }
+
+        NSSize controlSize = new NSSize ();
+        if (event.width !is -1) {
+            controlSize.width = event.width;
+            controlSize.height = event.height;
+            returnValue = NSValue.valueWithSize(controlSize);
+        } else {
+            if (childID !is ACC.CHILDID_SELF) {
+                controlSize.width = controlSize.height = 0;
+                returnValue = NSValue.valueWithSize(controlSize);
+            }
+        }
+        
+        return returnValue;
+    }
+    
+    id getDescriptionAttribute (int childID) {
+        AccessibleEvent event = new AccessibleEvent(this);
+        event.childID = childID;
+        event.result = null;
+        id returnValue = null;
+        for (int i = 0; i < accessibleListeners.size(); i++) {
+            AccessibleListener listener = (AccessibleListener) accessibleListeners.elementAt(i);
+            listener.getDescription(event);
+        }
+
+        returnValue = (event.result !is null ? NSString.stringWith(event.result) : null);
+
+        // If no description was provided, try the name.
+        if (returnValue is null) {
+            if (control instanceof Composite) returnValue = NSString.stringWith("");
+        }
+
+        return returnValue;
+    }
+    
+    id getInsertionPointLineNumberAttribute (int childID) {
+        id returnValue = null;
+        AccessibleControlEvent controlEvent = new AccessibleControlEvent(this);
+        controlEvent.childID = childID;
+        controlEvent.result = null;
+        for (int i = 0; i < accessibleControlListeners.size(); i++) {
+            AccessibleControlListener listener = (AccessibleControlListener) accessibleControlListeners.elementAt(i);
+            listener.getValue(controlEvent);
+        }
+        AccessibleTextEvent textEvent = new AccessibleTextEvent(this);
+        textEvent.childID = childID;
+        textEvent.offset = -1;
+        for (int i = 0; i < accessibleTextListeners.size(); i++) {
+            AccessibleTextListener listener = (AccessibleTextListener) accessibleTextListeners.elementAt(i);
+            listener.getCaretOffset(textEvent);
+        }
+        if (controlEvent.result !is null && textEvent.offset !is -1) {
+            int lineNumber = lineNumberForOffset (controlEvent.result, textEvent.offset);
+            returnValue = NSNumber.numberWithInt(lineNumber);
+        }
+        return returnValue;
+    }
+    
+    id getNumberOfCharactersAttribute (int childID) {
+        id returnValue = null;
+        AccessibleControlEvent event = new AccessibleControlEvent(this);
+        event.childID = childID;
+        event.result = null;
+        for (int i = 0; i < accessibleControlListeners.size(); i++) {
+            AccessibleControlListener listener = (AccessibleControlListener) accessibleControlListeners.elementAt(i);
+            listener.getValue(event);
+        }
+        String appValue = event.result;
+        if (appValue !is null) {
+            returnValue = NSNumber.numberWithInt(appValue.length());
+        }
+        return returnValue;
+    }
+    
+    id getRangeForLineParameterizedAttribute (id parameter, int childID) {
+        id returnValue = null;
+
+        // The parameter is an NSNumber with the line number.
+        NSNumber lineNumberObj = new NSNumber(parameter.id);        
+        int lineNumber = lineNumberObj.intValue();
+        System.out.println("Line number = " + lineNumber);
+        AccessibleControlEvent event = new AccessibleControlEvent(this);
+        event.childID = childID;
+        event.result = null;
+        for (int i = 0; i < accessibleControlListeners.size(); i++) {
+            AccessibleControlListener listener = (AccessibleControlListener) accessibleControlListeners.elementAt(i);
+            listener.getValue(event);
+        }
+        if (event.result !is null) {
+            NSRange range = rangeForLineNumber (lineNumber, event.result);
+            if (range.location !is -1) {
+                returnValue = NSValue.valueWithRange(range);
+            }
+        }
+        return returnValue;
+    }
+    
+    id getSelectedTextAttribute (int childID) {
+        id returnValue = NSString.stringWith("");
+        AccessibleTextEvent event = new AccessibleTextEvent(this);
+        event.childID = childID;
+        event.offset = -1;
+        event.length = -1;
+        for (int i = 0; i < accessibleTextListeners.size(); i++) {
+            AccessibleTextListener listener = (AccessibleTextListener) accessibleTextListeners.elementAt(i);
+            listener.getSelectionRange(event);
+        }
+        int offset = event.offset;
+        int length = event.length;
+        if (offset !is -1 && length !is -1 && length !is 0) {  // TODO: do we need the && length !is 0 ?
+            AccessibleControlEvent event2 = new AccessibleControlEvent(this);
+            event2.childID = event.childID;
+            event2.result = null;
+            for (int i = 0; i < accessibleControlListeners.size(); i++) {
+                AccessibleControlListener listener = (AccessibleControlListener) accessibleControlListeners.elementAt(i);
+                listener.getValue(event2);
+            }
+            String appValue = event2.result;
+            if (appValue !is null) {
+                returnValue = NSString.stringWith(appValue.substring(offset, offset + length));
+            }
+        }
+        return returnValue;
+    }
+    
+    id getSelectedTextRangeAttribute (int childID) {
+        id returnValue = null;
+        AccessibleTextEvent event = new AccessibleTextEvent(this);
+        event.childID = childID;
+        event.offset = -1;
+        event.length = 0;
+        for (int i = 0; i < accessibleTextListeners.size(); i++) {
+            AccessibleTextListener listener = (AccessibleTextListener) accessibleTextListeners.elementAt(i);
+            listener.getSelectionRange(event);
+        }
+        if (event.offset !is -1) {
+            NSRange range = new NSRange();
+            range.location = event.offset;
+            range.length = event.length;
+            returnValue = NSValue.valueWithRange(range);
+        }
+        return returnValue;
+    }
+    
+    id getStringForRangeAttribute (id parameter, int childID) {
+        id returnValue = null;
+        
+        // Parameter is an NSRange wrapped in an NSValue. 
+        NSValue parameterObject = new NSValue(parameter.id);
+        NSRange range = parameterObject.rangeValue();       
+        AccessibleControlEvent event = new AccessibleControlEvent(this);
+        event.childID = childID;
+        event.result = null;
+        for (int i = 0; i < accessibleControlListeners.size(); i++) {
+            AccessibleControlListener listener = (AccessibleControlListener) accessibleControlListeners.elementAt(i);
+            listener.getValue(event);
+        }
+        String appValue = event.result;
+
+        if (appValue !is null) {
+            returnValue = NSString.stringWith(appValue.substring(range.location, range.location + range.length));
+        }
+
+        return returnValue;
+    }
+    
+    id getSelectedTextRangesAttribute (int childID) {
+        NSMutableArray returnValue = null; 
+        AccessibleTextEvent event = new AccessibleTextEvent(this);
+        event.childID = childID;
+        event.offset = -1;
+        event.length = 0;
+        
+        for (int i = 0; i < accessibleTextListeners.size(); i++) {
+            AccessibleTextListener listener = (AccessibleTextListener) accessibleTextListeners.elementAt(i);
+            listener.getSelectionRange(event);
+        }
+        
+        if (event.offset !is -1) {
+            returnValue = NSMutableArray.arrayWithCapacity(1);
+            NSRange range = new NSRange();
+            range.location = event.offset;
+            range.length = event.length;
+            returnValue.addObject(NSValue.valueWithRange(range));
+        }
+        
+        return returnValue;
+    }
+    
+    id getVisibleCharacterRangeAttribute (int childID) {
+        AccessibleControlEvent event = new AccessibleControlEvent(this);
+        event.childID = childID;
+        event.result = null;
+        for (int i = 0; i < accessibleControlListeners.size(); i++) {
+            AccessibleControlListener listener = (AccessibleControlListener) accessibleControlListeners.elementAt(i);
+            listener.getValue(event);
+        }
+        
+        NSRange range = new NSRange();
+
+        if (event.result !is null) {
+            range.location = 0;
+            range.length = event.result.length();
+        } else {
+            return null;
+//          range.location = range.length = 0;
+        }
+
+        return NSValue.valueWithRange(range);
+    }
+
+    int lineNumberForOffset (String text, int offset) {
+        int lineNumber = 1;
+        int length = text.length();
+        for (int i = 0; i < offset; i++) {
+            switch (text.charAt (i)) {
+                case '\r': 
+                    if (i + 1 < length) {
+                        if (text.charAt (i + 1) is '\n') ++i;
+                    }
+                    // FALL THROUGH
+                case '\n':
+                    lineNumber++;
+            }
+        }
+        return lineNumber;
+    }
+
+    NSRange rangeForLineNumber (int lineNumber, String text) {
+        NSRange range = new NSRange();
+        range.location = -1;
+        int line = 1;
+        int count = 0;
+        int length = text.length ();
+        for (int i = 0; i < length; i++) {
+            if (line is lineNumber) {
+                if (count is 0) {
+                    range.location = i;
+                }
+                count++;
+            }
+            if (line > lineNumber) break;
+            switch (text.charAt (i)) {
+                case '\r': 
+                    if (i + 1 < length && text.charAt (i + 1) is '\n') i++;
+                    // FALL THROUGH
+                case '\n':
+                    line++;
+            }
+        }
+        range.length = count;
+        return range;
+    }
+
+    /**
+     * Removes the listener from the collection of listeners who will
+     * be notified when an accessible client asks for certain strings,
+     * such as name, description, help, or keyboard shortcut.
+     *
+     * @param listener the listener that should no longer be notified when the receiver
+     * is asked for a name, description, help, or keyboard shortcut string
+     *
+     * @exception IllegalArgumentException <ul>
+     *    <li>ERROR_NULL_ARGUMENT - if the listener is null</li>
+     * </ul>
+     * @exception DWTException <ul>
+     *    <li>ERROR_WIDGET_DISPOSED - if the receiver's control has been disposed</li>
+     *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver's control</li>
+     * </ul>
+     *
+     * @see AccessibleListener
+     * @see #addAccessibleListener
+     */
+    public void removeAccessibleListener(AccessibleListener listener) {
+        checkWidget();
+        if (listener is null) DWT.error(DWT.ERROR_NULL_ARGUMENT);
+        accessibleListeners.removeElement(listener);
+    }
+
+    /**
+     * Removes the listener from the collection of listeners who will
+     * be notified when an accessible client asks for custom control
+     * specific information.
+     *
+     * @param listener the listener that should no longer be notified when the receiver
+     * is asked for custom control specific information
+     *
+     * @exception IllegalArgumentException <ul>
+     *    <li>ERROR_NULL_ARGUMENT - if the listener is null</li>
+     * </ul>
+     * @exception DWTException <ul>
+     *    <li>ERROR_WIDGET_DISPOSED - if the receiver's control has been disposed</li>
+     *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver's control</li>
+     * </ul>
+     *
+     * @see AccessibleControlListener
+     * @see #addAccessibleControlListener
+     */
+    public void removeAccessibleControlListener(AccessibleControlListener listener) {
+        checkWidget();
+        if (listener is null) DWT.error(DWT.ERROR_NULL_ARGUMENT);
+        accessibleControlListeners.removeElement(listener);
     }
 
     /**
@@ -206,18 +1281,17 @@
      * @since 3.0
      */
     public void removeAccessibleTextListener (AccessibleTextListener listener) {
+        checkWidget ();
+        if (listener is null) DWT.error (DWT.ERROR_NULL_ARGUMENT);
+        accessibleTextListeners.removeElement (listener);
     }
 
-    /**
-     * Returns the control for this Accessible object. 
-     *
-     * @return the receiver's control
-     * @since 3.0
-     */
-    public Control getControl () {
-        return control;
+    static NSArray retainedAutoreleased(NSArray inObject) {
+        id temp = inObject.retain();
+        id temp2 = new NSObject(temp.id).autorelease();
+        return new NSArray(temp2.id);
     }
-
+    
     /**
      * Sends a message to accessible clients that the child selection
      * within a custom container control has changed.
@@ -230,6 +1304,24 @@
      * @since 3.0
      */
     public void selectionChanged () {
+        checkWidget();
+        OS.NSAccessibilityPostNotification(control.view.id, OS.NSAccessibilitySelectedChildrenChangedNotification.id);
+    }
+
+    /**
+     * Sends a message to accessible clients indicating that the focus
+     * has changed within a custom control.
+     *
+     * @param childID an identifier specifying a child of the control
+     * 
+     * @exception DWTException <ul>
+     *    <li>ERROR_WIDGET_DISPOSED - if the receiver's control has been disposed</li>
+     *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver's control</li>
+     * </ul>
+     */
+    public void setFocus(int childID) {
+        checkWidget();
+        OS.NSAccessibilityPostNotification(control.view.id, OS.NSAccessibilityFocusedUIElementChangedNotification.id);
     }
 
     /**
@@ -246,6 +1338,8 @@
      * @since 3.0
      */
     public void textCaretMoved (int index) {
+        checkWidget();
+        OS.NSAccessibilityPostNotification(control.view.id, OS.NSAccessibilitySelectedTextChangedNotification.id);
     }
 
     /**
@@ -268,6 +1362,8 @@
      * @since 3.0
      */
     public void textChanged (int type, int startIndex, int length) {
+        checkWidget();
+        OS.NSAccessibilityPostNotification(control.view.id, OS.NSAccessibilityValueChangedNotification.id);
     }
 
     /**
@@ -282,46 +1378,124 @@
      * @since 3.0
      */
     public void textSelectionChanged () {
+        checkWidget();
+        OS.NSAccessibilityPostNotification(control.view.id, OS.NSAccessibilitySelectedTextChangedNotification.id);
     }
+    
+    id childIDToOs(int childID) {
+        if (childID is ACC.CHILDID_SELF) {
+            return control.view;
+        }
 
-    /**
-     * Sends a message to accessible clients indicating that the focus
-     * has changed within a custom control.
-     *
-     * @param childID an identifier specifying a child of the control
-     * 
-     * @exception DWTException <ul>
-     *    <li>ERROR_WIDGET_DISPOSED - if the receiver's control has been disposed</li>
-     *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver's control</li>
-     * </ul>
-     */
-    public void setFocus (int childID) {
+        /* Check cache for childID, if found, return corresponding osChildID. */
+        SWTAccessibleDelegate childRef = (SWTAccessibleDelegate) children.get(new Integer(childID));
+        
+        if (childRef is null) {
+            childRef = new SWTAccessibleDelegate(this, childID);
+            children.put(new Integer(childID), childRef);
+        }
+        
+        return childRef;
     }
 
-    /**
-     * Invokes platform specific functionality to dispose an accessible object.
-     * <p>
-     * <b>IMPORTANT:</b> This method is <em>not</em> part of the public
-     * API for <code>Accessible</code>. It is marked public only so that it
-     * can be shared within the packages provided by DWT. It is not
-     * available on all platforms, and should never be called from
-     * application code.
-     * </p>
-     */
-    public void internal_dispose_Accessible () {
+    NSString concatStringsAsRole(NSString str1, NSString str2) {
+        NSString returnValue = str1;
+        returnValue = returnValue.stringByAppendingString(NSString.stringWith(":"));
+        returnValue = returnValue.stringByAppendingString(str2);
+        return returnValue;
+    }   
+    
+    String roleToOs(int role) {
+        NSString nsReturnValue = null; //OS.NSAccessibilityUnknownRole;
+        
+        switch (role) {
+            case ACC.ROLE_CLIENT_AREA: nsReturnValue = OS.NSAccessibilityGroupRole; break;
+            case ACC.ROLE_WINDOW: nsReturnValue = OS.NSAccessibilityWindowRole; break;
+            case ACC.ROLE_MENUBAR: nsReturnValue = OS.NSAccessibilityMenuBarRole; break;
+            case ACC.ROLE_MENU: nsReturnValue = OS.NSAccessibilityMenuRole; break;
+            case ACC.ROLE_MENUITEM: nsReturnValue = OS.NSAccessibilityMenuItemRole; break;
+            case ACC.ROLE_SEPARATOR: nsReturnValue = OS.NSAccessibilitySplitterRole; break;
+            case ACC.ROLE_TOOLTIP: nsReturnValue = OS.NSAccessibilityHelpTagRole; break;
+            case ACC.ROLE_SCROLLBAR: nsReturnValue = OS.NSAccessibilityScrollBarRole; break;
+            case ACC.ROLE_DIALOG: nsReturnValue = concatStringsAsRole(OS.NSAccessibilityWindowRole, OS.NSAccessibilityDialogSubrole); break;
+            case ACC.ROLE_LABEL: nsReturnValue = OS.NSAccessibilityStaticTextRole; break;
+            case ACC.ROLE_PUSHBUTTON: nsReturnValue = OS.NSAccessibilityButtonRole; break;
+            case ACC.ROLE_CHECKBUTTON: nsReturnValue = OS.NSAccessibilityCheckBoxRole; break;
+            case ACC.ROLE_RADIOBUTTON: nsReturnValue = OS.NSAccessibilityRadioButtonRole; break;
+            case ACC.ROLE_COMBOBOX: nsReturnValue = OS.NSAccessibilityComboBoxRole; break;
+            case ACC.ROLE_TEXT: {
+                int style = control.getStyle();
+                
+                if ((style & DWT.MULTI) !is 0) {
+                    nsReturnValue = OS.NSAccessibilityTextAreaRole;
+                } else {
+                    nsReturnValue = OS.NSAccessibilityTextFieldRole;
+                }
+                
+                break;
+            }
+            case ACC.ROLE_TOOLBAR: nsReturnValue = OS.NSAccessibilityToolbarRole; break;
+            case ACC.ROLE_LIST: nsReturnValue = OS.NSAccessibilityOutlineRole; break;
+            case ACC.ROLE_LISTITEM: nsReturnValue = OS.NSAccessibilityStaticTextRole; break;
+            case ACC.ROLE_TABLE: nsReturnValue = OS.NSAccessibilityTableRole; break;
+            case ACC.ROLE_TABLECELL: nsReturnValue = concatStringsAsRole(OS.NSAccessibilityRowRole, OS.NSAccessibilityTableRowSubrole); break;
+            case ACC.ROLE_TABLECOLUMNHEADER: nsReturnValue = OS.NSAccessibilitySortButtonRole; break;
+            case ACC.ROLE_TABLEROWHEADER: nsReturnValue = concatStringsAsRole(OS.NSAccessibilityRowRole, OS.NSAccessibilityTableRowSubrole); break;
+            case ACC.ROLE_TREE: nsReturnValue = OS.NSAccessibilityOutlineRole; break;
+            case ACC.ROLE_TREEITEM: nsReturnValue = concatStringsAsRole(OS.NSAccessibilityOutlineRole, OS.NSAccessibilityOutlineRowSubrole); break;
+            case ACC.ROLE_TABFOLDER: nsReturnValue = OS.NSAccessibilityTabGroupRole; break;
+            case ACC.ROLE_TABITEM: nsReturnValue = OS.NSAccessibilityRadioButtonRole; break;
+            case ACC.ROLE_PROGRESSBAR: nsReturnValue = OS.NSAccessibilityProgressIndicatorRole; break;
+            case ACC.ROLE_SLIDER: nsReturnValue = OS.NSAccessibilitySliderRole; break;
+            case ACC.ROLE_LINK: nsReturnValue = OS.NSAccessibilityLinkRole; break;
+        }
+
+        return nsReturnValue.getString();
     }
 
-    /**
-     * Invokes platform specific functionality to handle a window message.
-     * <p>
-     * <b>IMPORTANT:</b> This method is <em>not</em> part of the public
-     * API for <code>Accessible</code>. It is marked public only so that it
-     * can be shared within the packages provided by DWT. It is not
-     * available on all platforms, and should never be called from
-     * application code.
-     * </p>
-     */
-    public int internal_WM_GETOBJECT (int wParam, int lParam) {
-        return 0;
+    int osToRole(NSString osRole) {
+        if (osRole is null) return 0;
+        if (osRole.isEqualToString(OS.NSAccessibilityWindowRole)) return ACC.ROLE_WINDOW;
+        if (osRole.isEqualToString(OS.NSAccessibilityMenuBarRole)) return ACC.ROLE_MENUBAR;
+        if (osRole.isEqualToString(OS.NSAccessibilityMenuRole)) return ACC.ROLE_MENU;
+        if (osRole.isEqualToString(OS.NSAccessibilityMenuItemRole)) return ACC.ROLE_MENUITEM;
+        if (osRole.isEqualToString(OS.NSAccessibilitySplitterRole)) return ACC.ROLE_SEPARATOR;
+        if (osRole.isEqualToString(OS.NSAccessibilityHelpTagRole)) return ACC.ROLE_TOOLTIP;
+        if (osRole.isEqualToString(OS.NSAccessibilityScrollBarRole)) return ACC.ROLE_SCROLLBAR;
+        if (osRole.isEqualToString(OS.NSAccessibilityScrollAreaRole)) return ACC.ROLE_LIST;
+        if (osRole.isEqualToString(concatStringsAsRole(OS.NSAccessibilityWindowRole, OS.NSAccessibilityDialogSubrole))) return ACC.ROLE_DIALOG;
+        if (osRole.isEqualToString(concatStringsAsRole(OS.NSAccessibilityWindowRole, OS.NSAccessibilitySystemDialogSubrole))) return ACC.ROLE_DIALOG;
+        if (osRole.isEqualToString(OS.NSAccessibilityStaticTextRole)) return ACC.ROLE_LABEL;
+        if (osRole.isEqualToString(OS.NSAccessibilityButtonRole)) return ACC.ROLE_PUSHBUTTON;
+        if (osRole.isEqualToString(OS.NSAccessibilityCheckBoxRole)) return ACC.ROLE_CHECKBUTTON;
+        if (osRole.isEqualToString(OS.NSAccessibilityRadioButtonRole)) return ACC.ROLE_RADIOBUTTON;
+        if (osRole.isEqualToString(OS.NSAccessibilityComboBoxRole)) return ACC.ROLE_COMBOBOX;
+        if (osRole.isEqualToString(OS.NSAccessibilityTextFieldRole)) return ACC.ROLE_TEXT;
+        if (osRole.isEqualToString(OS.NSAccessibilityTextAreaRole)) return ACC.ROLE_TEXT;
+        if (osRole.isEqualToString(OS.NSAccessibilityToolbarRole)) return ACC.ROLE_TOOLBAR;
+        if (osRole.isEqualToString(OS.NSAccessibilityListRole)) return ACC.ROLE_LIST;
+        if (osRole.isEqualToString(OS.NSAccessibilityTableRole)) return ACC.ROLE_TABLE;
+        if (osRole.isEqualToString(OS.NSAccessibilityColumnRole)) return ACC.ROLE_TABLECOLUMNHEADER;
+        if (osRole.isEqualToString(concatStringsAsRole(OS.NSAccessibilityButtonRole, OS.NSAccessibilitySortButtonRole))) return ACC.ROLE_TABLECOLUMNHEADER;
+        if (osRole.isEqualToString(concatStringsAsRole(OS.NSAccessibilityRowRole, OS.NSAccessibilityTableRowSubrole))) return ACC.ROLE_TABLEROWHEADER;
+        if (osRole.isEqualToString(OS.NSAccessibilityOutlineRole)) return ACC.ROLE_TREE;
+        if (osRole.isEqualToString(concatStringsAsRole(OS.NSAccessibilityOutlineRole, OS.NSAccessibilityOutlineRowSubrole))) return ACC.ROLE_TREEITEM;
+        if (osRole.isEqualToString(OS.NSAccessibilityTabGroupRole)) return ACC.ROLE_TABFOLDER;
+        if (osRole.isEqualToString(OS.NSAccessibilityProgressIndicatorRole)) return ACC.ROLE_PROGRESSBAR;
+        if (osRole.isEqualToString(OS.NSAccessibilitySliderRole)) return ACC.ROLE_SLIDER;
+        if (osRole.isEqualToString(OS.NSAccessibilityLinkRole)) return ACC.ROLE_LINK;
+        return ACC.ROLE_CLIENT_AREA;
     }
+    
+    /* checkWidget was copied from Widget, and rewritten to work in this package */
+    void checkWidget () {
+        if (!isValidThread ()) DWT.error (DWT.ERROR_THREAD_INVALID_ACCESS);
+        if (control.isDisposed ()) DWT.error (DWT.ERROR_WIDGET_DISPOSED);
+    }
+
+    /* isValidThread was copied from Widget, and rewritten to work in this package */
+    bool isValidThread () {
+        return control.getDisplay ().getThread () is Thread.currentThread ();
+    }
+
 }