Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixes for dmd 2.061 #11

Merged
merged 1 commit into from Jan 4, 2013
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions src/org/eclipse/swt/accessibility/AccessibleControlEvent.d
Expand Up @@ -60,6 +60,7 @@ public this(Object source) {
*
* @return a string representation of the event
*/
override
public String toString () {
return Format( "AccessibleControlEvent {{childID={} accessible={} x={} y={} width={} heigth={} detail={} result={}}",
childID, accessible, x, y, width, height, detail, result);
Expand Down
1 change: 1 addition & 0 deletions src/org/eclipse/swt/custom/AnimatedProgress.d
Expand Up @@ -91,6 +91,7 @@ public this(Composite parent, int style) {
showBorder = (style & SWT.BORDER) !is 0;

addControlListener(new class() ControlAdapter {
override
public void controlResized(ControlEvent e) {
redraw();
}
Expand Down
16 changes: 16 additions & 0 deletions src/org/eclipse/swt/custom/CCombo.d
Expand Up @@ -899,6 +899,7 @@ public int indexOf (String string, int start) {

void initAccessible() {
AccessibleAdapter accessibleAdapter = new class() AccessibleAdapter {
override
public void getName (AccessibleEvent e) {
String name = null;
Label label = getAssociatedLabel ();
Expand All @@ -907,6 +908,7 @@ void initAccessible() {
}
e.result = name;
}
override
public void getKeyboardShortcut(AccessibleEvent e) {
String shortcut = null;
Label label = getAssociatedLabel ();
Expand All @@ -921,6 +923,7 @@ void initAccessible() {
}
e.result = shortcut;
}
override
public void getHelp (AccessibleEvent e) {
e.result = getToolTipText ();
}
Expand All @@ -930,21 +933,26 @@ void initAccessible() {
list.getAccessible ().addAccessibleListener (accessibleAdapter);

arrow.getAccessible ().addAccessibleListener (new class() AccessibleAdapter {
override
public void getName (AccessibleEvent e) {
e.result = isDropped () ? SWT.getMessage ("SWT_Close") : SWT.getMessage ("SWT_Open"); //$NON-NLS-1$ //$NON-NLS-2$
}
override
public void getKeyboardShortcut (AccessibleEvent e) {
e.result = "Alt+Down Arrow"; //$NON-NLS-1$
}
override
public void getHelp (AccessibleEvent e) {
e.result = getToolTipText ();
}
});

getAccessible().addAccessibleTextListener (new class() AccessibleTextAdapter {
override
public void getCaretOffset (AccessibleTextEvent e) {
e.offset = text.getCaretPosition ();
}
override
public void getSelectionRange(AccessibleTextEvent e) {
Point sel = text.getSelection();
e.offset = sel.x;
Expand All @@ -953,13 +961,15 @@ void initAccessible() {
});

getAccessible().addAccessibleControlListener (new class() AccessibleControlAdapter {
override
public void getChildAtPoint (AccessibleControlEvent e) {
Point testPoint = toControl (e.x, e.y);
if (getBounds ().contains (testPoint)) {
e.childID = ACC.CHILDID_SELF;
}
}

override
public void getLocation (AccessibleControlEvent e) {
Rectangle location = getBounds ();
Point pt = getParent().toDisplay (location.x, location.y);
Expand All @@ -969,30 +979,36 @@ void initAccessible() {
e.height = location.height;
}

override
public void getChildCount (AccessibleControlEvent e) {
e.detail = 0;
}

override
public void getRole (AccessibleControlEvent e) {
e.detail = ACC.ROLE_COMBOBOX;
}

override
public void getState (AccessibleControlEvent e) {
e.detail = ACC.STATE_NORMAL;
}

override
public void getValue (AccessibleControlEvent e) {
e.result = getText ();
}
});

text.getAccessible ().addAccessibleControlListener (new class() AccessibleControlAdapter {
override
public void getRole (AccessibleControlEvent e) {
e.detail = text.getEditable () ? ACC.ROLE_TEXT : ACC.ROLE_LABEL;
}
});

arrow.getAccessible ().addAccessibleControlListener (new class() AccessibleControlAdapter {
override
public void getDefaultAction (AccessibleControlEvent e) {
e.result = isDropped () ? SWT.getMessage ("SWT_Close") : SWT.getMessage ("SWT_Open"); //$NON-NLS-1$ //$NON-NLS-2$
}
Expand Down
8 changes: 8 additions & 0 deletions src/org/eclipse/swt/custom/CLabel.d
Expand Up @@ -295,14 +295,17 @@ public override String getToolTipText () {
private void initAccessible() {
Accessible accessible = getAccessible();
accessible.addAccessibleListener(new class() AccessibleAdapter {
override
public void getName(AccessibleEvent e) {
e.result = getText();
}

override
public void getHelp(AccessibleEvent e) {
e.result = getToolTipText();
}

override
public void getKeyboardShortcut(AccessibleEvent e) {
dchar mnemonic = _findMnemonic(this.outer.text);
if (mnemonic !is '\0') {
Expand All @@ -312,10 +315,12 @@ private void initAccessible() {
});

accessible.addAccessibleControlListener(new class() AccessibleControlAdapter {
override
public void getChildAtPoint(AccessibleControlEvent e) {
e.childID = ACC.CHILDID_SELF;
}

override
public void getLocation(AccessibleControlEvent e) {
Rectangle rect = getDisplay().map(getParent(), null, getBounds());
e.x = rect.x;
Expand All @@ -324,14 +329,17 @@ private void initAccessible() {
e.height = rect.height;
}

override
public void getChildCount(AccessibleControlEvent e) {
e.detail = 0;
}

override
public void getRole(AccessibleControlEvent e) {
e.detail = ACC.ROLE_LABEL;
}

override
public void getState(AccessibleControlEvent e) {
e.detail = ACC.STATE_READONLY;
}
Expand Down
13 changes: 13 additions & 0 deletions src/org/eclipse/swt/custom/CTabFolder.d
Expand Up @@ -1648,6 +1648,7 @@ public int indexOf(CTabItem item) {
void initAccessible() {
Accessible accessible = getAccessible();
accessible.addAccessibleListener(new class() AccessibleAdapter {
override
public void getName(AccessibleEvent e) {
String name = null;
int childID = e.childID;
Expand All @@ -1663,6 +1664,7 @@ void initAccessible() {
e.result = name;
}

override
public void getHelp(AccessibleEvent e) {
String help = null;
int childID = e.childID;
Expand All @@ -1674,6 +1676,7 @@ void initAccessible() {
e.result = help;
}

override
public void getKeyboardShortcut(AccessibleEvent e) {
String shortcut = null;
int childID = e.childID;
Expand All @@ -1691,6 +1694,7 @@ void initAccessible() {
});

accessible.addAccessibleControlListener(new class() AccessibleControlAdapter {
override
public void getChildAtPoint(AccessibleControlEvent e) {
Point testPoint = toControl(e.x, e.y);
int childID = ACC.CHILDID_NONE;
Expand Down Expand Up @@ -1718,6 +1722,7 @@ void initAccessible() {
e.childID = childID;
}

override
public void getLocation(AccessibleControlEvent e) {
Rectangle location = null;
Point pt = null;
Expand Down Expand Up @@ -1747,10 +1752,12 @@ void initAccessible() {
}
}

override
public void getChildCount(AccessibleControlEvent e) {
e.detail = items.length + EXTRA_CHILD_ID_COUNT;
}

override
public void getDefaultAction(AccessibleControlEvent e) {
String action = null;
int childID = e.childID;
Expand All @@ -1763,6 +1770,7 @@ void initAccessible() {
e.result = action;
}

override
public void getFocus(AccessibleControlEvent e) {
int childID = ACC.CHILDID_NONE;
if (isFocusControl()) {
Expand All @@ -1775,6 +1783,7 @@ void initAccessible() {
e.childID = childID;
}

override
public void getRole(AccessibleControlEvent e) {
int role = 0;
int childID = e.childID;
Expand All @@ -1788,10 +1797,12 @@ void initAccessible() {
e.detail = role;
}

override
public void getSelection(AccessibleControlEvent e) {
e.childID = (selectedIndex is -1) ? ACC.CHILDID_NONE : selectedIndex;
}

override
public void getState(AccessibleControlEvent e) {
int state = 0;
int childID = e.childID;
Expand All @@ -1818,6 +1829,7 @@ void initAccessible() {
e.detail = state;
}

override
public void getChildren(AccessibleControlEvent e) {
int childIdCount = items.length + EXTRA_CHILD_ID_COUNT;
Object[] children = new Object[childIdCount];
Expand Down Expand Up @@ -3897,6 +3909,7 @@ void showList (Rectangle rect) {
item.setImage(tab.getImage());
item.setData(id, tab);
item.addSelectionListener(new class() SelectionAdapter {
override
public void widgetSelected(SelectionEvent e) {
MenuItem menuItem = cast(MenuItem)e.widget;
int index = indexOf(cast(CTabItem)menuItem.getData(id));
Expand Down
8 changes: 8 additions & 0 deletions src/org/eclipse/swt/custom/StyledText.d
Expand Up @@ -5651,6 +5651,7 @@ void handleVerticalScroll(Event event) {
void initializeAccessible() {
Accessible accessible = getAccessible();
accessible.addAccessibleListener(new class() AccessibleAdapter {
override
public void getName (AccessibleEvent e) {
String name = null;
Label label = getAssociatedLabel ();
Expand All @@ -5659,9 +5660,11 @@ void initializeAccessible() {
}
e.result = name;
}
override
public void getHelp(AccessibleEvent e) {
e.result = getToolTipText();
}
override
public void getKeyboardShortcut(AccessibleEvent e) {
String shortcut = null;
Label label = getAssociatedLabel ();
Expand All @@ -5678,19 +5681,23 @@ void initializeAccessible() {
}
});
accessible.addAccessibleTextListener(new class() AccessibleTextAdapter {
override
public void getCaretOffset(AccessibleTextEvent e) {
e.offset = this.outer.getCaretOffset();
}
override
public void getSelectionRange(AccessibleTextEvent e) {
Point selection = this.outer.getSelectionRange();
e.offset = selection.x;
e.length = selection.y;
}
});
accessible.addAccessibleControlListener(new class() AccessibleControlAdapter {
override
public void getRole(AccessibleControlEvent e) {
e.detail = ACC.ROLE_TEXT;
}
override
public void getState(AccessibleControlEvent e) {
int state = 0;
if (isEnabled()) state |= ACC.STATE_FOCUSABLE;
Expand All @@ -5699,6 +5706,7 @@ void initializeAccessible() {
if (!getEditable()) state |= ACC.STATE_READONLY;
e.detail = state;
}
override
public void getValue(AccessibleControlEvent e) {
e.result = this.outer.getText();
}
Expand Down
2 changes: 2 additions & 0 deletions src/org/eclipse/swt/custom/TableCursor.d
Expand Up @@ -650,6 +650,7 @@ public int getColumn() {
*
* @return the receiver's background color
*/
override
public Color getBackground() {
checkWidget();
if (background is null) {
Expand All @@ -662,6 +663,7 @@ public Color getBackground() {
*
* @return the receiver's foreground color
*/
override
public Color getForeground() {
checkWidget();
if (foreground is null) {
Expand Down
4 changes: 4 additions & 0 deletions src/org/eclipse/swt/dnd/ByteArrayTransfer.d
Expand Up @@ -129,6 +129,7 @@ import java.lang.all;
*/
public abstract class ByteArrayTransfer : Transfer {

override
public TransferData[] getSupportedTypes() {
int[] types = getTypeIds();
TransferData[] data = new TransferData[types.length];
Expand All @@ -144,6 +145,7 @@ public TransferData[] getSupportedTypes() {
return data;
}

override
public bool isSupportedType(TransferData transferData){
if (transferData is null) return false;
int[] types = getTypeIds();
Expand All @@ -167,6 +169,7 @@ public bool isSupportedType(TransferData transferData){
*
* @see Transfer#nativeToJava
*/
override
protected void javaToNative (Object object, TransferData transferData) {
if (!checkByteArray(object) || !isSupportedType(transferData)) {
DND.error(DND.ERROR_INVALID_DATA);
Expand Down Expand Up @@ -194,6 +197,7 @@ protected void javaToNative (Object object, TransferData transferData) {
*
* @see Transfer#javaToNative
*/
override
protected Object nativeToJava(TransferData transferData) {
if (!isSupportedType(transferData) || transferData.pIDataObject is null) return null;

Expand Down
1 change: 1 addition & 0 deletions src/org/eclipse/swt/dnd/DragSource.d
Expand Up @@ -278,6 +278,7 @@ private void createCOMInterfaces() {
iDataObject = new _IDataObjectImpl(this);
}

override
protected void checkSubclass() {
String name = this.classinfo.name;
String validName = DragSource.classinfo.name;
Expand Down
1 change: 1 addition & 0 deletions src/org/eclipse/swt/dnd/DropTarget.d
Expand Up @@ -247,6 +247,7 @@ ULONG AddRef() {
return refCount;
}

override
protected void checkSubclass () {
String name = this.classinfo.name;
String validName = DropTarget.classinfo.name;
Expand Down