projects/dwt-win: dwt/accessibility/Accessible.d comparison

comparison dwt/accessibility/Accessible.d @ 213:36f5cb12e1a2

Update to SWT 3.4M7

author	Frank Benoit <benoit@tionex.de>
date	Sat, 17 May 2008 17:34:28 +0200
parents	ab60f3309436
children	e2affbeb686d

comparison

equal deleted inserted replaced

-:ab60f3309436
+:36f5cb12e1a2
 * application code.
 * </p>
 */
 public int /*long*/ internal_WM_GETOBJECT (int /*long*/ wParam, int /*long*/ lParam) {
 if (objIAccessible is null) return 0;
-if (cast(int)/*64*/lParam is COM.OBJID_CLIENT) {
+if (lParam is COM.OBJID_CLIENT) {
 /* LresultFromObject([in] riid, [in] wParam, [in] pAcc)
 * The argument pAcc is owned by the caller so reference count does not
 * need to be incremented.
 */
 return COM.LresultFromObject(&COM.IIDIAccessible, wParam, cast(IAccessible)objIAccessible);
 }
 int childID = event.childID;
 if (childID is ACC.CHILDID_NONE) {
 return iaccessible.accHitTest(xLeft, yTop, pvarChild);
 }
+//TODO - use VARIANT structure
 pvarChild.vt = COM.VT_I4;
 pvarChild.lVal = childIDToOs(childID);
 return COM.S_OK;
 }
 COM.MoveMemory(pHeight.ptr, pcyHeight, 4);
 osLeft = pLeft[0]; osTop = pTop[0]; osWidth = pWidth[0]; osHeight = pHeight[0];
 }
 AccessibleControlEvent event = new AccessibleControlEvent(this);
-event.childID = osToChildID(cast(int)/*64*/v.lVal);
+event.childID = osToChildID(v.lVal);
 event.x = osLeft;
 event.y = osTop;
 event.width = osWidth;
 event.height = osHeight;
 for (int i = 0; i < accessibleControlListeners.length; i++) {
 if (code is COM.E_INVALIDARG) code = COM.S_FALSE; // proxy doesn't know about app childID
 return code;
 }
 AccessibleControlEvent event = new AccessibleControlEvent(this);
-event.childID = osToChildID(cast(int)/*64*/v.lVal);
+event.childID = osToChildID(v.lVal);
 for (int i = 0; i < accessibleControlListeners.length; i++) {
 AccessibleControlListener listener = cast(AccessibleControlListener) accessibleControlListeners[i];
 listener.getChild(event);
 }
 Accessible accessible = event.accessible;
 if (code is COM.S_OK) {
 osDefaultAction = BSTRToStr( *pszDefaultAction, true );
 }
 AccessibleControlEvent event = new AccessibleControlEvent(this);
-event.childID = osToChildID(cast(int)/*64*/v.lVal);
+event.childID = osToChildID(v.lVal);
 event.result = osDefaultAction;
 for (int i = 0; i < accessibleControlListeners.length; i++) {
 AccessibleControlListener listener = cast(AccessibleControlListener) accessibleControlListeners[i];
 listener.getDefaultAction(event);
 }
 osDescription = WCHARzToStr(*pszDescription, size);
 }
 }
 AccessibleEvent event = new AccessibleEvent(this);
-event.childID = osToChildID(cast(int)/*64*/v.lVal);
+event.childID = osToChildID(v.lVal);
 event.result = osDescription;
 // TEMPORARY CODE
 /* Currently our tree columns are emulated using custom draw,
 * so we need to create the description using the tree column
 /* Get the default focus child from the OS. */
 int osChild = ACC.CHILDID_NONE;
 int code = iaccessible.get_accFocus(pvarChild);
 if (accessibleControlListeners.length is 0) return code;
 if (code is COM.S_OK) {
+//TODO - use VARIANT structure
 short[1] pvt;
 COM.MoveMemory(pvt.ptr, pvarChild, 2);
 if (pvt[0] is COM.VT_I4) {
 int[1] pChild;
 COM.MoveMemory(pChild.ptr, pvarChild + 8, 4);
 // the original SysString is clearuped and bstr set to null
 osHelp = BSTRToStr(*pszHelp, true);
 }
 AccessibleEvent event = new AccessibleEvent(this);
-event.childID = osToChildID(cast(int)/*64*/v.lVal);
+event.childID = osToChildID(v.lVal);
 event.result = osHelp;
 for (int i = 0; i < accessibleListeners.length; i++) {
 AccessibleListener listener = cast(AccessibleListener) accessibleListeners[i];
 listener.getHelp(event);
 }
 // the original SysString is clearuped and bstr set to null
 osKeyboardShortcut = BSTRToStr(*pszKeyboardShortcut, true);
 }
 AccessibleEvent event = new AccessibleEvent(this);
-event.childID = osToChildID(cast(int)/*64*/v.lVal);
+event.childID = osToChildID(v.lVal);
 event.result = osKeyboardShortcut;
 for (int i = 0; i < accessibleListeners.length; i++) {
 AccessibleListener listener = cast(AccessibleListener) accessibleListeners[i];
 listener.getKeyboardShortcut(event);
 }
 // the original SysString is clearuped and bstr set to null
 osName = BSTRToStr(*pszName, true);
 }
 AccessibleEvent event = new AccessibleEvent(this);
-event.childID = osToChildID(cast(int)/*64*/v.lVal);
+event.childID = osToChildID(v.lVal);
 event.result = osName;
 for (int i = 0; i < accessibleListeners.length; i++) {
 AccessibleListener listener = cast(AccessibleListener) accessibleListeners[i];
 listener.getName(event);
 }
 int code = iaccessible.get_accRole(variant, pvarRole);
 if (code is COM.E_INVALIDARG) code = COM.S_FALSE; // proxy doesn't know about app childID
 // TEMPORARY CODE - process tree and table even if there are no apps listening
 if (accessibleControlListeners.length is 0 && !( null !is cast(Tree)control || null !is cast(Table)control )) return code;
 if (code is COM.S_OK) {
+//TODO - use VARIANT structure
 short[1] pvt;
 COM.MoveMemory(pvt.ptr, pvarRole, 2);
 if (pvt[0] is COM.VT_I4) {
 int[1] pRole;
 COM.MoveMemory(pRole.ptr, pvarRole + 8, 4);
 osRole = pRole[0];
 }
 }
 AccessibleControlEvent event = new AccessibleControlEvent(this);
-event.childID = osToChildID(cast(int)/*64*/v.lVal);
+event.childID = osToChildID(v.lVal);
 event.detail = osToRole(osRole);
 // TEMPORARY CODE
 /* Currently our checkbox table and tree are emulated using state mask
 * images, so we need to specify 'checkbox' role for the items. */
 if (v.lVal !is COM.CHILDID_SELF) {
 /* Get the default selection from the OS. */
 int osChild = ACC.CHILDID_NONE;
 int code = iaccessible.get_accSelection(pvarChildren);
 if (accessibleControlListeners.length is 0) return code;
 if (code is COM.S_OK) {
+//TODO - use VARIANT structure
 short[1] pvt;
 COM.MoveMemory(pvt.ptr, pvarChildren, 2);
 if (pvt[0] is COM.VT_I4) {
 int[1] pChild;
 COM.MoveMemory(pChild.ptr, pvarChildren + 8, 4);
 int code = iaccessible.get_accState(variant, pvarState);
 if (code is COM.E_INVALIDARG) code = COM.S_FALSE; // proxy doesn't know about app childID
 // TEMPORARY CODE - process tree and table even if there are no apps listening
 if (accessibleControlListeners.length is 0 && !( null !is cast(Tree)control || null !is cast(Table)control )) return code;
 if (code is COM.S_OK) {
+//TODO - use VARIANT structure
 short[1] pvt;
 COM.MoveMemory(pvt.ptr, pvarState, 2);
 if (pvt[0] is COM.VT_I4) {
 int[1] pState;
 COM.MoveMemory(pState.ptr, pvarState + 8, 4);
 osState = pState[0];
 }
 }
+bool grayed = false;
 AccessibleControlEvent event = new AccessibleControlEvent(this);
-event.childID = osToChildID(cast(int)/*64*/v.lVal);
+event.childID = osToChildID(v.lVal);
 event.detail = osToState(osState);
 // TEMPORARY CODE
 /* Currently our checkbox table and tree are emulated using state mask
 * images, so we need to determine if the item state is 'checked'. */
 if (v.lVal !is COM.CHILDID_SELF) {
 tvItem.hItem = cast(HANDLE) v.lVal;
 }
 auto result = OS.SendMessage (hwnd, OS.TVM_GETITEM, 0, &tvItem);
 bool checked = (result !is 0) && (((tvItem.state >> 12) & 1) is 0);
 if (checked) event.detail |= ACC.STATE_CHECKED;
+grayed = tvItem.state >> 12 > 2;
 } else if (null !is cast(Table)control && (control.getStyle() & DWT.CHECK) !is 0) {
 Table table = cast(Table) control;
-TableItem item = table.getItem(event.childID);
+int index = event.childID;
-if (item !is null) {
+if (0 <= index && index < table.getItemCount()) {
+TableItem item = table.getItem(index);
 if (item.getChecked()) event.detail |= ACC.STATE_CHECKED;
+if (item.getGrayed()) grayed = true;
 }
 }
 }
 for (int i = 0; i < accessibleControlListeners.length; i++) {
 AccessibleControlListener listener = cast(AccessibleControlListener) accessibleControlListeners[i];
 listener.getState(event);
 }
 int state = stateToOs(event.detail);
+if ((state & ACC.STATE_CHECKED) !is 0 && grayed) {
+state &= ~ COM.STATE_SYSTEM_CHECKED;
+state |= COM.STATE_SYSTEM_MIXED;
+}
 pvarState.vt = COM.VT_I4;
 pvarState.lVal = state;
 return COM.S_OK;
 }
 osValue = WCHARsToStr((*pszValue)[ 0 .. size ]);
 }
 }
 AccessibleControlEvent event = new AccessibleControlEvent(this);
-event.childID = osToChildID(cast(int)/*64*/v.lVal);
+event.childID = osToChildID(v.lVal);
 event.result = osValue;
 for (int i = 0; i < accessibleControlListeners.length; i++) {
 AccessibleControlListener listener = cast(AccessibleControlListener) accessibleControlListeners[i];
 listener.getValue(event);
 }
 Object nextItem = nextItems[i];
 if (auto val = cast(ValueWrapperInt)nextItem ) {
 int item = val.value;
 rgvar[i].vt = COM.VT_I4;
 rgvar[i].byRef = cast(void*)item;
+COM.MoveMemory(rgvar + i * VARIANT.sizeof + 8, &item, 4);
 } else {
 Accessible accessible = cast(Accessible) nextItem;
 accessible.AddRef();
 rgvar[i].vt = COM.VT_DISPATCH;
 rgvar[i].byRef = cast(void*)accessible.objIAccessible;
 /* If there are no listeners, query the proxy
 * for its IEnumVariant, and tell it to Reset.
 */
 if (accessibleControlListeners.length is 0) {
 IEnumVARIANT ienumvariant;
-int code = cast(int)/*64*/iaccessible.QueryInterface(&COM.IIDIEnumVARIANT, cast(void**)&ienumvariant);
+int code = iaccessible.QueryInterface(&COM.IIDIEnumVARIANT, cast(void**)&ienumvariant);
 if (code !is COM.S_OK) return code;
 code = ienumvariant.Reset();
 ienumvariant.Release();
 return code;
 }
 int code = iaccessible.QueryInterface(&COM.IIDIEnumVARIANT, cast(void**)&ienumvariant);
 if (code !is COM.S_OK) return code;
 IEnumVARIANT[1] pEnum;
 code = ienumvariant.Clone(pEnum.ptr);
 ienumvariant.Release();
-COM.MoveMemory(ppEnum, pEnum.ptr, 4);
+COM.MoveMemory(ppEnum, pEnum.ptr, (void*).sizeof);
 return code;
 }
 if (ppEnum is null) return COM.E_INVALIDARG;
 *ppEnum = objIEnumVARIANT;
 * For backward compatibility, we still take a handle childID for tree
 * items on XP. All other childIDs are 1-based indices.
 */
 if (!(cast(Tree)control )) return childID + 1;
 if (OS.COMCTL32_MAJOR < 6) return childID;
-return cast(int)/*64*/OS.SendMessage (control.handle, OS.TVM_MAPHTREEITEMTOACCID, childID, 0);
+return OS.SendMessage (control.handle, OS.TVM_MAPHTREEITEMTOACCID, childID, 0);
 }
 int osToChildID(int osChildID) {
 if (osChildID is COM.CHILDID_SELF) return ACC.CHILDID_SELF;
 /*
 * For backward compatibility, we still take a handle childID for tree
 * items on XP. All other childIDs are 1-based indices.
 */
 if (!(cast(Tree)control )) return osChildID - 1;
 if (OS.COMCTL32_MAJOR < 6) return osChildID;
-return cast(int)/*64*/OS.SendMessage (control.handle, OS.TVM_MAPACCIDTOHTREEITEM, osChildID, 0);
+return OS.SendMessage (control.handle, OS.TVM_MAPACCIDTOHTREEITEM, osChildID, 0);
 }
 int stateToOs(int state) {
 int osState = 0;
 if ((state & ACC.STATE_SELECTED) !is 0) osState |= COM.STATE_SYSTEM_SELECTED;

Mercurial > projects > dwt-win

comparison dwt/accessibility/Accessible.d @ 213:36f5cb12e1a2