Bug 462633: Enable save actions for annotations
Added missing @Override/@Deprecated in win32
diff --git a/bundles/org.eclipse.swt/Eclipse SWT AWT/win32/org/eclipse/swt/awt/SWT_AWT.java b/bundles/org.eclipse.swt/Eclipse SWT AWT/win32/org/eclipse/swt/awt/SWT_AWT.java
index 70b1dd2..38ab959 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT AWT/win32/org/eclipse/swt/awt/SWT_AWT.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT AWT/win32/org/eclipse/swt/awt/SWT_AWT.java
@@ -371,6 +371,7 @@
final Shell shell = Shell.win32_new (display, handle);
final ComponentListener listener = new ComponentAdapter () {
+ @Override
public void componentResized (ComponentEvent e) {
display.syncExec (new Runnable () {
public void run () {
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Accessibility/win32/org/eclipse/swt/accessibility/Accessible.java b/bundles/org.eclipse.swt/Eclipse SWT Accessibility/win32/org/eclipse/swt/accessibility/Accessible.java
index 9beca8c..4bf6eea 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Accessibility/win32/org/eclipse/swt/accessibility/Accessible.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Accessibility/win32/org/eclipse/swt/accessibility/Accessible.java
@@ -113,6 +113,7 @@
* @since 3.5
* @deprecated
*/
+ @Deprecated
protected Accessible() {
}
@@ -145,33 +146,57 @@
void createIAccessible() {
objIAccessible = new COMObject(new int[] {2,0,0,1,3,5,8,1,1,2,2,2,2,2,2,2,3,2,1,1,2,2,5,3,3,1,2,2}) {
+ @Override
public long /*int*/ method0(long /*int*/[] args) {return QueryInterface(args[0], args[1]);}
+ @Override
public long /*int*/ method1(long /*int*/[] args) {return AddRef();}
+ @Override
public long /*int*/ method2(long /*int*/[] args) {return Release();}
// method3 GetTypeInfoCount - not implemented
// method4 GetTypeInfo - not implemented
// method5 GetIDsOfNames - not implemented
// method6 Invoke - not implemented
+ @Override
public long /*int*/ method7(long /*int*/[] args) {return get_accParent(args[0]);}
+ @Override
public long /*int*/ method8(long /*int*/[] args) {return get_accChildCount(args[0]);}
+ @Override
public long /*int*/ method9(long /*int*/[] args) {return get_accChild(args[0], args[1]);}
+ @Override
public long /*int*/ method10(long /*int*/[] args) {return get_accName(args[0], args[1]);}
+ @Override
public long /*int*/ method11(long /*int*/[] args) {return get_accValue(args[0], args[1]);}
+ @Override
public long /*int*/ method12(long /*int*/[] args) {return get_accDescription(args[0], args[1]);}
+ @Override
public long /*int*/ method13(long /*int*/[] args) {return get_accRole(args[0], args[1]);}
+ @Override
public long /*int*/ method14(long /*int*/[] args) {return get_accState(args[0], args[1]);}
+ @Override
public long /*int*/ method15(long /*int*/[] args) {return get_accHelp(args[0], args[1]);}
+ @Override
public long /*int*/ method16(long /*int*/[] args) {return get_accHelpTopic(args[0], args[1], args[2]);}
+ @Override
public long /*int*/ method17(long /*int*/[] args) {return get_accKeyboardShortcut(args[0], args[1]);}
+ @Override
public long /*int*/ method18(long /*int*/[] args) {return get_accFocus(args[0]);}
+ @Override
public long /*int*/ method19(long /*int*/[] args) {return get_accSelection(args[0]);}
+ @Override
public long /*int*/ method20(long /*int*/[] args) {return get_accDefaultAction(args[0], args[1]);}
+ @Override
public long /*int*/ method21(long /*int*/[] args) {return accSelect((int)/*64*/args[0], args[1]);}
+ @Override
public long /*int*/ method22(long /*int*/[] args) {return accLocation(args[0], args[1], args[2], args[3], args[4]);}
+ @Override
public long /*int*/ method23(long /*int*/[] args) {return accNavigate((int)/*64*/args[0], args[1], args[2]);}
+ @Override
public long /*int*/ method24(long /*int*/[] args) {return accHitTest((int)/*64*/args[0], (int)/*64*/args[1], args[2]);}
+ @Override
public long /*int*/ method25(long /*int*/[] args) {return accDoDefaultAction(args[0]);}
+ @Override
public long /*int*/ method26(long /*int*/[] args) {return put_accName(args[0], args[1]);}
+ @Override
public long /*int*/ method27(long /*int*/[] args) {return put_accValue(args[0], args[1]);}
};
@@ -205,8 +230,11 @@
void createIAccessible2() {
objIAccessible2 = new COMObject(new int[] {2,0,0,/*IA>>*/1,3,5,8,1,1,2,2,2,2,2,2,2,3,2,1,1,2,2,5,3,3,1,2,2,/*<<IA*/1,2,3,1,1,3,3,1,1,1,1,3,3,1,1,1,1,1}) {
+ @Override
public long /*int*/ method0(long /*int*/[] args) {return QueryInterface(args[0], args[1]);}
+ @Override
public long /*int*/ method1(long /*int*/[] args) {return AddRef();}
+ @Override
public long /*int*/ method2(long /*int*/[] args) {return Release();}
/*
@@ -217,46 +245,85 @@
// method4 GetTypeInfo - not implemented
// method5 GetIDsOfNames - not implemented
// method6 Invoke - not implemented
+ @Override
public long /*int*/ method7(long /*int*/[] args) {return get_accParent(args[0]);}
+ @Override
public long /*int*/ method8(long /*int*/[] args) {return get_accChildCount(args[0]);}
+ @Override
public long /*int*/ method9(long /*int*/[] args) {return get_accChild(args[0], args[1]);}
+ @Override
public long /*int*/ method10(long /*int*/[] args) {return get_accName(args[0], args[1]);}
+ @Override
public long /*int*/ method11(long /*int*/[] args) {return get_accValue(args[0], args[1]);}
+ @Override
public long /*int*/ method12(long /*int*/[] args) {return get_accDescription(args[0], args[1]);}
+ @Override
public long /*int*/ method13(long /*int*/[] args) {return get_accRole(args[0], args[1]);}
+ @Override
public long /*int*/ method14(long /*int*/[] args) {return get_accState(args[0], args[1]);}
+ @Override
public long /*int*/ method15(long /*int*/[] args) {return get_accHelp(args[0], args[1]);}
+ @Override
public long /*int*/ method16(long /*int*/[] args) {return get_accHelpTopic(args[0], args[1], args[2]);}
+ @Override
public long /*int*/ method17(long /*int*/[] args) {return get_accKeyboardShortcut(args[0], args[1]);}
+ @Override
public long /*int*/ method18(long /*int*/[] args) {return get_accFocus(args[0]);}
+ @Override
public long /*int*/ method19(long /*int*/[] args) {return get_accSelection(args[0]);}
+ @Override
public long /*int*/ method20(long /*int*/[] args) {return get_accDefaultAction(args[0], args[1]);}
+ @Override
public long /*int*/ method21(long /*int*/[] args) {return accSelect((int)/*64*/args[0], args[1]);}
+ @Override
public long /*int*/ method22(long /*int*/[] args) {return accLocation(args[0], args[1], args[2], args[3], args[4]);}
+ @Override
public long /*int*/ method23(long /*int*/[] args) {return accNavigate((int)/*64*/args[0], args[1], args[2]);}
+ @Override
public long /*int*/ method24(long /*int*/[] args) {return accHitTest((int)/*64*/args[0], (int)/*64*/args[1], args[2]);}
+ @Override
public long /*int*/ method25(long /*int*/[] args) {return accDoDefaultAction(args[0]);}
+ @Override
public long /*int*/ method26(long /*int*/[] args) {return put_accName(args[0], args[1]);}
+ @Override
public long /*int*/ method27(long /*int*/[] args) {return put_accValue(args[0], args[1]);}
// IAccessible2 methods
+ @Override
public long /*int*/ method28(long /*int*/[] args) {return get_nRelations(args[0]);}
+ @Override
public long /*int*/ method29(long /*int*/[] args) {return get_relation((int)/*64*/args[0], args[1]);}
+ @Override
public long /*int*/ method30(long /*int*/[] args) {return get_relations((int)/*64*/args[0], args[1], args[2]);}
+ @Override
public long /*int*/ method31(long /*int*/[] args) {return get_role(args[0]);}
+ @Override
public long /*int*/ method32(long /*int*/[] args) {return scrollTo((int)/*64*/args[0]);}
+ @Override
public long /*int*/ method33(long /*int*/[] args) {return scrollToPoint((int)/*64*/args[0], (int)/*64*/args[1], (int)/*64*/args[2]);}
+ @Override
public long /*int*/ method34(long /*int*/[] args) {return get_groupPosition(args[0], args[1], args[2]);}
+ @Override
public long /*int*/ method35(long /*int*/[] args) {return get_states(args[0]);}
+ @Override
public long /*int*/ method36(long /*int*/[] args) {return get_extendedRole(args[0]);}
+ @Override
public long /*int*/ method37(long /*int*/[] args) {return get_localizedExtendedRole(args[0]);}
+ @Override
public long /*int*/ method38(long /*int*/[] args) {return get_nExtendedStates(args[0]);}
+ @Override
public long /*int*/ method39(long /*int*/[] args) {return get_extendedStates((int)/*64*/args[0], args[1], args[2]);}
+ @Override
public long /*int*/ method40(long /*int*/[] args) {return get_localizedExtendedStates((int)/*64*/args[0], args[1], args[2]);}
+ @Override
public long /*int*/ method41(long /*int*/[] args) {return get_uniqueID(args[0]);}
+ @Override
public long /*int*/ method42(long /*int*/[] args) {return get_windowHandle(args[0]);}
+ @Override
public long /*int*/ method43(long /*int*/[] args) {return get_indexInParent(args[0]);}
+ @Override
public long /*int*/ method44(long /*int*/[] args) {return get_locale(args[0]);}
+ @Override
public long /*int*/ method45(long /*int*/[] args) {return get_attributes(args[0]);}
};
@@ -290,26 +357,42 @@
void createIAccessibleAction() {
objIAccessibleAction = new COMObject(new int[] {2,0,0,1,1,2,4,2,2}) {
+ @Override
public long /*int*/ method0(long /*int*/[] args) {return QueryInterface(args[0], args[1]);}
+ @Override
public long /*int*/ method1(long /*int*/[] args) {return AddRef();}
+ @Override
public long /*int*/ method2(long /*int*/[] args) {return Release();}
+ @Override
public long /*int*/ method3(long /*int*/[] args) {return get_nActions(args[0]);}
+ @Override
public long /*int*/ method4(long /*int*/[] args) {return doAction((int)/*64*/args[0]);}
+ @Override
public long /*int*/ method5(long /*int*/[] args) {return get_description((int)/*64*/args[0], args[1]);}
+ @Override
public long /*int*/ method6(long /*int*/[] args) {return get_keyBinding((int)/*64*/args[0], (int)/*64*/args[1], args[2], args[3]);}
+ @Override
public long /*int*/ method7(long /*int*/[] args) {return get_name((int)/*64*/args[0], args[1]);}
+ @Override
public long /*int*/ method8(long /*int*/[] args) {return get_localizedName((int)/*64*/args[0], args[1]);}
};
}
void createIAccessibleApplication() {
objIAccessibleApplication = new COMObject(new int[] {2,0,0,1,1,1,1}) {
+ @Override
public long /*int*/ method0(long /*int*/[] args) {return QueryInterface(args[0], args[1]);}
+ @Override
public long /*int*/ method1(long /*int*/[] args) {return AddRef();}
+ @Override
public long /*int*/ method2(long /*int*/[] args) {return Release();}
+ @Override
public long /*int*/ method3(long /*int*/[] args) {return get_appName(args[0]);}
+ @Override
public long /*int*/ method4(long /*int*/[] args) {return get_appVersion(args[0]);}
+ @Override
public long /*int*/ method5(long /*int*/[] args) {return get_toolkitName(args[0]);}
+ @Override
public long /*int*/ method6(long /*int*/[] args) {return get_toolkitVersion(args[0]);}
};
}
@@ -328,68 +411,117 @@
void createIAccessibleEditableText() {
objIAccessibleEditableText = new COMObject(new int[] {2,0,0,2,2,2,2,1,3,3}) {
+ @Override
public long /*int*/ method0(long /*int*/[] args) {return QueryInterface(args[0], args[1]);}
+ @Override
public long /*int*/ method1(long /*int*/[] args) {return AddRef();}
+ @Override
public long /*int*/ method2(long /*int*/[] args) {return Release();}
+ @Override
public long /*int*/ method3(long /*int*/[] args) {return copyText((int)/*64*/args[0], (int)/*64*/args[1]);}
+ @Override
public long /*int*/ method4(long /*int*/[] args) {return deleteText((int)/*64*/args[0], (int)/*64*/args[1]);}
+ @Override
public long /*int*/ method5(long /*int*/[] args) {return insertText((int)/*64*/args[0], args[1]);}
+ @Override
public long /*int*/ method6(long /*int*/[] args) {return cutText((int)/*64*/args[0], (int)/*64*/args[1]);}
+ @Override
public long /*int*/ method7(long /*int*/[] args) {return pasteText((int)/*64*/args[0]);}
+ @Override
public long /*int*/ method8(long /*int*/[] args) {return replaceText((int)/*64*/args[0], (int)/*64*/args[1], args[2]);}
+ @Override
public long /*int*/ method9(long /*int*/[] args) {return setAttributes((int)/*64*/args[0], (int)/*64*/args[1], args[2]);}
};
}
void createIAccessibleHyperlink() {
objIAccessibleHyperlink = new COMObject(new int[] {2,0,0,/*IAA>>*/1,1,2,4,2,2,/*<<IAA*/2,2,1,1,1}) {
+ @Override
public long /*int*/ method0(long /*int*/[] args) {return QueryInterface(args[0], args[1]);}
+ @Override
public long /*int*/ method1(long /*int*/[] args) {return AddRef();}
+ @Override
public long /*int*/ method2(long /*int*/[] args) {return Release();}
// IAccessibleAction
+ @Override
public long /*int*/ method3(long /*int*/[] args) {return get_nActions(args[0]);}
+ @Override
public long /*int*/ method4(long /*int*/[] args) {return doAction((int)/*64*/args[0]);}
+ @Override
public long /*int*/ method5(long /*int*/[] args) {return get_description((int)/*64*/args[0], args[1]);}
+ @Override
public long /*int*/ method6(long /*int*/[] args) {return get_keyBinding((int)/*64*/args[0], (int)/*64*/args[1], args[2], args[3]);}
+ @Override
public long /*int*/ method7(long /*int*/[] args) {return get_name((int)/*64*/args[0], args[1]);}
+ @Override
public long /*int*/ method8(long /*int*/[] args) {return get_localizedName((int)/*64*/args[0], args[1]);}
// IAccessibleHyperlink
+ @Override
public long /*int*/ method9(long /*int*/[] args) {return get_anchor((int)/*64*/args[0], args[1]);}
+ @Override
public long /*int*/ method10(long /*int*/[] args) {return get_anchorTarget((int)/*64*/args[0], args[1]);}
+ @Override
public long /*int*/ method11(long /*int*/[] args) {return get_startIndex(args[0]);}
+ @Override
public long /*int*/ method12(long /*int*/[] args) {return get_endIndex(args[0]);}
+ @Override
public long /*int*/ method13(long /*int*/[] args) {return get_valid(args[0]);}
};
}
void createIAccessibleHypertext() {
objIAccessibleHypertext = new COMObject(new int[] {2,0,0,/*IAT>>*/2,4,1,6,1,4,3,3,5,5,5,1,1,3,1,3,5,1,1,/*<<IAT*/1,2,2}) {
+ @Override
public long /*int*/ method0(long /*int*/[] args) {return QueryInterface(args[0], args[1]);}
+ @Override
public long /*int*/ method1(long /*int*/[] args) {return AddRef();}
+ @Override
public long /*int*/ method2(long /*int*/[] args) {return Release();}
// IAccessibleText
+ @Override
public long /*int*/ method3(long /*int*/[] args) {return addSelection((int)/*64*/args[0], (int)/*64*/args[1]);}
+ @Override
public long /*int*/ method4(long /*int*/[] args) {return get_attributes((int)/*64*/args[0], args[1], args[2], args[3]);}
+ @Override
public long /*int*/ method5(long /*int*/[] args) {return get_caretOffset(args[0]);}
+ @Override
public long /*int*/ method6(long /*int*/[] args) {return get_characterExtents((int)/*64*/args[0], (int)/*64*/args[1], args[2], args[3], args[4], args[5]);}
+ @Override
public long /*int*/ method7(long /*int*/[] args) {return get_nSelections(args[0]);}
+ @Override
public long /*int*/ method8(long /*int*/[] args) {return get_offsetAtPoint((int)/*64*/args[0], (int)/*64*/args[1], (int)/*64*/args[2], args[3]);}
+ @Override
public long /*int*/ method9(long /*int*/[] args) {return get_selection((int)/*64*/args[0], args[1], args[2]);}
+ @Override
public long /*int*/ method10(long /*int*/[] args) {return get_text((int)/*64*/args[0], (int)/*64*/args[1], args[2]);}
+ @Override
public long /*int*/ method11(long /*int*/[] args) {return get_textBeforeOffset((int)/*64*/args[0], (int)/*64*/args[1], args[2], args[3], args[4]);}
+ @Override
public long /*int*/ method12(long /*int*/[] args) {return get_textAfterOffset((int)/*64*/args[0], (int)/*64*/args[1], args[2], args[3], args[4]);}
+ @Override
public long /*int*/ method13(long /*int*/[] args) {return get_textAtOffset((int)/*64*/args[0], (int)/*64*/args[1], args[2], args[3], args[4]);}
+ @Override
public long /*int*/ method14(long /*int*/[] args) {return removeSelection((int)/*64*/args[0]);}
+ @Override
public long /*int*/ method15(long /*int*/[] args) {return setCaretOffset((int)/*64*/args[0]);}
+ @Override
public long /*int*/ method16(long /*int*/[] args) {return setSelection((int)/*64*/args[0], (int)/*64*/args[1], (int)/*64*/args[2]);}
+ @Override
public long /*int*/ method17(long /*int*/[] args) {return get_nCharacters(args[0]);}
+ @Override
public long /*int*/ method18(long /*int*/[] args) {return scrollSubstringTo((int)/*64*/args[0], (int)/*64*/args[1], (int)/*64*/args[2]);}
+ @Override
public long /*int*/ method19(long /*int*/[] args) {return scrollSubstringToPoint((int)/*64*/args[0], (int)/*64*/args[1], (int)/*64*/args[2], (int)/*64*/args[3], (int)/*64*/args[4]);}
+ @Override
public long /*int*/ method20(long /*int*/[] args) {return get_newText(args[0]);}
+ @Override
public long /*int*/ method21(long /*int*/[] args) {return get_oldText(args[0]);}
// IAccessibleHypertext
+ @Override
public long /*int*/ method22(long /*int*/[] args) {return get_nHyperlinks(args[0]);}
+ @Override
public long /*int*/ method23(long /*int*/[] args) {return get_hyperlink((int)/*64*/args[0], args[1]);}
+ @Override
public long /*int*/ method24(long /*int*/[] args) {return get_hyperlinkIndex((int)/*64*/args[0], args[1]);}
};
}
@@ -408,84 +540,148 @@
void createIAccessibleTable2() {
objIAccessibleTable2 = new COMObject(new int[] {2,0,0,3,1,2,1,1,1,1,1,2,2,2,2,1,2,2,1,1,1,1,1}) {
+ @Override
public long /*int*/ method0(long /*int*/[] args) {return QueryInterface(args[0], args[1]);}
+ @Override
public long /*int*/ method1(long /*int*/[] args) {return AddRef();}
+ @Override
public long /*int*/ method2(long /*int*/[] args) {return Release();}
+ @Override
public long /*int*/ method3(long /*int*/[] args) {return get_cellAt((int)/*64*/args[0], (int)/*64*/args[1], args[2]);}
+ @Override
public long /*int*/ method4(long /*int*/[] args) {return get_caption(args[0]);}
+ @Override
public long /*int*/ method5(long /*int*/[] args) {return get_columnDescription((int)/*64*/args[0], args[1]);}
+ @Override
public long /*int*/ method6(long /*int*/[] args) {return get_nColumns(args[0]);}
+ @Override
public long /*int*/ method7(long /*int*/[] args) {return get_nRows(args[0]);}
+ @Override
public long /*int*/ method8(long /*int*/[] args) {return get_nSelectedCells(args[0]);}
+ @Override
public long /*int*/ method9(long /*int*/[] args) {return get_nSelectedColumns(args[0]);}
+ @Override
public long /*int*/ method10(long /*int*/[] args) {return get_nSelectedRows(args[0]);}
+ @Override
public long /*int*/ method11(long /*int*/[] args) {return get_rowDescription((int)/*64*/args[0], args[1]);}
+ @Override
public long /*int*/ method12(long /*int*/[] args) {return get_selectedCells(args[0], args[1]);}
+ @Override
public long /*int*/ method13(long /*int*/[] args) {return get_selectedColumns(args[0], args[1]);}
+ @Override
public long /*int*/ method14(long /*int*/[] args) {return get_selectedRows(args[0], args[1]);}
+ @Override
public long /*int*/ method15(long /*int*/[] args) {return get_summary(args[0]);}
+ @Override
public long /*int*/ method16(long /*int*/[] args) {return get_isColumnSelected((int)/*64*/args[0], args[1]);}
+ @Override
public long /*int*/ method17(long /*int*/[] args) {return get_isRowSelected((int)/*64*/args[0], args[1]);}
+ @Override
public long /*int*/ method18(long /*int*/[] args) {return selectRow((int)/*64*/args[0]);}
+ @Override
public long /*int*/ method19(long /*int*/[] args) {return selectColumn((int)/*64*/args[0]);}
+ @Override
public long /*int*/ method20(long /*int*/[] args) {return unselectRow((int)/*64*/args[0]);}
+ @Override
public long /*int*/ method21(long /*int*/[] args) {return unselectColumn((int)/*64*/args[0]);}
+ @Override
public long /*int*/ method22(long /*int*/[] args) {return get_modelChange(args[0]);}
};
}
void createIAccessibleTableCell() {
objIAccessibleTableCell = new COMObject(new int[] {2,0,0,1,2,1,1,2,1,1,5,1}) {
+ @Override
public long /*int*/ method0(long /*int*/[] args) {return QueryInterface(args[0], args[1]);}
+ @Override
public long /*int*/ method1(long /*int*/[] args) {return AddRef();}
+ @Override
public long /*int*/ method2(long /*int*/[] args) {return Release();}
+ @Override
public long /*int*/ method3(long /*int*/[] args) {return get_columnExtent(args[0]);}
+ @Override
public long /*int*/ method4(long /*int*/[] args) {return get_columnHeaderCells(args[0], args[1]);}
+ @Override
public long /*int*/ method5(long /*int*/[] args) {return get_columnIndex(args[0]);}
+ @Override
public long /*int*/ method6(long /*int*/[] args) {return get_rowExtent(args[0]);}
+ @Override
public long /*int*/ method7(long /*int*/[] args) {return get_rowHeaderCells(args[0], args[1]);}
+ @Override
public long /*int*/ method8(long /*int*/[] args) {return get_rowIndex(args[0]);}
+ @Override
public long /*int*/ method9(long /*int*/[] args) {return get_isSelected(args[0]);}
+ @Override
public long /*int*/ method10(long /*int*/[] args) {return get_rowColumnExtents(args[0], args[1], args[2], args[3], args[4]);}
+ @Override
public long /*int*/ method11(long /*int*/[] args) {return get_table(args[0]);}
};
}
void createIAccessibleText() {
objIAccessibleText = new COMObject(new int[] {2,0,0,2,4,1,6,1,4,3,3,5,5,5,1,1,3,1,3,5,1,1}) {
+ @Override
public long /*int*/ method0(long /*int*/[] args) {return QueryInterface(args[0], args[1]);}
+ @Override
public long /*int*/ method1(long /*int*/[] args) {return AddRef();}
+ @Override
public long /*int*/ method2(long /*int*/[] args) {return Release();}
+ @Override
public long /*int*/ method3(long /*int*/[] args) {return addSelection((int)/*64*/args[0], (int)/*64*/args[1]);}
+ @Override
public long /*int*/ method4(long /*int*/[] args) {return get_attributes((int)/*64*/args[0], args[1], args[2], args[3]);}
+ @Override
public long /*int*/ method5(long /*int*/[] args) {return get_caretOffset(args[0]);}
+ @Override
public long /*int*/ method6(long /*int*/[] args) {return get_characterExtents((int)/*64*/args[0], (int)/*64*/args[1], args[2], args[3], args[4], args[5]);}
+ @Override
public long /*int*/ method7(long /*int*/[] args) {return get_nSelections(args[0]);}
+ @Override
public long /*int*/ method8(long /*int*/[] args) {return get_offsetAtPoint((int)/*64*/args[0], (int)/*64*/args[1], (int)/*64*/args[2], args[3]);}
+ @Override
public long /*int*/ method9(long /*int*/[] args) {return get_selection((int)/*64*/args[0], args[1], args[2]);}
+ @Override
public long /*int*/ method10(long /*int*/[] args) {return get_text((int)/*64*/args[0], (int)/*64*/args[1], args[2]);}
+ @Override
public long /*int*/ method11(long /*int*/[] args) {return get_textBeforeOffset((int)/*64*/args[0], (int)/*64*/args[1], args[2], args[3], args[4]);}
+ @Override
public long /*int*/ method12(long /*int*/[] args) {return get_textAfterOffset((int)/*64*/args[0], (int)/*64*/args[1], args[2], args[3], args[4]);}
+ @Override
public long /*int*/ method13(long /*int*/[] args) {return get_textAtOffset((int)/*64*/args[0], (int)/*64*/args[1], args[2], args[3], args[4]);}
+ @Override
public long /*int*/ method14(long /*int*/[] args) {return removeSelection((int)/*64*/args[0]);}
+ @Override
public long /*int*/ method15(long /*int*/[] args) {return setCaretOffset((int)/*64*/args[0]);}
+ @Override
public long /*int*/ method16(long /*int*/[] args) {return setSelection((int)/*64*/args[0], (int)/*64*/args[1], (int)/*64*/args[2]);}
+ @Override
public long /*int*/ method17(long /*int*/[] args) {return get_nCharacters(args[0]);}
+ @Override
public long /*int*/ method18(long /*int*/[] args) {return scrollSubstringTo((int)/*64*/args[0], (int)/*64*/args[1], (int)/*64*/args[2]);}
+ @Override
public long /*int*/ method19(long /*int*/[] args) {return scrollSubstringToPoint((int)/*64*/args[0], (int)/*64*/args[1], (int)/*64*/args[2], (int)/*64*/args[3], (int)/*64*/args[4]);}
+ @Override
public long /*int*/ method20(long /*int*/[] args) {return get_newText(args[0]);}
+ @Override
public long /*int*/ method21(long /*int*/[] args) {return get_oldText(args[0]);}
};
}
void createIAccessibleValue() {
objIAccessibleValue = new COMObject(new int[] {2,0,0,1,1,1,1}) {
+ @Override
public long /*int*/ method0(long /*int*/[] args) {return QueryInterface(args[0], args[1]);}
+ @Override
public long /*int*/ method1(long /*int*/[] args) {return AddRef();}
+ @Override
public long /*int*/ method2(long /*int*/[] args) {return Release();}
+ @Override
public long /*int*/ method3(long /*int*/[] args) {return get_currentValue(args[0]);}
+ @Override
public long /*int*/ method4(long /*int*/[] args) {return setCurrentValue(args[0]);}
+ @Override
public long /*int*/ method5(long /*int*/[] args) {return get_maximumValue(args[0]);}
+ @Override
public long /*int*/ method6(long /*int*/[] args) {return get_minimumValue(args[0]);}
};
/* Dereference VARIANT struct parameters. */
@@ -500,22 +696,33 @@
void createIEnumVARIANT() {
objIEnumVARIANT = new COMObject(new int[] {2,0,0,3,1,0,1}) {
+ @Override
public long /*int*/ method0(long /*int*/[] args) {return QueryInterface(args[0], args[1]);}
+ @Override
public long /*int*/ method1(long /*int*/[] args) {return AddRef();}
+ @Override
public long /*int*/ method2(long /*int*/[] args) {return Release();}
+ @Override
public long /*int*/ method3(long /*int*/[] args) {return Next((int)/*64*/args[0], args[1], args[2]);}
+ @Override
public long /*int*/ method4(long /*int*/[] args) {return Skip((int)/*64*/args[0]);}
+ @Override
public long /*int*/ method5(long /*int*/[] args) {return Reset();}
+ @Override
public long /*int*/ method6(long /*int*/[] args) {return Clone(args[0]);}
};
}
void createIServiceProvider() {
objIServiceProvider = new COMObject(new int[] {2,0,0,3}) {
- public long /*int*/ method0(long /*int*/[] args) {return QueryInterface(args[0], args[1]);}
- public long /*int*/ method1(long /*int*/[] args) {return AddRef();}
- public long /*int*/ method2(long /*int*/[] args) {return Release();}
- public long /*int*/ method3(long /*int*/[] args) {return QueryService(args[0], args[1], args[2]);}
+ @Override
+ public long /*int*/ method0(long /*int*/[] args) {return QueryInterface(args[0], args[1]);}
+ @Override
+ public long /*int*/ method1(long /*int*/[] args) {return AddRef();}
+ @Override
+ public long /*int*/ method2(long /*int*/[] args) {return Release();}
+ @Override
+ public long /*int*/ method3(long /*int*/[] args) {return QueryService(args[0], args[1], args[2]);}
};
}
@@ -2148,6 +2355,7 @@
});
}
osAccessible.addAccessibleListener(new AccessibleAdapter() {
+ @Override
public void getName(AccessibleEvent e) {
if (e.childID == ACC.CHILDID_SELF) {
AccessibleEvent event = new AccessibleEvent(Accessible.this);
@@ -5574,6 +5782,7 @@
}
return null;
}
+ @Override
public String toString () {
String toString = super.toString();
if (DEBUG) {
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Accessibility/win32/org/eclipse/swt/accessibility/Relation.java b/bundles/org.eclipse.swt/Eclipse SWT Accessibility/win32/org/eclipse/swt/accessibility/Relation.java
index d3b772a..58da52b 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Accessibility/win32/org/eclipse/swt/accessibility/Relation.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Accessibility/win32/org/eclipse/swt/accessibility/Relation.java
@@ -70,13 +70,21 @@
void createIAccessibleRelation() {
objIAccessibleRelation = new COMObject(new int[] {2,0,0,1,1,1,2,3}) {
+ @Override
public long /*int*/ method0(long /*int*/[] args) {return QueryInterface(args[0], args[1]);}
+ @Override
public long /*int*/ method1(long /*int*/[] args) {return AddRef();}
+ @Override
public long /*int*/ method2(long /*int*/[] args) {return Release();}
+ @Override
public long /*int*/ method3(long /*int*/[] args) {return get_relationType(args[0]);}
+ @Override
public long /*int*/ method4(long /*int*/[] args) {return get_localizedRelationType(args[0]);}
+ @Override
public long /*int*/ method5(long /*int*/[] args) {return get_nTargets(args[0]);}
+ @Override
public long /*int*/ method6(long /*int*/[] args) {return get_target((int)/*64*/args[0], args[1]);}
+ @Override
public long /*int*/ method7(long /*int*/[] args) {return get_targets((int)/*64*/args[0], args[1], args[2]);}
};
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Browser/win32/org/eclipse/swt/browser/IE.java b/bundles/org.eclipse.swt/Eclipse SWT Browser/win32/org/eclipse/swt/browser/IE.java
index e24798e..36f6e4d 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Browser/win32/org/eclipse/swt/browser/IE.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Browser/win32/org/eclipse/swt/browser/IE.java
@@ -267,6 +267,7 @@
NativePendingCookies = null;
}
+@Override
public void create(Composite parent, int style) {
this.style = style;
frame = new OleFrame(browser, SWT.NONE);
@@ -1081,6 +1082,7 @@
variant.dispose();
}
+@Override
public boolean back() {
if (!back) return false;
int[] rgdispid = auto.getIDsOfNames(new String[] { "GoBack" }); //$NON-NLS-1$
@@ -1088,6 +1090,7 @@
return pVarResult != null && pVarResult.getType() == OLE.VT_EMPTY;
}
+@Override
public boolean close() {
boolean result = true;
int[] rgdispid = auto.getIDsOfNames(new String[] {PROPERTY_DOCUMENT});
@@ -1168,6 +1171,7 @@
return new Variant(pVariant, (short)(OLE.VT_BYREF | OLE.VT_VARIANT));
}
+@Override
public boolean execute(String script) {
/*
* Issue with IE: If the browser has not shown any content yet then
@@ -1225,6 +1229,7 @@
return true;
}
+@Override
public boolean forward() {
if (!forward) return false;
int[] rgdispid = auto.getIDsOfNames(new String[] { "GoForward" }); //$NON-NLS-1$
@@ -1232,14 +1237,17 @@
return pVarResult != null && pVarResult.getType() == OLE.VT_EMPTY;
}
+@Override
public String getBrowserType () {
return "ie"; //$NON-NLS-1$
}
+@Override
String getDeleteFunctionString (String functionName) {
return "window." + functionName + "=undefined"; //$NON-NLS-1$ //$NON-NLS-2$
}
+@Override
public String getText() {
/* get the document object */
int[] rgdispid = auto.getIDsOfNames(new String[] {PROPERTY_DOCUMENT});
@@ -1281,6 +1289,7 @@
return result;
}
+@Override
public String getUrl() {
/*
* If the url is "" then return ABOUT_BLANK in order to be consistent
@@ -1300,14 +1309,17 @@
return result;
}
+@Override
public boolean isBackEnabled() {
return back;
}
+@Override
public boolean isForwardEnabled() {
return forward;
}
+@Override
public boolean isFocusControl () {
return site.isFocusControl() || frame.isFocusControl();
}
@@ -1366,6 +1378,7 @@
return result;
}
+@Override
public void refresh() {
uncRedirect = null;
@@ -1440,6 +1453,7 @@
}
}
+@Override
public boolean setText(final String html, boolean trusted) {
/*
* If the browser is navigating to about:blank in response to its first
@@ -1520,6 +1534,7 @@
return result;
}
+@Override
public boolean setUrl(String url, String postData, String headers[]) {
html = uncRedirect = null;
@@ -1550,6 +1565,7 @@
return navigate(url, postData, headers, false);
}
+@Override
public void stop() {
/*
* If the browser has not completed its initial navigate to about:blank
@@ -1580,6 +1596,7 @@
auto.invoke(rgdispid[0]);
}
+@Override
boolean translateMnemonics () {
return false;
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Browser/win32/org/eclipse/swt/browser/WebSite.java b/bundles/org.eclipse.swt/Eclipse SWT Browser/win32/org/eclipse/swt/browser/WebSite.java
index 1d62afe..7cfb228 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Browser/win32/org/eclipse/swt/browser/WebSite.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Browser/win32/org/eclipse/swt/browser/WebSite.java
@@ -39,33 +39,57 @@
super(parent, style, progId);
}
+@Override
protected void createCOMInterfaces () {
super.createCOMInterfaces();
iDocHostUIHandler = new COMObject(new int[]{2, 0, 0, 4, 1, 5, 0, 0, 1, 1, 1, 3, 3, 2, 2, 1, 3, 2}){
+ @Override
public long /*int*/ method0(long /*int*/[] args) {return QueryInterface(args[0], args[1]);}
+ @Override
public long /*int*/ method1(long /*int*/[] args) {return AddRef();}
+ @Override
public long /*int*/ method2(long /*int*/[] args) {return Release();}
+ @Override
public long /*int*/ method3(long /*int*/[] args) {return ShowContextMenu((int)/*64*/args[0], args[1], args[2], args[3]);}
+ @Override
public long /*int*/ method4(long /*int*/[] args) {return GetHostInfo(args[0]);}
+ @Override
public long /*int*/ method5(long /*int*/[] args) {return ShowUI((int)/*64*/args[0], args[1], args[2], args[3], args[4]);}
+ @Override
public long /*int*/ method6(long /*int*/[] args) {return HideUI();}
+ @Override
public long /*int*/ method7(long /*int*/[] args) {return UpdateUI();}
+ @Override
public long /*int*/ method8(long /*int*/[] args) {return EnableModeless((int)/*64*/args[0]);}
+ @Override
public long /*int*/ method9(long /*int*/[] args) {return OnDocWindowActivate((int)/*64*/args[0]);}
+ @Override
public long /*int*/ method10(long /*int*/[] args) {return OnFrameWindowActivate((int)/*64*/args[0]);}
+ @Override
public long /*int*/ method11(long /*int*/[] args) {return ResizeBorder(args[0], args[1], (int)/*64*/args[2]);}
+ @Override
public long /*int*/ method12(long /*int*/[] args) {return TranslateAccelerator(args[0], args[1], (int)/*64*/args[2]);}
+ @Override
public long /*int*/ method13(long /*int*/[] args) {return GetOptionKeyPath(args[0], (int)/*64*/args[1]);}
+ @Override
public long /*int*/ method14(long /*int*/[] args) {return GetDropTarget(args[0], args[1]);}
+ @Override
public long /*int*/ method15(long /*int*/[] args) {return GetExternal(args[0]);}
+ @Override
public long /*int*/ method16(long /*int*/[] args) {return TranslateUrl((int)/*64*/args[0], args[1], args[2]);}
+ @Override
public long /*int*/ method17(long /*int*/[] args) {return FilterDataObject(args[0], args[1]);}
};
iDocHostShowUI = new COMObject(new int[]{2, 0, 0, 7, C.PTR_SIZEOF == 4 ? 7 : 6}){
+ @Override
public long /*int*/ method0(long /*int*/[] args) {return QueryInterface(args[0], args[1]);}
+ @Override
public long /*int*/ method1(long /*int*/[] args) {return AddRef();}
+ @Override
public long /*int*/ method2(long /*int*/[] args) {return Release();}
+ @Override
public long /*int*/ method3(long /*int*/[] args) {return ShowMessage(args[0], args[1], args[2], (int)/*64*/args[3], args[4], (int)/*64*/args[5], args[6]);}
+ @Override
public long /*int*/ method4(long /*int*/[] args) {
if (args.length == 7) {
return ShowHelp(args[0], args[1], (int)/*64*/args[2], (int)/*64*/args[3], (int)/*64*/args[4], (int)/*64*/args[5], args[6]);
@@ -75,38 +99,63 @@
}
};
iServiceProvider = new COMObject(new int[]{2, 0, 0, 3}){
+ @Override
public long /*int*/ method0(long /*int*/[] args) {return QueryInterface(args[0], args[1]);}
+ @Override
public long /*int*/ method1(long /*int*/[] args) {return AddRef();}
+ @Override
public long /*int*/ method2(long /*int*/[] args) {return Release();}
+ @Override
public long /*int*/ method3(long /*int*/[] args) {return QueryService(args[0], args[1], args[2]);}
};
iInternetSecurityManager = new COMObject(new int[]{2, 0, 0, 1, 1, 3, 4, 8, 7, 3, 3}){
+ @Override
public long /*int*/ method0(long /*int*/[] args) {return QueryInterface(args[0], args[1]);}
+ @Override
public long /*int*/ method1(long /*int*/[] args) {return AddRef();}
+ @Override
public long /*int*/ method2(long /*int*/[] args) {return Release();}
+ @Override
public long /*int*/ method3(long /*int*/[] args) {return SetSecuritySite(args[0]);}
+ @Override
public long /*int*/ method4(long /*int*/[] args) {return GetSecuritySite(args[0]);}
+ @Override
public long /*int*/ method5(long /*int*/[] args) {return MapUrlToZone(args[0], args[1], (int)/*64*/args[2]);}
+ @Override
public long /*int*/ method6(long /*int*/[] args) {return GetSecurityId(args[0], args[1], args[2], args[3]);}
+ @Override
public long /*int*/ method7(long /*int*/[] args) {return ProcessUrlAction(args[0], (int)/*64*/args[1], args[2], (int)/*64*/args[3], args[4], (int)/*64*/args[5], (int)/*64*/args[6], (int)/*64*/args[7]);}
+ @Override
public long /*int*/ method8(long /*int*/[] args) {return QueryCustomPolicy(args[0], args[1], args[2], args[3], args[4], (int)/*64*/args[5], (int)/*64*/args[6]);}
+ @Override
public long /*int*/ method9(long /*int*/[] args) {return SetZoneMapping((int)/*64*/args[0], args[1], (int)/*64*/args[2]);}
+ @Override
public long /*int*/ method10(long /*int*/[] args) {return GetZoneMappings((int)/*64*/args[0], args[1], (int)/*64*/args[2]);}
};
iOleCommandTarget = new COMObject(new int[]{2, 0, 0, 4, 5}) {
+ @Override
public long /*int*/ method0(long /*int*/[] args) {return QueryInterface(args[0], args[1]);}
+ @Override
public long /*int*/ method1(long /*int*/[] args) {return AddRef();}
+ @Override
public long /*int*/ method2(long /*int*/[] args) {return Release();}
+ @Override
public long /*int*/ method3(long /*int*/[] args) {return QueryStatus(args[0], (int)/*64*/args[1], args[2], args[3]);}
+ @Override
public long /*int*/ method4(long /*int*/[] args) {return Exec(args[0], (int)/*64*/args[1], (int)/*64*/args[2], args[3], args[4]);}
};
iAuthenticate = new COMObject(new int[]{2, 0, 0, 3}){
+ @Override
public long /*int*/ method0(long /*int*/[] args) {return QueryInterface(args[0], args[1]);}
+ @Override
public long /*int*/ method1(long /*int*/[] args) {return AddRef();}
+ @Override
public long /*int*/ method2(long /*int*/[] args) {return Release();}
+ @Override
public long /*int*/ method3(long /*int*/[] args) {return Authenticate(args[0], args[1], args[2]);}
};
iDispatch = new COMObject (new int[] {2, 0, 0, 1, 3, 5, 8}) {
+ @Override
public long /*int*/ method0 (long /*int*/[] args) {
/*
* IDispatch check must be done here instead of in the shared QueryInterface
@@ -122,15 +171,22 @@
}
return QueryInterface (args[0], args[1]);
}
+ @Override
public long /*int*/ method1 (long /*int*/[] args) {return AddRef ();}
+ @Override
public long /*int*/ method2 (long /*int*/[] args) {return Release ();}
+ @Override
public long /*int*/ method3 (long /*int*/[] args) {return GetTypeInfoCount (args[0]);}
+ @Override
public long /*int*/ method4 (long /*int*/[] args) {return GetTypeInfo ((int)/*64*/args[0], (int)/*64*/args[1], args[2]);}
+ @Override
public long /*int*/ method5 (long /*int*/[] args) {return GetIDsOfNames ((int)/*64*/args[0], args[1], (int)/*64*/args[2], (int)/*64*/args[3], args[4]);}
+ @Override
public long /*int*/ method6 (long /*int*/[] args) {return Invoke ((int)/*64*/args[0], (int)/*64*/args[1], (int)/*64*/args[2], (int)/*64*/args[3], args[4], args[5], args[6], args[7]);}
};
}
+@Override
protected void disposeCOMInterfaces() {
super.disposeCOMInterfaces();
if (iDocHostUIHandler != null) {
@@ -163,11 +219,13 @@
}
}
+@Override
protected int AddRef() {
/* Workaround for javac 1.1.8 bug */
return super.AddRef();
}
+@Override
protected int QueryInterface(long /*int*/ riid, long /*int*/ ppvObject) {
int result = super.QueryInterface(riid, ppvObject);
if (result == COM.S_OK) return result;
@@ -250,6 +308,7 @@
return COM.E_NOTIMPL;
}
+@Override
protected int Release() {
/* Workaround for javac 1.1.8 bug */
return super.Release();
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/win32/org/eclipse/swt/dnd/ByteArrayTransfer.java b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/win32/org/eclipse/swt/dnd/ByteArrayTransfer.java
index bca02a7..faccfe8 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/win32/org/eclipse/swt/dnd/ByteArrayTransfer.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/win32/org/eclipse/swt/dnd/ByteArrayTransfer.java
@@ -120,6 +120,7 @@
*/
public abstract class ByteArrayTransfer extends Transfer {
+@Override
public TransferData[] getSupportedTypes() {
int[] types = getTypeIds();
TransferData[] data = new TransferData[types.length];
@@ -135,6 +136,7 @@
return data;
}
+@Override
public boolean isSupportedType(TransferData transferData){
if (transferData == null) return false;
int[] types = getTypeIds();
@@ -158,6 +160,7 @@
*
* @see Transfer#nativeToJava
*/
+@Override
protected void javaToNative (Object object, TransferData transferData) {
if (!checkByteArray(object) || !isSupportedType(transferData)) {
DND.error(DND.ERROR_INVALID_DATA);
@@ -185,6 +188,7 @@
*
* @see Transfer#javaToNative
*/
+@Override
protected Object nativeToJava(TransferData transferData) {
if (!isSupportedType(transferData) || transferData.pIDataObject == 0) return null;
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/win32/org/eclipse/swt/dnd/Clipboard.java b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/win32/org/eclipse/swt/dnd/Clipboard.java
index 42e52e0..b0d20dc 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/win32/org/eclipse/swt/dnd/Clipboard.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/win32/org/eclipse/swt/dnd/Clipboard.java
@@ -517,14 +517,20 @@
private void createCOMInterfaces() {
// register each of the interfaces that this object implements
iDataObject = new COMObject(new int[]{2, 0, 0, 2, 2, 1, 2, 3, 2, 4, 1, 1}){
+ @Override
public long /*int*/ method0(long /*int*/[] args) {return QueryInterface(args[0], args[1]);}
+ @Override
public long /*int*/ method1(long /*int*/[] args) {return AddRef();}
+ @Override
public long /*int*/ method2(long /*int*/[] args) {return Release();}
+ @Override
public long /*int*/ method3(long /*int*/[] args) {return GetData(args[0], args[1]);}
// method4 GetDataHere - not implemented
+ @Override
public long /*int*/ method5(long /*int*/[] args) {return QueryGetData(args[0]);}
// method6 GetCanonicalFormatEtc - not implemented
// method7 SetData - not implemented
+ @Override
public long /*int*/ method8(long /*int*/[] args) {return EnumFormatEtc((int)/*64*/args[0], args[1]);}
// method9 DAdvise - not implemented
// method10 DUnadvise - not implemented
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/win32/org/eclipse/swt/dnd/DragSource.java b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/win32/org/eclipse/swt/dnd/DragSource.java
index fbbc93a..638f187 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/win32/org/eclipse/swt/dnd/DragSource.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/win32/org/eclipse/swt/dnd/DragSource.java
@@ -245,22 +245,34 @@
private void createCOMInterfaces() {
// register each of the interfaces that this object implements
iDropSource = new COMObject(new int[]{2, 0, 0, 2, 1}){
+ @Override
public long /*int*/ method0(long /*int*/[] args) {return QueryInterface(args[0], args[1]);}
+ @Override
public long /*int*/ method1(long /*int*/[] args) {return AddRef();}
+ @Override
public long /*int*/ method2(long /*int*/[] args) {return Release();}
+ @Override
public long /*int*/ method3(long /*int*/[] args) {return QueryContinueDrag((int)/*64*/args[0], (int)/*64*/args[1]);}
+ @Override
public long /*int*/ method4(long /*int*/[] args) {return GiveFeedback((int)/*64*/args[0]);}
};
iDataObject = new COMObject(new int[]{2, 0, 0, 2, 2, 1, 2, 3, 2, 4, 1, 1}){
+ @Override
public long /*int*/ method0(long /*int*/[] args) {return QueryInterface(args[0], args[1]);}
+ @Override
public long /*int*/ method1(long /*int*/[] args) {return AddRef();}
+ @Override
public long /*int*/ method2(long /*int*/[] args) {return Release();}
+ @Override
public long /*int*/ method3(long /*int*/[] args) {return GetData(args[0], args[1]);}
// method4 GetDataHere - not implemented
+ @Override
public long /*int*/ method5(long /*int*/[] args) {return QueryGetData(args[0]);}
// method6 GetCanonicalFormatEtc - not implemented
+ @Override
public long /*int*/ method7(long /*int*/[] args) {return SetData(args[0], args[1], (int)/*64*/args[2]);}
+ @Override
public long /*int*/ method8(long /*int*/[] args) {return EnumFormatEtc((int)/*64*/args[0], args[1]);}
// method9 DAdvise - not implemented
// method10 DUnadvise - not implemented
@@ -268,6 +280,7 @@
};
}
+@Override
protected void checkSubclass() {
String name = getClass().getName();
String validName = DragSource.class.getName();
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/win32/org/eclipse/swt/dnd/DropTarget.java b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/win32/org/eclipse/swt/dnd/DropTarget.java
index 88138fa..29926e4 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/win32/org/eclipse/swt/dnd/DropTarget.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/win32/org/eclipse/swt/dnd/DropTarget.java
@@ -223,6 +223,7 @@
return refCount;
}
+@Override
protected void checkSubclass () {
String name = getClass().getName ();
String validName = DropTarget.class.getName();
@@ -235,9 +236,13 @@
// register each of the interfaces that this object implements
boolean is32 = C.PTR_SIZEOF == 4;
iDropTarget = new COMObject(new int[]{2, 0, 0, is32 ? 5 : 4, is32 ? 4 : 3, 0, is32 ? 5 : 4}){
+ @Override
public long /*int*/ method0(long /*int*/[] args) {return QueryInterface(args[0], args[1]);}
+ @Override
public long /*int*/ method1(long /*int*/[] args) {return AddRef();}
+ @Override
public long /*int*/ method2(long /*int*/[] args) {return Release();}
+ @Override
public long /*int*/ method3(long /*int*/[] args) {
if (args.length == 5) {
return DragEnter(args[0], (int)/*64*/args[1], (int)/*64*/args[2], (int)/*64*/args[3], args[4]);
@@ -245,6 +250,7 @@
return DragEnter_64(args[0], (int)/*64*/args[1], args[2], args[3]);
}
}
+ @Override
public long /*int*/ method4(long /*int*/[] args) {
if (args.length == 4) {
return DragOver((int)/*64*/args[0], (int)/*64*/args[1], (int)/*64*/args[2], args[3]);
@@ -252,7 +258,9 @@
return DragOver_64((int)/*64*/args[0], args[1], args[2]);
}
}
+ @Override
public long /*int*/ method5(long /*int*/[] args) {return DragLeave();}
+ @Override
public long /*int*/ method6(long /*int*/[] args) {
if (args.length == 5) {
return Drop(args[0], (int)/*64*/args[1], (int)/*64*/args[2], (int)/*64*/args[3], args[4]);
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/win32/org/eclipse/swt/dnd/FileTransfer.java b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/win32/org/eclipse/swt/dnd/FileTransfer.java
index 330ee03..f9cb3cb 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/win32/org/eclipse/swt/dnd/FileTransfer.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/win32/org/eclipse/swt/dnd/FileTransfer.java
@@ -63,6 +63,7 @@
*
* @see Transfer#nativeToJava
*/
+@Override
public void javaToNative(Object object, TransferData transferData) {
if (!checkFile(object) || !isSupportedType(transferData)) {
DND.error(DND.ERROR_INVALID_DATA);
@@ -103,6 +104,7 @@
*
* @see Transfer#javaToNative
*/
+@Override
public Object nativeToJava(TransferData transferData) {
if (!isSupportedType(transferData) || transferData.pIDataObject == 0) return null;
@@ -135,10 +137,12 @@
return fileNames;
}
+@Override
protected int[] getTypeIds(){
return new int[] {CF_HDROPID};
}
+@Override
protected String[] getTypeNames(){
return new String[] {CF_HDROP};
}
@@ -151,6 +155,7 @@
return true;
}
+@Override
protected boolean validate(Object object) {
return checkFile(object);
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/win32/org/eclipse/swt/dnd/HTMLTransfer.java b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/win32/org/eclipse/swt/dnd/HTMLTransfer.java
index 2f07aae..76c9c70 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/win32/org/eclipse/swt/dnd/HTMLTransfer.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/win32/org/eclipse/swt/dnd/HTMLTransfer.java
@@ -60,6 +60,7 @@
*
* @see Transfer#nativeToJava
*/
+@Override
public void javaToNative (Object object, TransferData transferData){
if (!checkHTML(object) || !isSupportedType(transferData)) {
DND.error(DND.ERROR_INVALID_DATA);
@@ -127,6 +128,7 @@
*
* @see Transfer#javaToNative
*/
+@Override
public Object nativeToJava(TransferData transferData){
if (!isSupportedType(transferData) || transferData.pIDataObject == 0) return null;
IDataObject data = new IDataObject(transferData.pIDataObject);
@@ -195,15 +197,18 @@
OS.GlobalFree(hMem);
}
}
+@Override
protected int[] getTypeIds(){
return new int[] {HTML_FORMATID};
}
+@Override
protected String[] getTypeNames(){
return new String[] {HTML_FORMAT};
}
boolean checkHTML(Object object) {
return (object != null && object instanceof String && ((String)object).length() > 0);
}
+@Override
protected boolean validate(Object object) {
return checkHTML(object);
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/win32/org/eclipse/swt/dnd/ImageTransfer.java b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/win32/org/eclipse/swt/dnd/ImageTransfer.java
index 3ec5eeb..2d58c47 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/win32/org/eclipse/swt/dnd/ImageTransfer.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/win32/org/eclipse/swt/dnd/ImageTransfer.java
@@ -58,6 +58,7 @@
*
* @see Transfer#nativeToJava
*/
+@Override
public void javaToNative(Object object, TransferData transferData) {
if (!checkImage(object) || !isSupportedType(transferData)) {
DND.error(DND.ERROR_INVALID_DATA);
@@ -131,6 +132,7 @@
*
* @see Transfer#javaToNative
*/
+@Override
public Object nativeToJava(TransferData transferData) {
if (!isSupportedType(transferData) || transferData.pIDataObject == 0) return null;
IDataObject dataObject = new IDataObject(transferData.pIDataObject);
@@ -191,10 +193,12 @@
}
}
+@Override
protected int[] getTypeIds(){
return new int[] {CF_DIBID};
}
+@Override
protected String[] getTypeNames(){
return new String[] {CF_DIB};
}
@@ -203,6 +207,7 @@
return true;
}
+@Override
protected boolean validate(Object object) {
return checkImage(object);
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/win32/org/eclipse/swt/dnd/OleEnumFORMATETC.java b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/win32/org/eclipse/swt/dnd/OleEnumFORMATETC.java
index 7315f20..342a69b 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/win32/org/eclipse/swt/dnd/OleEnumFORMATETC.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/win32/org/eclipse/swt/dnd/OleEnumFORMATETC.java
@@ -35,16 +35,25 @@
private void createCOMInterfaces() {
// register each of the interfaces that this object implements
iUnknown = new COMObject(new int[] {2, 0, 0}){
+ @Override
public long /*int*/ method0(long /*int*/[] args) {return QueryInterface(args[0], args[1]);}
+ @Override
public long /*int*/ method1(long /*int*/[] args) {return AddRef();}
+ @Override
public long /*int*/ method2(long /*int*/[] args) {return Release();}
};
iEnumFORMATETC = new COMObject(new int[] {2, 0, 0, 3, 1, 0, 1}){
+ @Override
public long /*int*/ method0(long /*int*/[] args) {return QueryInterface(args[0], args[1]);}
+ @Override
public long /*int*/ method1(long /*int*/[] args) {return AddRef();}
+ @Override
public long /*int*/ method2(long /*int*/[] args) {return Release();}
+ @Override
public long /*int*/ method3(long /*int*/[] args) {return Next((int)/*64*/args[0], args[1], args[2]);}
+ @Override
public long /*int*/ method4(long /*int*/[] args) {return Skip((int)/*64*/args[0]);}
+ @Override
public long /*int*/ method5(long /*int*/[] args) {return Reset();}
// method6 Clone - not implemented
};
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/win32/org/eclipse/swt/dnd/RTFTransfer.java b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/win32/org/eclipse/swt/dnd/RTFTransfer.java
index c6c85aa..0036b51 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/win32/org/eclipse/swt/dnd/RTFTransfer.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/win32/org/eclipse/swt/dnd/RTFTransfer.java
@@ -54,6 +54,7 @@
*
* @see Transfer#nativeToJava
*/
+@Override
public void javaToNative (Object object, TransferData transferData){
if (!checkRTF(object) || !isSupportedType(transferData)) {
DND.error(DND.ERROR_INVALID_DATA);
@@ -90,6 +91,7 @@
*
* @see Transfer#javaToNative
*/
+@Override
public Object nativeToJava(TransferData transferData){
if (!isSupportedType(transferData) || transferData.pIDataObject == 0) return null;
IDataObject data = new IDataObject(transferData.pIDataObject);
@@ -119,10 +121,12 @@
}
}
+@Override
protected int[] getTypeIds(){
return new int[] {CF_RTFID};
}
+@Override
protected String[] getTypeNames(){
return new String[] {CF_RTF};
}
@@ -131,6 +135,7 @@
return (object != null && object instanceof String && ((String)object).length() > 0);
}
+@Override
protected boolean validate(Object object) {
return checkRTF(object);
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/win32/org/eclipse/swt/dnd/TableDragSourceEffect.java b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/win32/org/eclipse/swt/dnd/TableDragSourceEffect.java
index 99fa067..062d01a 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/win32/org/eclipse/swt/dnd/TableDragSourceEffect.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/win32/org/eclipse/swt/dnd/TableDragSourceEffect.java
@@ -55,6 +55,7 @@
*
* @param event the information associated with the drag finished event
*/
+ @Override
public void dragFinished(DragSourceEvent event) {
if (dragSourceImage != null) dragSourceImage.dispose();
dragSourceImage = null;
@@ -71,6 +72,7 @@
*
* @param event the information associated with the drag start event
*/
+ @Override
public void dragStart(DragSourceEvent event) {
event.image = getDragSourceImage(event);
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/win32/org/eclipse/swt/dnd/TableDropTargetEffect.java b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/win32/org/eclipse/swt/dnd/TableDropTargetEffect.java
index 94b4f5a..ca60609 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/win32/org/eclipse/swt/dnd/TableDropTargetEffect.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/win32/org/eclipse/swt/dnd/TableDropTargetEffect.java
@@ -83,6 +83,7 @@
* @see DropTargetAdapter
* @see DropTargetEvent
*/
+ @Override
public void dragEnter(DropTargetEvent event) {
scrollBeginTime = 0;
scrollIndex = -1;
@@ -104,6 +105,7 @@
* @see DropTargetAdapter
* @see DropTargetEvent
*/
+ @Override
public void dragLeave(DropTargetEvent event) {
Table table = (Table) control;
long /*int*/ handle = table.handle;
@@ -143,6 +145,7 @@
* @see DND#FEEDBACK_SELECT
* @see DND#FEEDBACK_SCROLL
*/
+ @Override
public void dragOver(DropTargetEvent event) {
Table table = (Table) getControl();
int effect = checkEffect(event.feedback);
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/win32/org/eclipse/swt/dnd/TextTransfer.java b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/win32/org/eclipse/swt/dnd/TextTransfer.java
index 1fbb765..fc41b45 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/win32/org/eclipse/swt/dnd/TextTransfer.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/win32/org/eclipse/swt/dnd/TextTransfer.java
@@ -62,6 +62,7 @@
*
* @see Transfer#nativeToJava
*/
+@Override
public void javaToNative (Object object, TransferData transferData){
if (!checkText(object) || !isSupportedType(transferData)) {
DND.error(DND.ERROR_INVALID_DATA);
@@ -116,6 +117,7 @@
*
* @see Transfer#javaToNative
*/
+@Override
public Object nativeToJava(TransferData transferData){
if (!isSupportedType(transferData) || transferData.pIDataObject == 0) return null;
@@ -172,10 +174,12 @@
return null;
}
+@Override
protected int[] getTypeIds(){
return new int[] {CF_UNICODETEXTID, CF_TEXTID};
}
+@Override
protected String[] getTypeNames(){
return new String[] {CF_UNICODETEXT, CF_TEXT};
}
@@ -184,6 +188,7 @@
return (object != null && object instanceof String && ((String)object).length() > 0);
}
+@Override
protected boolean validate(Object object) {
return checkText(object);
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/win32/org/eclipse/swt/dnd/TreeDragSourceEffect.java b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/win32/org/eclipse/swt/dnd/TreeDragSourceEffect.java
index 7d207e7..bf5db80 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/win32/org/eclipse/swt/dnd/TreeDragSourceEffect.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/win32/org/eclipse/swt/dnd/TreeDragSourceEffect.java
@@ -54,6 +54,7 @@
*
* @param event the information associated with the drag finished event
*/
+ @Override
public void dragFinished(DragSourceEvent event) {
if (dragSourceImage != null) dragSourceImage.dispose();
dragSourceImage = null;
@@ -70,6 +71,7 @@
*
* @param event the information associated with the drag start event
*/
+ @Override
public void dragStart(DragSourceEvent event) {
event.image = getDragSourceImage(event);
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/win32/org/eclipse/swt/dnd/TreeDropTargetEffect.java b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/win32/org/eclipse/swt/dnd/TreeDropTargetEffect.java
index 526e203..e46223d 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/win32/org/eclipse/swt/dnd/TreeDropTargetEffect.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/win32/org/eclipse/swt/dnd/TreeDropTargetEffect.java
@@ -91,6 +91,7 @@
* @see DropTargetAdapter
* @see DropTargetEvent
*/
+ @Override
public void dragEnter(DropTargetEvent event) {
dropIndex = -1;
insertItem = null;
@@ -114,6 +115,7 @@
* @see DropTargetAdapter
* @see DropTargetEvent
*/
+ @Override
public void dragLeave(DropTargetEvent event) {
Tree tree = (Tree) control;
long /*int*/ handle = tree.handle;
@@ -154,6 +156,7 @@
* @see DND#FEEDBACK_INSERT_AFTER
* @see DND#FEEDBACK_SCROLL
*/
+ @Override
public void dragOver(DropTargetEvent event) {
Tree tree = (Tree) getControl();
int effect = checkEffect(event.feedback);
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/win32/org/eclipse/swt/dnd/URLTransfer.java b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/win32/org/eclipse/swt/dnd/URLTransfer.java
index ea2631c..9d47b9e 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/win32/org/eclipse/swt/dnd/URLTransfer.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/win32/org/eclipse/swt/dnd/URLTransfer.java
@@ -57,6 +57,7 @@
*
* @see Transfer#nativeToJava
*/
+@Override
public void javaToNative (Object object, TransferData transferData){
if (!checkURL(object) || !isSupportedType(transferData)) {
DND.error(DND.ERROR_INVALID_DATA);
@@ -107,6 +108,7 @@
*
* @see Transfer#javaToNative
*/
+@Override
public Object nativeToJava(TransferData transferData){
if (!isSupportedType(transferData) || transferData.pIDataObject == 0) return null;
IDataObject data = new IDataObject(transferData.pIDataObject);
@@ -159,10 +161,12 @@
return null;
}
+@Override
protected int[] getTypeIds(){
return new int[] {CFSTR_INETURLIDW, CFSTR_INETURLID};
}
+@Override
protected String[] getTypeNames(){
return new String[] {CFSTR_INETURLW, CFSTR_INETURL};
}
@@ -171,6 +175,7 @@
return object != null && (object instanceof String) && ((String)object).length() > 0;
}
+@Override
protected boolean validate(Object object) {
return checkURL(object);
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/win32/org/eclipse/swt/browser/MozillaDelegate.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/win32/org/eclipse/swt/browser/MozillaDelegate.java
index 0a4718a..baf9c48 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/win32/org/eclipse/swt/browser/MozillaDelegate.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/win32/org/eclipse/swt/browser/MozillaDelegate.java
@@ -248,6 +248,7 @@
/* children created in getSiteHandle() should be destroyed whenever a page is left */
browser.addLocationListener (new LocationAdapter () {
+ @Override
public void changing (LocationEvent event) {
Iterator<Composite> it = childWindows.iterator ();
while (it.hasNext ()) {
diff --git a/bundles/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/ole/win32/OleAutomation.java b/bundles/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/ole/win32/OleAutomation.java
index f7a53e8..44898df 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/ole/win32/OleAutomation.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/ole/win32/OleAutomation.java
@@ -470,6 +470,7 @@
int result = invoke(dispIdMember, COM.DISPATCH_PROPERTYGET, rgvarg, rgdispidNamedArgs, pVarResult);
return (result == OLE.S_OK) ? pVarResult : null;
}
+@Override
public boolean equals(Object object) {
if (object == this) return true;
if (object instanceof OleAutomation) {
diff --git a/bundles/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/ole/win32/OleClientSite.java b/bundles/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/ole/win32/OleClientSite.java
index 3ddae69..c49be73 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/ole/win32/OleClientSite.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/ole/win32/OleClientSite.java
@@ -485,44 +485,71 @@
protected void createCOMInterfaces() {
iUnknown = new COMObject(new int[]{2, 0, 0}){
+ @Override
public long /*int*/ method0(long /*int*/[] args) {return QueryInterface(args[0], args[1]);}
+ @Override
public long /*int*/ method1(long /*int*/[] args) {return AddRef();}
+ @Override
public long /*int*/ method2(long /*int*/[] args) {return Release();}
};
iOleClientSite = new COMObject(new int[]{2, 0, 0, 0, 3, 1, 0, 1, 0}){
+ @Override
public long /*int*/ method0(long /*int*/[] args) {return QueryInterface(args[0], args[1]);}
+ @Override
public long /*int*/ method1(long /*int*/[] args) {return AddRef();}
+ @Override
public long /*int*/ method2(long /*int*/[] args) {return Release();}
+ @Override
public long /*int*/ method3(long /*int*/[] args) {return SaveObject();}
// method4 GetMoniker - not implemented
+ @Override
public long /*int*/ method5(long /*int*/[] args) {return GetContainer(args[0]);}
+ @Override
public long /*int*/ method6(long /*int*/[] args) {return ShowObject();}
+ @Override
public long /*int*/ method7(long /*int*/[] args) {return OnShowWindow((int)/*64*/args[0]);}
// method8 RequestNewObjectLayout - not implemented
};
iAdviseSink = new COMObject(new int[]{2, 0, 0, 2, 2, 1, 0, 0}){
+ @Override
public long /*int*/ method0(long /*int*/[] args) {return QueryInterface(args[0], args[1]);}
+ @Override
public long /*int*/ method1(long /*int*/[] args) {return AddRef();}
+ @Override
public long /*int*/ method2(long /*int*/[] args) {return Release();}
+ @Override
public long /*int*/ method3(long /*int*/[] args) {return OnDataChange(args[0], args[1]);}
+ @Override
public long /*int*/ method4(long /*int*/[] args) {return OnViewChange((int)/*64*/args[0], (int)/*64*/args[1]);}
//method5 OnRename - not implemented
+ @Override
public long /*int*/ method6(long /*int*/[] args) {OnSave();return 0;}
+ @Override
public long /*int*/ method7(long /*int*/[] args) {return OnClose();}
};
iOleInPlaceSite = new COMObject(new int[]{2, 0, 0, 1, 1, 0, 0, 0, 5, C.PTR_SIZEOF == 4 ? 2 : 1, 1, 0, 0, 0, 1}){
+ @Override
public long /*int*/ method0(long /*int*/[] args) {return QueryInterface(args[0], args[1]);}
+ @Override
public long /*int*/ method1(long /*int*/[] args) {return AddRef();}
+ @Override
public long /*int*/ method2(long /*int*/[] args) {return Release();}
+ @Override
public long /*int*/ method3(long /*int*/[] args) {return GetWindow(args[0]);}
+ @Override
public long /*int*/ method4(long /*int*/[] args) {return ContextSensitiveHelp((int)/*64*/args[0]);}
+ @Override
public long /*int*/ method5(long /*int*/[] args) {return CanInPlaceActivate();}
+ @Override
public long /*int*/ method6(long /*int*/[] args) {return OnInPlaceActivate();}
+ @Override
public long /*int*/ method7(long /*int*/[] args) {return OnUIActivate();}
+ @Override
public long /*int*/ method8(long /*int*/[] args) {return GetWindowContext(args[0], args[1], args[2], args[3], args[4]);}
+ @Override
public long /*int*/ method9(long /*int*/[] args) {
if (args.length == 2) {
return Scroll((int)/*64*/args[0], (int)/*64*/args[1]);
@@ -530,17 +557,24 @@
return Scroll_64(args[0]);
}
}
+ @Override
public long /*int*/ method10(long /*int*/[] args) {return OnUIDeactivate((int)/*64*/args[0]);}
+ @Override
public long /*int*/ method11(long /*int*/[] args) {return OnInPlaceDeactivate();}
// method12 DiscardUndoState - not implemented
// method13 DeactivateAndUndoChange - not implemented
+ @Override
public long /*int*/ method14(long /*int*/[] args) {return OnPosRectChange(args[0]);}
};
iOleDocumentSite = new COMObject(new int[]{2, 0, 0, 1}){
+ @Override
public long /*int*/ method0(long /*int*/[] args) {return QueryInterface(args[0], args[1]);}
+ @Override
public long /*int*/ method1(long /*int*/[] args) {return AddRef();}
+ @Override
public long /*int*/ method2(long /*int*/[] args) {return Release();}
+ @Override
public long /*int*/ method3(long /*int*/[] args) {return ActivateMe(args[0]);}
};
}
@@ -857,6 +891,7 @@
if (result == COM.S_FALSE) return false;
return true;
}
+@Override
public boolean isFocusControl () {
checkWidget ();
long /*int*/ focusHwnd = OS.GetFocus();
diff --git a/bundles/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/ole/win32/OleControlSite.java b/bundles/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/ole/win32/OleControlSite.java
index a834882..2dc8d4e 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/ole/win32/OleControlSite.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/ole/win32/OleControlSite.java
@@ -398,6 +398,7 @@
}
}
+@Override
protected void addObjectReferences() {
super.addObjectReferences();
@@ -436,30 +437,40 @@
olePropertyChangeSink.AddRef();
olePropertyChangeSink.connect(objIUnknown);
}
+@Override
protected void createCOMInterfaces () {
super.createCOMInterfaces();
// register each of the interfaces that this object implements
iOleControlSite = new COMObject(new int[]{2, 0, 0, 0, 1, 1, 3, 2, 1, 0}){
+ @Override
public long /*int*/ method0(long /*int*/[] args) {return QueryInterface(args[0], args[1]);}
+ @Override
public long /*int*/ method1(long /*int*/[] args) {return AddRef();}
+ @Override
public long /*int*/ method2(long /*int*/[] args) {return Release();}
+ @Override
public long /*int*/ method3(long /*int*/[] args) {return OnControlInfoChanged();}
// method4 LockInPlaceActive - not implemented
// method5 GetExtendedControl - not implemented
// method6 TransformCoords - not implemented
// method7 Translate Accelerator - not implemented
+ @Override
public long /*int*/ method8(long /*int*/[] args) {return OnFocus((int)/*64*/args[0]);}
// method9 ShowPropertyFrame - not implemented
};
iDispatch = new COMObject(new int[]{2, 0, 0, 1, 3, 5, 8}){
+ @Override
public long /*int*/ method0(long /*int*/[] args) {return QueryInterface(args[0], args[1]);}
+ @Override
public long /*int*/ method1(long /*int*/[] args) {return AddRef();}
+ @Override
public long /*int*/ method2(long /*int*/[] args) {return Release();}
// method3 GetTypeInfoCount - not implemented
// method4 GetTypeInfo - not implemented
// method5 GetIDsOfNames - not implemented
+ @Override
public long /*int*/ method6(long /*int*/[] args) {return Invoke((int)/*64*/args[0], args[1], (int)/*64*/args[2], (int)/*64*/args[3], args[4], args[5], args[6], args[7]);}
};
}
@@ -482,6 +493,7 @@
}
olePropertyChangeSink = null;
}
+@Override
protected void disposeCOMInterfaces() {
super.disposeCOMInterfaces();
@@ -493,6 +505,7 @@
iDispatch.dispose();
iDispatch = null;
}
+@Override
public Color getBackground () {
if (objIUnknown != null) {
@@ -510,6 +523,7 @@
return super.getBackground();
}
+@Override
public Font getFont () {
if (font != null && !font.isDisposed()) return font;
if (objIUnknown != null) {
@@ -539,6 +553,7 @@
return super.getFont();
}
+@Override
public Color getForeground () {
if (objIUnknown != null) {
@@ -599,6 +614,7 @@
}
return null;
}
+@Override
protected int GetWindow(long /*int*/ phwnd) {
if (phwnd == 0)
@@ -665,9 +681,11 @@
}
return COM.S_OK;
}
+@Override
protected int OnUIDeactivate(int fUndoable) {
return super.OnUIDeactivate(fUndoable);
}
+@Override
void onFocusIn(Event e) {
String progID = getProgramID();
if (progID == null) return;
@@ -683,6 +701,7 @@
if (phwnd[0] == 0) return;
OS.SetFocus(phwnd[0]);
}
+@Override
void onFocusOut(Event e) {
if (objIOleInPlaceObject == null) return;
String progID = getProgramID();
@@ -739,6 +758,7 @@
private int OnFocus(int fGotFocus) {
return COM.S_OK;
}
+@Override
protected int QueryInterface(long /*int*/ riid, long /*int*/ ppvObject) {
int result = super.QueryInterface(riid, ppvObject);
if (result == COM.S_OK)
@@ -760,6 +780,7 @@
COM.MoveMemory(ppvObject, new long /*int*/[] {0}, OS.PTR_SIZEOF);
return COM.E_NOINTERFACE;
}
+@Override
protected int Release() {
int result = super.Release();
if (result == 0) {
@@ -771,6 +792,7 @@
}
return result;
}
+@Override
protected void releaseObjectInterfaces() {
disconnectEventSinks();
@@ -817,6 +839,7 @@
* <li>ERROR_NULL_ARGUMENT when listener is null</li>
* </ul>
*/
+@Deprecated
public void removeEventListener(OleAutomation automation, GUID guid, int eventID, OleListener listener) {
checkWidget();
if (automation == null || listener == null || guid == null) SWT.error (SWT.ERROR_NULL_ARGUMENT);
@@ -896,6 +919,7 @@
if (listener == null) SWT.error (SWT.ERROR_NULL_ARGUMENT);
olePropertyChangeSink.removeListener(propertyID, listener);
}
+@Override
public void setBackground (Color color) {
super.setBackground(color);
@@ -907,6 +931,7 @@
oleObject.dispose();
}
}
+@Override
public void setFont (Font font) {
super.setFont(font);
@@ -932,6 +957,7 @@
this.font = font;
return;
}
+@Override
public void setForeground (Color color) {
super.setForeground(color);
diff --git a/bundles/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/ole/win32/OleEventSink.java b/bundles/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/ole/win32/OleEventSink.java
index 0d92976..c107fe2 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/ole/win32/OleEventSink.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/ole/win32/OleEventSink.java
@@ -62,12 +62,16 @@
}
private void createCOMInterfaces() {
iDispatch = new COMObject(new int[]{2, 0, 0, 1, 3, 4, 8}){
+ @Override
public long /*int*/ method0(long /*int*/[] args) {return QueryInterface(args[0], args[1]);}
+ @Override
public long /*int*/ method1(long /*int*/[] args) {return AddRef();}
+ @Override
public long /*int*/ method2(long /*int*/[] args) {return Release();}
// method3 GetTypeInfoCount - not implemented
// method4 GetTypeInfo - not implemented
// method5 GetIDsOfNames - not implemented
+ @Override
public long /*int*/ method6(long /*int*/[] args) {return Invoke((int)/*64*/args[0], args[1], (int)/*64*/args[2], (int)/*64*/args[3], args[4], args[5], args[6], args[7]);}
};
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/ole/win32/OleFrame.java b/bundles/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/ole/win32/OleFrame.java
index 6344188..e7ade1e 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/ole/win32/OleFrame.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/ole/win32/OleFrame.java
@@ -329,26 +329,42 @@
private void createCOMInterfaces() {
// Create each of the interfaces that this object implements
iUnknown = new COMObject(new int[]{2, 0, 0}){
+ @Override
public long /*int*/ method0(long /*int*/[] args) {return QueryInterface(args[0], args[1]);}
+ @Override
public long /*int*/ method1(long /*int*/[] args) {return AddRef();}
+ @Override
public long /*int*/ method2(long /*int*/[] args) {return Release();}
};
iOleInPlaceFrame = new COMObject(new int[]{2, 0, 0, 1, 1, 1, 1, 1, 2, 2, 3, 1, 1, 1, 2}){
+ @Override
public long /*int*/ method0(long /*int*/[] args) {return QueryInterface(args[0], args[1]);}
+ @Override
public long /*int*/ method1(long /*int*/[] args) {return AddRef();}
+ @Override
public long /*int*/ method2(long /*int*/[] args) {return Release();}
+ @Override
public long /*int*/ method3(long /*int*/[] args) {return GetWindow(args[0]);}
+ @Override
public long /*int*/ method4(long /*int*/[] args) {return ContextSensitiveHelp((int)/*64*/args[0]);}
+ @Override
public long /*int*/ method5(long /*int*/[] args) {return GetBorder(args[0]);}
+ @Override
public long /*int*/ method6(long /*int*/[] args) {return RequestBorderSpace(args[0]);}
+ @Override
public long /*int*/ method7(long /*int*/[] args) {return SetBorderSpace(args[0]);}
+ @Override
public long /*int*/ method8(long /*int*/[] args) {return SetActiveObject(args[0], args[1]);}
+ @Override
public long /*int*/ method9(long /*int*/[] args) {return InsertMenus(args[0], args[1]);}
+ @Override
public long /*int*/ method10(long /*int*/[] args) {return SetMenu(args[0], args[1], args[2]);}
+ @Override
public long /*int*/ method11(long /*int*/[] args) {return RemoveMenus(args[0]);}
// method12 SetStatusText - not implemented
// method13 EnableModeless - not implemented
+ @Override
public long /*int*/ method14(long /*int*/[] args) {return TranslateAccelerator(args[0], (int)/*64*/args[1]);}
};
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/ole/win32/OlePropertyChangeSink.java b/bundles/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/ole/win32/OlePropertyChangeSink.java
index 01e4dd2..04136f9 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/ole/win32/OlePropertyChangeSink.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/ole/win32/OlePropertyChangeSink.java
@@ -64,16 +64,24 @@
private void createCOMInterfaces() {
// register each of the interfaces that this object implements
iUnknown = new COMObject(new int[]{2, 0, 0}){
+ @Override
public long /*int*/ method0(long /*int*/[] args) {return QueryInterface(args[0], args[1]);}
+ @Override
public long /*int*/ method1(long /*int*/[] args) {return AddRef();}
+ @Override
public long /*int*/ method2(long /*int*/[] args) {return Release();}
};
iPropertyNotifySink = new COMObject(new int[]{2, 0, 0, 1, 1}){
+ @Override
public long /*int*/ method0(long /*int*/[] args) {return QueryInterface(args[0], args[1]);}
+ @Override
public long /*int*/ method1(long /*int*/[] args) {return AddRef();}
+ @Override
public long /*int*/ method2(long /*int*/[] args) {return Release();}
+ @Override
public long /*int*/ method3(long /*int*/[] args) {return OnChanged((int)/*64*/args[0]);}
+ @Override
public long /*int*/ method4(long /*int*/[] args) {return OnRequestEdit((int)/*64*/args[0]);}
};
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/ole/win32/Variant.java b/bundles/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/ole/win32/Variant.java
index 0c1614e..0fbe21c 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/ole/win32/Variant.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/ole/win32/Variant.java
@@ -1034,6 +1034,7 @@
*
* @return a string representation of the Variant
*/
+@Override
public String toString () {
switch (type) {
case COM.VT_BOOL :
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/GUID.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/GUID.java
index bd1b4be..83ade51 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/GUID.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/GUID.java
@@ -28,6 +28,7 @@
return zeros.substring (0, Math.max (0, length - tlen)) + t;
}
+@Override
public String toString () {
return '{' + toHex (Data1, 8) + '-' +
toHex (Data2, 4) + '-' +
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/TCHAR.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/TCHAR.java
index 2eebd3e..eefd4d3 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/TCHAR.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/TCHAR.java
@@ -116,6 +116,7 @@
}
}
+@Override
public String toString () {
return toString (0, length ());
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Printing/win32/org/eclipse/swt/printing/PrintDialog.java b/bundles/org.eclipse.swt/Eclipse SWT Printing/win32/org/eclipse/swt/printing/PrintDialog.java
index ebd0ab2..d4f5d24 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Printing/win32/org/eclipse/swt/printing/PrintDialog.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Printing/win32/org/eclipse/swt/printing/PrintDialog.java
@@ -262,6 +262,7 @@
printerData.printToFile = printToFile;
}
+@Override
protected void checkSubclass() {
String name = getClass().getName();
String validName = PrintDialog.class.getName();
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Printing/win32/org/eclipse/swt/printing/Printer.java b/bundles/org.eclipse.swt/Eclipse SWT Printing/win32/org/eclipse/swt/printing/Printer.java
index 9ec113d..77dbc80 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Printing/win32/org/eclipse/swt/printing/Printer.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Printing/win32/org/eclipse/swt/printing/Printer.java
@@ -209,6 +209,7 @@
* mechanism of the <code>Device</code> class.
* @param deviceData the device data
*/
+@Override
protected void create(DeviceData deviceData) {
data = (PrinterData)deviceData;
/* Use the character encoding for the default locale */
@@ -284,6 +285,7 @@
*
* @noreference This method is not intended to be referenced by clients.
*/
+@Override
public long /*int*/ internal_new_GC(GCData data) {
if (handle == 0) SWT.error(SWT.ERROR_NO_HANDLES);
if (data != null) {
@@ -316,6 +318,7 @@
*
* @noreference This method is not intended to be referenced by clients.
*/
+@Override
public void internal_dispose_GC(long /*int*/ hDC, GCData data) {
if (data != null) isGCCreated = false;
}
@@ -454,6 +457,7 @@
* <li>ERROR_DEVICE_DISPOSED - if the receiver has been disposed</li>
* </ul>
*/
+@Override
public Point getDPI() {
checkDevice();
int dpiX = OS.GetDeviceCaps(handle, OS.LOGPIXELSX);
@@ -476,6 +480,7 @@
* @see #getClientArea
* @see #computeTrim
*/
+@Override
public Rectangle getBounds() {
checkDevice();
int width = OS.GetDeviceCaps(handle, OS.PHYSICALWIDTH);
@@ -500,6 +505,7 @@
* @see #getBounds
* @see #computeTrim
*/
+@Override
public Rectangle getClientArea() {
checkDevice();
int width = OS.GetDeviceCaps(handle, OS.HORZRES);
@@ -572,6 +578,7 @@
* <li>ERROR_DEVICE_DISPOSED - if the receiver has been disposed</li>
* </ul>
*/
+@Override
protected void checkDevice() {
if (handle == 0) SWT.error(SWT.ERROR_DEVICE_DISPOSED);
}
@@ -581,6 +588,7 @@
* This method is called internally by the dispose
* mechanism of the <code>Device</code> class.
*/
+@Override
protected void release() {
super.release();
data = null;
@@ -591,6 +599,7 @@
* This method is called internally by the dispose
* mechanism of the <code>Device</code> class.
*/
+@Override
protected void destroy() {
if (handle != 0) OS.DeleteDC(handle);
handle = 0;
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Program/win32/org/eclipse/swt/program/Program.java b/bundles/org.eclipse.swt/Eclipse SWT Program/win32/org/eclipse/swt/program/Program.java
index eac2272..1702acf 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Program/win32/org/eclipse/swt/program/Program.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Program/win32/org/eclipse/swt/program/Program.java
@@ -429,6 +429,7 @@
*
* @see #hashCode()
*/
+@Override
public boolean equals(Object other) {
if (this == other) return true;
if (other instanceof Program) {
@@ -449,6 +450,7 @@
*
* @see #equals(Object)
*/
+@Override
public int hashCode() {
return name.hashCode() ^ command.hashCode() ^ iconName.hashCode();
}
@@ -459,6 +461,7 @@
*
* @return a string representation of the program
*/
+@Override
public String toString () {
return "Program {" + name + "}"; //$NON-NLS-1$ //$NON-NLS-2$
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Theme/win32/org/eclipse/swt/internal/theme/ButtonDrawData.java b/bundles/org.eclipse.swt/Eclipse SWT Theme/win32/org/eclipse/swt/internal/theme/ButtonDrawData.java
index be4a3b7..59344e4 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Theme/win32/org/eclipse/swt/internal/theme/ButtonDrawData.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Theme/win32/org/eclipse/swt/internal/theme/ButtonDrawData.java
@@ -20,6 +20,7 @@
state = new int[1];
}
+@Override
int[] getPartId(int part) {
int state = this.state[part];
int style = this.style;
@@ -54,6 +55,7 @@
return new int[]{iPartId, iStateId};
}
+@Override
void draw(Theme theme, GC gc, Rectangle bounds) {
if (OS.COMCTL32_MAJOR >= 6 && OS.IsAppThemed ()) {
//TODO - arrow and toggle
@@ -87,6 +89,7 @@
}
}
+@Override
int hit(Theme theme, Point position, Rectangle bounds) {
if (!(OS.COMCTL32_MAJOR >= 6 && OS.IsAppThemed ())) return DrawData.WIDGET_NOWHERE;
if (!bounds.contains(position)) return DrawData.WIDGET_NOWHERE;
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Theme/win32/org/eclipse/swt/internal/theme/ComboDrawData.java b/bundles/org.eclipse.swt/Eclipse SWT Theme/win32/org/eclipse/swt/internal/theme/ComboDrawData.java
index d539bbb..f5dba21 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Theme/win32/org/eclipse/swt/internal/theme/ComboDrawData.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Theme/win32/org/eclipse/swt/internal/theme/ComboDrawData.java
@@ -19,6 +19,7 @@
state = new int[2];
}
+@Override
void draw(Theme theme, GC gc, Rectangle bounds) {
if (OS.COMCTL32_MAJOR >= 6 && OS.IsAppThemed ()) {
long /*int*/ hTheme = OS.OpenThemeData(0, EDIT);
@@ -54,10 +55,12 @@
}
}
+@Override
char[] getClassId() {
return COMBOBOX;
}
+@Override
int[] getPartId(int part) {
int state = this.state[part];
int iPartId = 0, iStateId = 0;
@@ -78,6 +81,7 @@
return new int[]{iPartId, iStateId};
}
+@Override
int hit(Theme theme, Point position, Rectangle bounds) {
if (!(OS.COMCTL32_MAJOR >= 6 && OS.IsAppThemed ())) return DrawData.WIDGET_NOWHERE;
if (!bounds.contains(position)) return DrawData.WIDGET_NOWHERE;
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Theme/win32/org/eclipse/swt/internal/theme/ExpanderDrawData.java b/bundles/org.eclipse.swt/Eclipse SWT Theme/win32/org/eclipse/swt/internal/theme/ExpanderDrawData.java
index 37ad292..b757352 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Theme/win32/org/eclipse/swt/internal/theme/ExpanderDrawData.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Theme/win32/org/eclipse/swt/internal/theme/ExpanderDrawData.java
@@ -20,6 +20,7 @@
state = new int[1];
}
+@Override
void draw(Theme theme, GC gc, Rectangle bounds) {
if (OS.COMCTL32_MAJOR >= 6 && OS.IsAppThemed ()) {
long /*int*/ hTheme = OS.OpenThemeData(0, getClassId());
@@ -37,10 +38,12 @@
}
}
+@Override
char[] getClassId() {
return TREEVIEW;
}
+@Override
int[] getPartId(int part) {
int iPartId = OS.TVP_GLYPH;
int iStateId = OS.GLPS_CLOSED;
@@ -48,6 +51,7 @@
return new int[]{iPartId, iStateId};
}
+@Override
int hit(Theme theme, Point position, Rectangle bounds) {
if (!(OS.COMCTL32_MAJOR >= 6 && OS.IsAppThemed ())) return DrawData.WIDGET_NOWHERE;
if (!bounds.contains(position)) return DrawData.WIDGET_NOWHERE;
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Theme/win32/org/eclipse/swt/internal/theme/GroupDrawData.java b/bundles/org.eclipse.swt/Eclipse SWT Theme/win32/org/eclipse/swt/internal/theme/GroupDrawData.java
index beb2091..4d5c4cc 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Theme/win32/org/eclipse/swt/internal/theme/GroupDrawData.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Theme/win32/org/eclipse/swt/internal/theme/GroupDrawData.java
@@ -24,6 +24,7 @@
static final int GROUP_HEADER_X = 9;
static final int GROUP_HEADER_PAD = 2;
+@Override
void draw(Theme theme, GC gc, Rectangle bounds) {
if (OS.COMCTL32_MAJOR >= 6 && OS.IsAppThemed ()) {
long /*int*/ hTheme = OS.OpenThemeData(0, getClassId());
@@ -58,6 +59,7 @@
}
}
+@Override
int[] getPartId(int part) {
int state = this.state[part];
int iPartId = OS.BP_GROUPBOX, iStateId = OS.GBS_NORMAL;
@@ -65,6 +67,7 @@
return new int[]{iPartId, iStateId};
}
+@Override
int hit(Theme theme, Point position, Rectangle bounds) {
return bounds.contains(position) ? DrawData.WIDGET_WHOLE : DrawData.WIDGET_NOWHERE;
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Theme/win32/org/eclipse/swt/internal/theme/ProgressBarDrawData.java b/bundles/org.eclipse.swt/Eclipse SWT Theme/win32/org/eclipse/swt/internal/theme/ProgressBarDrawData.java
index 7fdeaae..57a4e75 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Theme/win32/org/eclipse/swt/internal/theme/ProgressBarDrawData.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Theme/win32/org/eclipse/swt/internal/theme/ProgressBarDrawData.java
@@ -20,6 +20,7 @@
state = new int[1];
}
+@Override
void draw(Theme theme, GC gc, Rectangle bounds) {
if (OS.COMCTL32_MAJOR >= 6 && OS.IsAppThemed ()) {
long /*int*/ hTheme = OS.OpenThemeData(0, getClassId());
@@ -66,10 +67,12 @@
}
}
+@Override
char[] getClassId() {
return PROGRESS;
}
+@Override
int[] getPartId(int part) {
int iPartId = 0, iStateId = 0;
if ((style & SWT.VERTICAL) != 0) {
@@ -80,6 +83,7 @@
return new int[]{iPartId, iStateId};
}
+@Override
int hit(Theme theme, Point position, Rectangle bounds) {
return bounds.contains(position) ? DrawData.WIDGET_WHOLE : DrawData.WIDGET_NOWHERE;
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Theme/win32/org/eclipse/swt/internal/theme/ScaleDrawData.java b/bundles/org.eclipse.swt/Eclipse SWT Theme/win32/org/eclipse/swt/internal/theme/ScaleDrawData.java
index 028b79e..9fcd3fe 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Theme/win32/org/eclipse/swt/internal/theme/ScaleDrawData.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Theme/win32/org/eclipse/swt/internal/theme/ScaleDrawData.java
@@ -24,6 +24,7 @@
state = new int[4];
}
+@Override
void draw(Theme theme, GC gc, Rectangle bounds) {
if (OS.COMCTL32_MAJOR >= 6 && OS.IsAppThemed ()) {
// TODO - drawScale not done
@@ -86,10 +87,12 @@
}
}
+@Override
char[] getClassId() {
return TRACKBAR;
}
+@Override
int hit(Theme theme, Point position, Rectangle bounds) {
return bounds.contains(position) ? DrawData.WIDGET_WHOLE : DrawData.WIDGET_NOWHERE;
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Theme/win32/org/eclipse/swt/internal/theme/ScrollBarDrawData.java b/bundles/org.eclipse.swt/Eclipse SWT Theme/win32/org/eclipse/swt/internal/theme/ScrollBarDrawData.java
index 6b79330..063839c 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Theme/win32/org/eclipse/swt/internal/theme/ScrollBarDrawData.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Theme/win32/org/eclipse/swt/internal/theme/ScrollBarDrawData.java
@@ -23,6 +23,7 @@
state = new int[6];
}
+@Override
void draw(Theme theme, GC gc, Rectangle bounds) {
if (OS.COMCTL32_MAJOR >= 6 && OS.IsAppThemed ()) {
long /*int*/ hTheme = OS.OpenThemeData(0, getClassId());
@@ -89,10 +90,12 @@
}
}
+@Override
char[] getClassId() {
return SCROLLBAR;
}
+@Override
int[] getPartId(int part) {
int iPartId = 0, iStateId = 0;
int state = this.state[part];
@@ -157,6 +160,7 @@
return new int[]{iPartId, iStateId};
}
+@Override
Rectangle getBounds(int part, Rectangle bounds) {
if (OS.COMCTL32_MAJOR >= 6 && OS.IsAppThemed ()) {
long /*int*/ hTheme = OS.OpenThemeData(0, getClassId());
@@ -185,6 +189,7 @@
return super.getBounds(part, bounds);
}
+@Override
int getSelection(Point position, Rectangle bounds) {
if (OS.COMCTL32_MAJOR >= 6 && OS.IsAppThemed ()) {
long /*int*/ hTheme = OS.OpenThemeData(0, getClassId());
@@ -203,6 +208,7 @@
return 0;
}
+@Override
int hit(Theme theme, Point position, Rectangle bounds) {
if (!(OS.COMCTL32_MAJOR >= 6 && OS.IsAppThemed ())) return -1;
long /*int*/ hTheme = OS.OpenThemeData(0, getClassId());
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Theme/win32/org/eclipse/swt/internal/theme/TabFolderDrawData.java b/bundles/org.eclipse.swt/Eclipse SWT Theme/win32/org/eclipse/swt/internal/theme/TabFolderDrawData.java
index 593bffb..2cccfc8 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Theme/win32/org/eclipse/swt/internal/theme/TabFolderDrawData.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Theme/win32/org/eclipse/swt/internal/theme/TabFolderDrawData.java
@@ -29,6 +29,7 @@
}
}
+@Override
void draw(Theme theme, GC gc, Rectangle bounds) {
if (OS.COMCTL32_MAJOR >= 6 && OS.IsAppThemed ()) {
long /*int*/ hTheme = OS.OpenThemeData(0, getClassId());
@@ -57,10 +58,12 @@
}
}
+@Override
char[] getClassId() {
return TAB;
}
+@Override
int[] getPartId(int part) {
int state = this.state[part];
int iPartId = OS.TABP_PANE, iStateId = OS.TIS_NORMAL;
@@ -73,6 +76,7 @@
return new int[]{iPartId, iStateId};
}
+@Override
int hit(Theme theme, Point position, Rectangle bounds) {
if (!bounds.contains(position)) return DrawData.WIDGET_NOWHERE;
return DrawData.WIDGET_WHOLE;
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Theme/win32/org/eclipse/swt/internal/theme/TabItemDrawData.java b/bundles/org.eclipse.swt/Eclipse SWT Theme/win32/org/eclipse/swt/internal/theme/TabItemDrawData.java
index 044a59c..2248cd8 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Theme/win32/org/eclipse/swt/internal/theme/TabItemDrawData.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Theme/win32/org/eclipse/swt/internal/theme/TabItemDrawData.java
@@ -26,6 +26,7 @@
state = new int[1];
}
+@Override
Rectangle computeTrim(Theme theme, GC gc) {
if (OS.COMCTL32_MAJOR >= 6 && OS.IsAppThemed ()) {
long /*int*/ hTheme = OS.OpenThemeData(0, getClassId());
@@ -53,6 +54,7 @@
return new Rectangle(0, 0, 0, 0);
}
+@Override
void draw(Theme theme, GC gc, Rectangle bounds) {
if (OS.COMCTL32_MAJOR >= 6 && OS.IsAppThemed ()) {
int state = this.state[DrawData.WIDGET_WHOLE];
@@ -91,10 +93,12 @@
}
}
+@Override
char[] getClassId() {
return TAB;
}
+@Override
int[] getPartId(int part) {
int state = this.state[part];
int iPartId = OS.TABP_TABITEM, iStateId = OS.TIS_NORMAL;
@@ -111,6 +115,7 @@
return new int[]{iPartId, iStateId};
}
+@Override
int hit(Theme theme, Point position, Rectangle bounds) {
if (!bounds.contains(position)) return DrawData.WIDGET_NOWHERE;
int style = this.style;
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Theme/win32/org/eclipse/swt/internal/theme/ToolBarDrawData.java b/bundles/org.eclipse.swt/Eclipse SWT Theme/win32/org/eclipse/swt/internal/theme/ToolBarDrawData.java
index cce5953..a55f64a 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Theme/win32/org/eclipse/swt/internal/theme/ToolBarDrawData.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Theme/win32/org/eclipse/swt/internal/theme/ToolBarDrawData.java
@@ -18,13 +18,16 @@
state = new int[1];
}
+@Override
void draw(Theme theme, GC gc, Rectangle bounds) {
}
+@Override
char[] getClassId() {
return TOOLBAR;
}
+@Override
int hit(Theme theme, Point position, Rectangle bounds) {
if (!bounds.contains(position)) return DrawData.WIDGET_NOWHERE;
return DrawData.WIDGET_WHOLE;
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Theme/win32/org/eclipse/swt/internal/theme/ToolItemDrawData.java b/bundles/org.eclipse.swt/Eclipse SWT Theme/win32/org/eclipse/swt/internal/theme/ToolItemDrawData.java
index de5452d..1d204d0 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Theme/win32/org/eclipse/swt/internal/theme/ToolItemDrawData.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Theme/win32/org/eclipse/swt/internal/theme/ToolItemDrawData.java
@@ -24,6 +24,7 @@
state = new int[2];
}
+@Override
Rectangle computeTrim(Theme theme, GC gc) {
if (OS.COMCTL32_MAJOR >= 6 && OS.IsAppThemed ()) {
long /*int*/ hTheme = OS.OpenThemeData(0, getClassId());
@@ -52,6 +53,7 @@
return new Rectangle(0, 0, 0, 0);
}
+@Override
void draw(Theme theme, GC gc, Rectangle bounds) {
if (OS.COMCTL32_MAJOR >= 6 && OS.IsAppThemed ()) {
long /*int*/ hTheme = OS.OpenThemeData(0, getClassId());
@@ -89,10 +91,12 @@
}
}
+@Override
char[] getClassId() {
return TOOLBAR;
}
+@Override
int[] getPartId(int part) {
int state = this.state[part];
int iPartId = 0, iStateId = 0;
@@ -134,6 +138,7 @@
return new int[]{iPartId, iStateId};
}
+@Override
int hit(Theme theme, Point position, Rectangle bounds) {
if (!(OS.COMCTL32_MAJOR >= 6 && OS.IsAppThemed ())) return DrawData.WIDGET_NOWHERE;
if (!bounds.contains(position)) return DrawData.WIDGET_NOWHERE;
diff --git a/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/browser/WebDownloadDelegate.java b/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/browser/WebDownloadDelegate.java
index 117c305..6916d81 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/browser/WebDownloadDelegate.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/browser/WebDownloadDelegate.java
@@ -46,20 +46,35 @@
void createCOMInterfaces () {
iWebDownloadDelegate = new COMObject (new int[] {2, 0, 0, 2, 2, 2, 2, 2, 2, 2, 3, 3, 4, 1, 1}) {
+ @Override
public long /*int*/ method0 (long /*int*/[] args) {return QueryInterface (args[0], args[1]);}
+ @Override
public long /*int*/ method1 (long /*int*/[] args) {return AddRef ();}
+ @Override
public long /*int*/ method2 (long /*int*/[] args) {return Release ();}
+ @Override
public long /*int*/ method3 (long /*int*/[] args) {return decideDestinationWithSuggestedFilename (args[0], args[1]);}
+ @Override
public long /*int*/ method4 (long /*int*/[] args) {return COM.E_NOTIMPL;}
+ @Override
public long /*int*/ method5 (long /*int*/[] args) {return COM.E_NOTIMPL;}
+ @Override
public long /*int*/ method6 (long /*int*/[] args) {return didFailWithError (args[0], args[1]);}
+ @Override
public long /*int*/ method7 (long /*int*/[] args) {return COM.E_NOTIMPL;}
+ @Override
public long /*int*/ method8 (long /*int*/[] args) {return didReceiveDataOfLength (args[0], (int)/*64*/args[1]);}
+ @Override
public long /*int*/ method9 (long /*int*/[] args) {return didReceiveResponse (args[0], args[1]);}
+ @Override
public long /*int*/ method10 (long /*int*/[] args) {return COM.E_NOTIMPL;}
+ @Override
public long /*int*/ method11 (long /*int*/[] args) {return COM.E_NOTIMPL;}
+ @Override
public long /*int*/ method12 (long /*int*/[] args) {return willSendRequest (args[0], args[1], args[2], args[3]);}
+ @Override
public long /*int*/ method13 (long /*int*/[] args) {return didBegin (args[0]);}
+ @Override
public long /*int*/ method14 (long /*int*/[] args) {return didFinish (args[0]);}
};
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/browser/WebFrameLoadDelegate.java b/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/browser/WebFrameLoadDelegate.java
index 10df81d..1658bd9 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/browser/WebFrameLoadDelegate.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/browser/WebFrameLoadDelegate.java
@@ -85,22 +85,39 @@
void createCOMInterfaces () {
iWebFrameLoadDelegate = new COMObject (new int[] {2, 0, 0, 2, 2, 3, 2, 3, 3, 2, 3, 2, 5, 2, 2, 3, 4}) {
+ @Override
public long /*int*/ method0 (long /*int*/[] args) {return QueryInterface (args[0], args[1]);}
+ @Override
public long /*int*/ method1 (long /*int*/[] args) {return AddRef ();}
+ @Override
public long /*int*/ method2 (long /*int*/[] args) {return Release ();}
+ @Override
public long /*int*/ method3 (long /*int*/[] args) {return didStartProvisionalLoadForFrame (args[0], args[1]);}
+ @Override
public long /*int*/ method4 (long /*int*/[] args) {return COM.E_NOTIMPL;}
+ @Override
public long /*int*/ method5 (long /*int*/[] args) {return didFailProvisionalLoadWithError (args[0], args[1], args[2]);}
+ @Override
public long /*int*/ method6 (long /*int*/[] args) {return didCommitLoadForFrame (args[0], args[1]);}
+ @Override
public long /*int*/ method7 (long /*int*/[] args) {return didReceiveTitle (args[0], args[1], args[2]);}
+ @Override
public long /*int*/ method8 (long /*int*/[] args) {return COM.E_NOTIMPL;}
+ @Override
public long /*int*/ method9 (long /*int*/[] args) {return didFinishLoadForFrame (args[0], args[1]);}
+ @Override
public long /*int*/ method10 (long /*int*/[] args){return COM.E_NOTIMPL;}
+ @Override
public long /*int*/ method11 (long /*int*/[] args){return didChangeLocationWithinPageForFrame (args[0], args[1]);}
+ @Override
public long /*int*/ method12 (long /*int*/[] args){return COM.S_OK;}
+ @Override
public long /*int*/ method13 (long /*int*/[] args){return COM.E_NOTIMPL;}
+ @Override
public long /*int*/ method14 (long /*int*/[] args){return COM.S_OK;}
+ @Override
public long /*int*/ method15 (long /*int*/[] args){return COM.S_OK;}
+ @Override
public long /*int*/ method16 (long /*int*/[] args){return didClearWindowObject (args[0], args[1], args[2], args[3]);}
};
@@ -729,6 +746,7 @@
ok.setLayoutData (layoutData);
ok.setText (SWT.getMessage ("SWT_OK")); //$NON-NLS-1$
ok.addSelectionListener (new SelectionAdapter() {
+ @Override
public void widgetSelected (SelectionEvent e) {
dialog.dispose ();
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/browser/WebKit.java b/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/browser/WebKit.java
index 45dfd00..53350d6 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/browser/WebKit.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/browser/WebKit.java
@@ -389,6 +389,7 @@
return new String (bytes);
}
+@Override
public boolean back () {
int[] result = new int[1];
webView.goBack (result);
@@ -440,6 +441,7 @@
return convertToJS (ctx, returnValue);
}
+@Override
public boolean close () {
return shouldClose ();
}
@@ -537,6 +539,7 @@
return 0;
}
+@Override
public void create (Composite parent, int style) {
if (!LibraryLoaded) {
browser.dispose ();
@@ -675,12 +678,14 @@
browser.addListener (SWT.Traverse, listener);
eventFunction = new BrowserFunction (browser, "HandleWebKitEvent") { //$NON-NLS-1$
+ @Override
public Object function (Object[] arguments) {
return handleEvent (arguments) ? Boolean.TRUE : Boolean.FALSE;
};
};
}
+@Override
public boolean execute (String script) {
long /*int*/[] result = new long /*int*/[1];
int hr = webView.mainFrame (result);
@@ -717,16 +722,19 @@
return evalResult != 0;
}
+@Override
public boolean forward () {
int[] result = new int[1];
webView.goForward (result);
return result[0] != 0;
}
+@Override
public String getBrowserType () {
return "webkit"; //$NON-NLS-1$
}
+@Override
public String getText () {
long /*int*/[] result = new long /*int*/[1];
int hr = webView.mainFrame (result);
@@ -759,6 +767,7 @@
return source;
}
+@Override
public String getUrl () {
return webFrameLoadDelegate.getUrl ();
}
@@ -1009,6 +1018,7 @@
return true;
}
+@Override
public boolean isBackEnabled () {
long /*int*/[] address = new long /*int*/[1];
int hr = webView.QueryInterface (WebKit_win32.IID_IWebIBActions, address);
@@ -1022,11 +1032,13 @@
return result[0] != 0;
}
+@Override
public boolean isFocusControl () {
long /*int*/ hwndFocus = OS.GetFocus ();
return hwndFocus != 0 && hwndFocus == webViewWindowHandle;
}
+@Override
public boolean isForwardEnabled () {
long /*int*/[] address = new long /*int*/[1];
int hr = webView.QueryInterface (WebKit_win32.IID_IWebIBActions, address);
@@ -1078,6 +1090,7 @@
lastNavigateURL = null;
}
+@Override
public void refresh () {
webFrameLoadDelegate.html = null;
long /*int*/[] result = new long /*int*/[1];
@@ -1090,6 +1103,7 @@
webIBActions.Release ();
}
+@Override
boolean sendKeyEvent (Event event) {
/*
* browser.traverse() is called through dislay.translateTraversal() for all
@@ -1129,6 +1143,7 @@
return doit;
}
+@Override
public boolean setText (String html, boolean trusted) {
/*
* If this.html is not null then the about:blank page is already being loaded,
@@ -1166,6 +1181,7 @@
return hr == COM.S_OK;
}
+@Override
public boolean setUrl (String url, String postData, String[] headers) {
if (url.length () == 0) return false;
/*
@@ -1286,6 +1302,7 @@
return result[0] != 0;
}
+@Override
public void stop () {
webFrameLoadDelegate.html = null;
long /*int*/[] result = new long /*int*/[1];
diff --git a/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/browser/WebPolicyDelegate.java b/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/browser/WebPolicyDelegate.java
index 16f478b..fe8693b 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/browser/WebPolicyDelegate.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/browser/WebPolicyDelegate.java
@@ -36,12 +36,19 @@
void createCOMInterfaces () {
iWebPolicyDelegate = new COMObject (new int[] {2, 0, 0, 5, 5, 5, 3}) {
+ @Override
public long /*int*/ method0 (long /*int*/[] args) {return QueryInterface (args[0], args[1]);}
+ @Override
public long /*int*/ method1 (long /*int*/[] args) {return AddRef ();}
+ @Override
public long /*int*/ method2 (long /*int*/[] args) {return Release ();}
+ @Override
public long /*int*/ method3 (long /*int*/[] args) {return decidePolicyForNavigationAction (args[0], args[1], args[2], args[3], args[4]);}
+ @Override
public long /*int*/ method4 (long /*int*/[] args) {return decidePolicyForNewWindowAction (args[0], args[1], args[2], args[3], args[4]);}
+ @Override
public long /*int*/ method5 (long /*int*/[] args) {return decidePolicyForMIMEType (args[0], args[1], args[2], args[3], args[4]);}
+ @Override
public long /*int*/ method6 (long /*int*/[] args) {return unableToImplementPolicyWithError (args[0], args[1], args[2]);}
};
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/browser/WebResourceLoadDelegate.java b/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/browser/WebResourceLoadDelegate.java
index 66ba1b3..b2ab8db 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/browser/WebResourceLoadDelegate.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/browser/WebResourceLoadDelegate.java
@@ -39,17 +39,29 @@
void createCOMInterfaces () {
iWebResourceLoadDelegate = new COMObject (new int[] {2, 0, 0, 4, 6, 4, 4, 4, 4, 3, 4, 3}) {
+ @Override
public long /*int*/ method0 (long /*int*/[] args) {return QueryInterface (args[0], args[1]);}
+ @Override
public long /*int*/ method1 (long /*int*/[] args) {return AddRef ();}
+ @Override
public long /*int*/ method2 (long /*int*/[] args) {return Release ();}
+ @Override
public long /*int*/ method3 (long /*int*/[] args) {return identifierForInitialRequest (args[0], args[1], args[2], args[3]);}
+ @Override
public long /*int*/ method4 (long /*int*/[] args) {return willSendRequest (args[0], args[1], args[2], args[3], args[4], args[5]);}
+ @Override
public long /*int*/ method5 (long /*int*/[] args) {return didReceiveAuthenticationChallenge (args[0], args[1], args[2], args[3]);}
+ @Override
public long /*int*/ method6 (long /*int*/[] args) {return COM.E_NOTIMPL;}
+ @Override
public long /*int*/ method7 (long /*int*/[] args) {return COM.S_OK;}
+ @Override
public long /*int*/ method8 (long /*int*/[] args) {return COM.S_OK;}
+ @Override
public long /*int*/ method9 (long /*int*/[] args) {return COM.S_OK;}
+ @Override
public long /*int*/ method10 (long /*int*/[] args) {return COM.S_OK;}
+ @Override
public long /*int*/ method11 (long /*int*/[] args) {return COM.E_NOTIMPL;}
};
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/browser/WebUIDelegate.java b/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/browser/WebUIDelegate.java
index f94b096..4dcca90 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/browser/WebUIDelegate.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/browser/WebUIDelegate.java
@@ -71,71 +71,137 @@
void createCOMInterfaces () {
iWebUIDelegate = new COMObject (new int[] {2, 0, 0, 3, 1, 1, 1, 1, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 3, 4, 4, 2, 3, 4, 4, 3, 3, 3, 3, 5, 3, 1, 3, 2, 2, 2, 2, 3, 2, 3, 1, 1, 0, 0, 1, 1, 2, 2, 2, 2, 3, 5, 2, 2, 3, 1, 2, 2, 4, 10, 3}) {
+ @Override
public long /*int*/ method0 (long /*int*/[] args) {return QueryInterface (args[0], args[1]);}
+ @Override
public long /*int*/ method1 (long /*int*/[] args) {return AddRef ();}
+ @Override
public long /*int*/ method2 (long /*int*/[] args) {return Release ();}
+ @Override
public long /*int*/ method3 (long /*int*/[] args) {return createWebViewWithRequest (args[0], args[1], args[2]);}
+ @Override
public long /*int*/ method4 (long /*int*/[] args) {return webViewShow (args[0]);}
+ @Override
public long /*int*/ method5 (long /*int*/[] args) {return webViewClose (args[0]);}
+ @Override
public long /*int*/ method6 (long /*int*/[] args) {return COM.E_NOTIMPL;}
+ @Override
public long /*int*/ method7 (long /*int*/[] args) {return COM.E_NOTIMPL;}
+ @Override
public long /*int*/ method8 (long /*int*/[] args) {return COM.E_NOTIMPL;}
+ @Override
public long /*int*/ method9 (long /*int*/[] args) {return COM.E_NOTIMPL;}
+ @Override
public long /*int*/ method10 (long /*int*/[] args) {return setStatusText (args[0], args[1]);}
+ @Override
public long /*int*/ method11 (long /*int*/[] args) {return COM.E_NOTIMPL;}
+ @Override
public long /*int*/ method12 (long /*int*/[] args) {return COM.E_NOTIMPL;}
+ @Override
public long /*int*/ method13 (long /*int*/[] args) {return setToolbarsVisible (args[0], (int)/*64*/args[1]);}
+ @Override
public long /*int*/ method14 (long /*int*/[] args) {return COM.E_NOTIMPL;}
+ @Override
public long /*int*/ method15 (long /*int*/[] args) {return setStatusBarVisible (args[0], (int)/*64*/args[1]);}
+ @Override
public long /*int*/ method16 (long /*int*/[] args) {return COM.E_NOTIMPL;}
+ @Override
public long /*int*/ method17 (long /*int*/[] args) {return COM.E_NOTIMPL;}
+ @Override
public long /*int*/ method18 (long /*int*/[] args) {return setFrame (args[0], args[1]);}
+ @Override
public long /*int*/ method19 (long /*int*/[] args) {return COM.E_NOTIMPL;}
+ @Override
public long /*int*/ method20 (long /*int*/[] args) {return COM.E_NOTIMPL;}
+ @Override
public long /*int*/ method21 (long /*int*/[] args) {return COM.E_NOTIMPL;}
+ @Override
public long /*int*/ method22 (long /*int*/[] args) {return runJavaScriptAlertPanelWithMessage (args[0], args[1]);}
+ @Override
public long /*int*/ method23 (long /*int*/[] args) {return runJavaScriptConfirmPanelWithMessage (args[0], args[1], args[2]);}
+ @Override
public long /*int*/ method24 (long /*int*/[] args) {return runJavaScriptTextInputPanelWithPrompt (args[0], args[1], args[2], args[3]);}
+ @Override
public long /*int*/ method25 (long /*int*/[] args) {return runBeforeUnloadConfirmPanelWithMessage (args[0], args[1], args[2], args[3]);}
+ @Override
public long /*int*/ method26 (long /*int*/[] args) {return runOpenPanelForFileButtonWithResultListener (args[0], args[1]);}
+ @Override
public long /*int*/ method27 (long /*int*/[] args) {return mouseDidMoveOverElement (args[0], args[1], (int)/*64*/args[2]);}
+ @Override
public long /*int*/ method28 (long /*int*/[] args) {return contextMenuItemsForElement (args[0], args[1], args[2], args[3]);}
+ @Override
public long /*int*/ method29 (long /*int*/[] args) {return COM.E_NOTIMPL;}
+ @Override
public long /*int*/ method30 (long /*int*/[] args) {return COM.E_NOTIMPL;}
+ @Override
public long /*int*/ method31 (long /*int*/[] args) {return COM.E_NOTIMPL;}
+ @Override
public long /*int*/ method32 (long /*int*/[] args) {return COM.E_NOTIMPL;}
+ @Override
public long /*int*/ method33 (long /*int*/[] args) {return COM.E_NOTIMPL;}
+ @Override
public long /*int*/ method34 (long /*int*/[] args) {return COM.E_NOTIMPL;}
+ @Override
public long /*int*/ method35 (long /*int*/[] args) {return COM.E_NOTIMPL;}
+ @Override
public long /*int*/ method36 (long /*int*/[] args) {return COM.E_NOTIMPL;}
+ @Override
public long /*int*/ method37 (long /*int*/[] args) {return COM.E_NOTIMPL;}
+ @Override
public long /*int*/ method38 (long /*int*/[] args) {return COM.E_NOTIMPL;}
+ @Override
public long /*int*/ method39 (long /*int*/[] args) {return COM.E_NOTIMPL;}
+ @Override
public long /*int*/ method40 (long /*int*/[] args) {return COM.E_NOTIMPL;}
+ @Override
public long /*int*/ method41 (long /*int*/[] args) {return COM.E_NOTIMPL;}
+ @Override
public long /*int*/ method42 (long /*int*/[] args) {return canTakeFocus (args[0], (int)/*64*/args[1], args[2]);}
+ @Override
public long /*int*/ method43 (long /*int*/[] args) {return takeFocus (args[0], (int)/*64*/args[1]);}
+ @Override
public long /*int*/ method44 (long /*int*/[] args) {return COM.E_NOTIMPL;}
+ @Override
public long /*int*/ method45 (long /*int*/[] args) {return COM.S_OK;}
+ @Override
public long /*int*/ method46 (long /*int*/[] args) {return COM.E_NOTIMPL;}
+ @Override
public long /*int*/ method47 (long /*int*/[] args) {return COM.E_NOTIMPL;}
+ @Override
public long /*int*/ method48 (long /*int*/[] args) {return COM.E_NOTIMPL;}
+ @Override
public long /*int*/ method49 (long /*int*/[] args) {return COM.E_NOTIMPL;}
+ @Override
public long /*int*/ method50 (long /*int*/[] args) {return COM.E_NOTIMPL;}
+ @Override
public long /*int*/ method51 (long /*int*/[] args) {return printFrame (args[0], args[1]);}
+ @Override
public long /*int*/ method52 (long /*int*/[] args) {return COM.E_NOTIMPL;}
+ @Override
public long /*int*/ method53 (long /*int*/[] args) {return COM.E_NOTIMPL;}
+ @Override
public long /*int*/ method54 (long /*int*/[] args) {return COM.E_NOTIMPL;}
+ @Override
public long /*int*/ method55 (long /*int*/[] args) {return COM.E_NOTIMPL;}
+ @Override
public long /*int*/ method56 (long /*int*/[] args) {return COM.E_NOTIMPL;}
+ @Override
public long /*int*/ method57 (long /*int*/[] args) {return COM.E_NOTIMPL;}
+ @Override
public long /*int*/ method58 (long /*int*/[] args) {return COM.E_NOTIMPL;}
+ @Override
public long /*int*/ method59 (long /*int*/[] args) {return COM.E_NOTIMPL;}
+ @Override
public long /*int*/ method60 (long /*int*/[] args) {return COM.E_NOTIMPL;}
+ @Override
public long /*int*/ method61 (long /*int*/[] args) {return COM.E_NOTIMPL;}
+ @Override
public long /*int*/ method62 (long /*int*/[] args) {return setMenuBarVisible (args[0], (int)/*64*/args[1]);}
+ @Override
public long /*int*/ method63 (long /*int*/[] args) {return COM.E_NOTIMPL;}
+ @Override
public long /*int*/ method64 (long /*int*/[] args) {return COM.E_NOTIMPL;}
+ @Override
public long /*int*/ method65 (long /*int*/[] args) {return COM.E_NOTIMPL;}
};
}
@@ -464,6 +530,7 @@
ok.setLayoutData (layoutData);
ok.addSelectionListener (new SelectionAdapter () {
+ @Override
public void widgetSelected (SelectionEvent e) {
dialog.dispose ();
}
@@ -527,12 +594,14 @@
final int[] result = new int[1];
ok.addSelectionListener (new SelectionAdapter () {
+ @Override
public void widgetSelected (SelectionEvent e) {
result[0] = SWT.OK;
dialog.dispose ();
}
});
cancel.addSelectionListener (new SelectionAdapter () {
+ @Override
public void widgetSelected (SelectionEvent e) {
result[0] = SWT.CANCEL;
dialog.dispose ();
@@ -579,6 +648,7 @@
final String[] result = new String[1];
ok.addSelectionListener (new SelectionAdapter () {
+ @Override
public void widgetSelected (SelectionEvent e) {
result[0] = textBox.getText ();
dialog.dispose ();
@@ -588,6 +658,7 @@
cancel.setText (SWT.getMessage ("SWT_Cancel")); //$NON-NLS-1$
cancel.setLayoutData (new GridData (GridData.FILL_HORIZONTAL));
cancel.addSelectionListener (new SelectionAdapter () {
+ @Override
public void widgetSelected (SelectionEvent e) {
dialog.dispose ();
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/Color.java b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/Color.java
index f5be285..35dbf57 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/Color.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/Color.java
@@ -209,6 +209,7 @@
init();
}
+@Override
void destroy() {
/*
* If this is a palette-based device,
@@ -237,6 +238,7 @@
*
* @see #hashCode
*/
+@Override
public boolean equals (Object object) {
if (object == this) return true;
if (!(object instanceof Color)) return false;
@@ -339,6 +341,7 @@
*
* @see #equals
*/
+@Override
public int hashCode () {
return handle ^ alpha;
}
@@ -415,6 +418,7 @@
*
* @return <code>true</code> when the color is disposed and <code>false</code> otherwise
*/
+@Override
public boolean isDisposed() {
return handle == -1;
}
@@ -425,6 +429,7 @@
*
* @return a string representation of the receiver
*/
+@Override
public String toString () {
if (isDisposed()) return "Color {*DISPOSED*}"; //$NON-NLS-1$
return "Color {" + getRed() + ", " + getGreen() + ", " + getBlue() + ", " + getAlpha() + "}"; //$NON-NLS-1$//$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/Cursor.java b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/Cursor.java
index 96f06b7..cb95ef2 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/Cursor.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/Cursor.java
@@ -411,6 +411,7 @@
init();
}
+@Override
void destroy () {
/*
* It is an error in Windows to destroy the current
@@ -451,6 +452,7 @@
*
* @see #hashCode
*/
+@Override
public boolean equals (Object object) {
if (object == this) return true;
if (!(object instanceof Cursor)) return false;
@@ -468,6 +470,7 @@
*
* @see #equals
*/
+@Override
public int hashCode () {
return (int)/*64*/handle;
}
@@ -482,6 +485,7 @@
*
* @return <code>true</code> when the cursor is disposed and <code>false</code> otherwise
*/
+@Override
public boolean isDisposed() {
return handle == 0;
}
@@ -492,6 +496,7 @@
*
* @return a string representation of the receiver
*/
+@Override
public String toString () {
if (isDisposed()) return "Cursor {*DISPOSED*}";
return "Cursor {" + handle + "}";
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/Font.java b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/Font.java
index 576a034..d637a67 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/Font.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/Font.java
@@ -152,6 +152,7 @@
init(new FontData (name, height, style));
init();
}
+@Override
void destroy() {
OS.DeleteObject(handle);
handle = 0;
@@ -167,6 +168,7 @@
*
* @see #hashCode
*/
+@Override
public boolean equals(Object object) {
if (object == this) return true;
if (!(object instanceof Font)) return false;
@@ -203,6 +205,7 @@
*
* @see #equals
*/
+@Override
public int hashCode () {
return (int)/*64*/handle;
}
@@ -227,6 +230,7 @@
*
* @return <code>true</code> when the font is disposed and <code>false</code> otherwise
*/
+@Override
public boolean isDisposed() {
return handle == 0;
}
@@ -237,6 +241,7 @@
*
* @return a string representation of the receiver
*/
+@Override
public String toString () {
if (isDisposed()) return "Font {*DISPOSED*}";
return "Font {" + handle + "}";
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/FontData.java b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/FontData.java
index 9a9521c..7526201 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/FontData.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/FontData.java
@@ -292,6 +292,7 @@
*
* @see #hashCode
*/
+@Override
public boolean equals (Object object) {
if (object == this) return true;
if (!(object instanceof FontData)) return false;
@@ -459,6 +460,7 @@
*
* @see #equals
*/
+@Override
public int hashCode () {
return data.lfCharSet ^ getHeight() << 8 ^ data.lfWidth ^ data.lfEscapement ^
data.lfOrientation ^ data.lfWeight ^ data.lfItalic ^ data.lfUnderline ^
@@ -611,6 +613,7 @@
*
* @see FontData
*/
+@Override
public String toString() {
StringBuffer buffer = new StringBuffer(128);
buffer.append("1|"); //$NON-NLS-1$
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/FontMetrics.java b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/FontMetrics.java
index 52c69f7..aec716d 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/FontMetrics.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/FontMetrics.java
@@ -55,6 +55,7 @@
*
* @see #hashCode
*/
+@Override
public boolean equals (Object object) {
if (object == this) return true;
if (!(object instanceof FontMetrics)) return false;
@@ -151,6 +152,7 @@
*
* @see #equals
*/
+@Override
public int hashCode() {
return handle.tmHeight ^ handle.tmAscent ^ handle.tmDescent ^
handle.tmInternalLeading ^ handle.tmExternalLeading ^
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/GC.java b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/GC.java
index 11e15b2..bd46218 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/GC.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/GC.java
@@ -644,6 +644,7 @@
* <li>ERROR_THREAD_INVALID_ACCESS if not called from the thread that created the drawable</li>
* </ul>
*/
+@Override
void destroy() {
boolean gdip = data.gdipGraphics != 0;
disposeGdip();
@@ -2649,6 +2650,7 @@
*
* @see #hashCode
*/
+@Override
public boolean equals (Object object) {
return (object == this) || ((object instanceof GC) && (handle == ((GC)object).handle));
}
@@ -3981,6 +3983,7 @@
*
* @see #equals
*/
+@Override
public int hashCode () {
return (int)/*64*/handle;
}
@@ -4025,6 +4028,7 @@
*
* @return <code>true</code> when the GC is disposed and <code>false</code> otherwise
*/
+@Override
public boolean isDisposed() {
return handle == 0;
}
@@ -4812,6 +4816,7 @@
*
* @deprecated this functionality is not supported on some platforms
*/
+@Deprecated
public void setXORMode(boolean xor) {
if (handle == 0) SWT.error(SWT.ERROR_GRAPHIC_DISPOSED);
OS.SetROP2(handle, xor ? OS.R2_XORPEN : OS.R2_COPYPEN);
@@ -5042,6 +5047,7 @@
*
* @return a string representation of the receiver
*/
+@Override
public String toString () {
if (isDisposed()) return "GC {*DISPOSED*}";
return "GC {" + handle + "}";
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/Path.java b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/Path.java
index ac2f33d..b524f3d 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/Path.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/Path.java
@@ -389,6 +389,7 @@
Gdip.GraphicsPath_GetLastPoint(handle, currentPoint);
}
+@Override
void destroy() {
Gdip.GraphicsPath_delete(handle);
handle = 0;
@@ -554,6 +555,7 @@
*
* @return <code>true</code> when the Path is disposed, and <code>false</code> otherwise
*/
+@Override
public boolean isDisposed() {
return handle == 0;
}
@@ -605,6 +607,7 @@
*
* @return a string representation of the receiver
*/
+@Override
public String toString() {
if (isDisposed()) return "Path {*DISPOSED*}";
return "Path {" + handle + "}";
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/Pattern.java b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/Pattern.java
index 3052e12..b988769 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/Pattern.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/Pattern.java
@@ -214,6 +214,7 @@
init();
}
+@Override
void destroy() {
int type = Gdip.Brush_GetType(handle);
switch (type) {
@@ -243,6 +244,7 @@
*
* @return <code>true</code> when the Pattern is disposed, and <code>false</code> otherwise
*/
+@Override
public boolean isDisposed() {
return handle == 0;
}
@@ -253,6 +255,7 @@
*
* @return a string representation of the receiver
*/
+@Override
public String toString() {
if (isDisposed()) return "Pattern {*DISPOSED*}";
return "Pattern {" + handle + "}";
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/Region.java b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/Region.java
index d784c54..11f92c0 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/Region.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/Region.java
@@ -228,6 +228,7 @@
return contains(pt.x, pt.y);
}
+@Override
void destroy () {
OS.DeleteObject(handle);
handle = 0;
@@ -243,6 +244,7 @@
*
* @see #hashCode
*/
+@Override
public boolean equals (Object object) {
if (this == object) return true;
if (!(object instanceof Region)) return false;
@@ -280,6 +282,7 @@
*
* @see #equals
*/
+@Override
public int hashCode () {
return (int)/*64*/handle;
}
@@ -413,6 +416,7 @@
*
* @return <code>true</code> when the region is disposed, and <code>false</code> otherwise
*/
+@Override
public boolean isDisposed() {
return handle == 0;
}
@@ -577,6 +581,7 @@
*
* @return a string representation of the receiver
*/
+@Override
public String toString () {
if (isDisposed()) return "Region {*DISPOSED*}";
return "Region {" + handle + "}";
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/TextLayout.java b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/TextLayout.java
index ee25e39..556a713 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/TextLayout.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/TextLayout.java
@@ -152,6 +152,7 @@
width = ascent = descent = x = 0;
lineBreak = softBreak = false;
}
+ @Override
public String toString () {
return "StyleItem {" + start + ", " + style + "}";
}
@@ -464,6 +465,7 @@
if (gc == null) device.internal_dispose_GC(hDC, null);
}
+@Override
void destroy () {
freeRuns();
font = null;
@@ -2603,6 +2605,7 @@
*
* @return <code>true</code> when the text layout is disposed and <code>false</code> otherwise
*/
+@Override
public boolean isDisposed () {
return device == null;
}
@@ -3564,6 +3567,7 @@
*
* @return a string representation of the receiver
*/
+@Override
public String toString () {
if (isDisposed()) return "TextLayout {*DISPOSED*}";
return "TextLayout {}";
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/Transform.java b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/Transform.java
index b3b1fc0..25f0bd8 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/Transform.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/Transform.java
@@ -154,6 +154,7 @@
return elements;
}
+@Override
void destroy() {
Gdip.Matrix_delete(handle);
handle = 0;
@@ -219,6 +220,7 @@
*
* @return <code>true</code> when the Transform is disposed, and <code>false</code> otherwise
*/
+@Override
public boolean isDisposed() {
return handle == 0;
}
@@ -370,6 +372,7 @@
*
* @return a string representation of the receiver
*/
+@Override
public String toString() {
if (isDisposed()) return "Transform {*DISPOSED*}";
float[] elements = new float[6];
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Button.java b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Button.java
index 052e1b1..b8385c9 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Button.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Button.java
@@ -340,6 +340,7 @@
addListener (SWT.DefaultSelection,typedListener);
}
+@Override
long /*int*/ callWindowProc (long /*int*/ hwnd, int msg, long /*int*/ wParam, long /*int*/ lParam) {
if (handle == 0) return 0;
return OS.CallWindowProc (ButtonProc, hwnd, msg, wParam, lParam);
@@ -396,6 +397,7 @@
return margin;
}
+@Override
public Point computeSize (int wHint, int hHint, boolean changed) {
checkWidget ();
int width = 0, height = 0, border = getBorderWidth ();
@@ -500,6 +502,7 @@
return new Point (width, height);
}
+@Override
void createHandle () {
/*
* Feature in Windows. When a button is created,
@@ -565,6 +568,7 @@
}
}
+@Override
int defaultBackground () {
if ((style & (SWT.PUSH | SWT.TOGGLE)) != 0) {
return OS.GetSysColor (OS.COLOR_BTNFACE);
@@ -572,10 +576,12 @@
return super.defaultBackground ();
}
+@Override
int defaultForeground () {
return OS.GetSysColor (OS.COLOR_BTNTEXT);
}
+@Override
void enableWidget (boolean enabled) {
super.enableWidget (enabled);
/*
@@ -699,6 +705,7 @@
return message;
}
+@Override
String getNameText () {
return getText ();
}
@@ -744,11 +751,13 @@
return text;
}
+@Override
boolean isTabItem () {
if ((style & SWT.PUSH) != 0) return isTabGroup ();
return super.isTabItem ();
}
+@Override
boolean mnemonicHit (char ch) {
if (!setFocus ()) return false;
/*
@@ -761,12 +770,14 @@
return true;
}
+@Override
boolean mnemonicMatch (char key) {
char mnemonic = findMnemonic (getText ());
if (mnemonic == '\0') return false;
return Character.toUpperCase (key) == Character.toUpperCase (mnemonic);
}
+@Override
void releaseWidget () {
super.releaseWidget ();
if (imageList != null) imageList.dispose ();
@@ -804,6 +815,7 @@
eventTable.unhook (SWT.DefaultSelection,listener);
}
+@Override
int resolveTextDirection() {
return (style & SWT.ARROW) != 0 ? SWT.NONE : resolveTextDirection(text);
}
@@ -904,6 +916,7 @@
OS.SendMessage (handle, OS.BM_SETSTYLE, bits, 1);
}
+@Override
public boolean setFocus () {
checkWidget ();
/*
@@ -1006,11 +1019,13 @@
}
}
+@Override
boolean setRadioFocus (boolean tabbing) {
if ((style & SWT.RADIO) == 0 || !getSelection ()) return false;
return tabbing ? setTabItemFocus () : setFocus ();
}
+@Override
boolean setRadioSelection (boolean value) {
if ((style & SWT.RADIO) == 0) return false;
if (getSelection () != value) {
@@ -1020,6 +1035,7 @@
return true;
}
+@Override
boolean setSavedFocus () {
/*
* Feature in Windows. When a radio button gets focus,
@@ -1108,6 +1124,7 @@
_setText (string);
}
+@Override
boolean updateTextDirection(int textDirection) {
if (super.updateTextDirection(textDirection)) {
// TODO: Keep for now, to follow up
@@ -1148,6 +1165,7 @@
}
}
+@Override
void updateOrientation () {
super.updateOrientation ();
updateImageList ();
@@ -1182,6 +1200,7 @@
}
}
+@Override
int widgetStyle () {
int bits = super.widgetStyle ();
if ((style & SWT.FLAT) != 0) bits |= OS.BS_FLAT;
@@ -1198,15 +1217,18 @@
return bits | OS.BS_PUSHBUTTON | OS.WS_TABSTOP;
}
+@Override
TCHAR windowClass () {
return ButtonClass;
}
+@Override
long /*int*/ windowProc () {
return ButtonProc;
}
+@Override
LRESULT WM_ERASEBKGND (long /*int*/ wParam, long /*int*/ lParam) {
LRESULT result = super.WM_ERASEBKGND (wParam, lParam);
if (result != null) return result;
@@ -1229,6 +1251,7 @@
return result;
}
+@Override
LRESULT WM_GETDLGCODE (long /*int*/ wParam, long /*int*/ lParam) {
LRESULT result = super.WM_GETDLGCODE (wParam, lParam);
if (result != null) return result;
@@ -1238,6 +1261,7 @@
return result;
}
+@Override
LRESULT WM_GETOBJECT (long /*int*/ wParam, long /*int*/ lParam) {
/*
* Ensure that there is an accessible object created for this
@@ -1250,6 +1274,7 @@
return super.WM_GETOBJECT (wParam, lParam);
}
+@Override
LRESULT WM_KILLFOCUS (long /*int*/ wParam, long /*int*/ lParam) {
LRESULT result = super.WM_KILLFOCUS (wParam, lParam);
if ((style & SWT.PUSH) != 0 && getDefault ()) {
@@ -1258,16 +1283,19 @@
return result;
}
+@Override
LRESULT WM_LBUTTONDOWN (long /*int*/ wParam, long /*int*/ lParam) {
if (ignoreMouse) return null;
return super.WM_LBUTTONDOWN (wParam, lParam);
}
+@Override
LRESULT WM_LBUTTONUP (long /*int*/ wParam, long /*int*/ lParam) {
if (ignoreMouse) return null;
return super.WM_LBUTTONUP (wParam, lParam);
}
+@Override
LRESULT WM_SETFOCUS (long /*int*/ wParam, long /*int*/ lParam) {
/*
* Feature in Windows. When Windows sets focus to
@@ -1289,6 +1317,7 @@
return result;
}
+@Override
LRESULT WM_SIZE (long /*int*/ wParam, long /*int*/ lParam) {
LRESULT result = super.WM_SIZE (wParam, lParam);
if (result != null) return result;
@@ -1307,6 +1336,7 @@
return result;
}
+@Override
LRESULT WM_SYSCOLORCHANGE (long /*int*/ wParam, long /*int*/ lParam) {
LRESULT result = super.WM_SYSCOLORCHANGE (wParam, lParam);
if (result != null) return result;
@@ -1314,6 +1344,7 @@
return result;
}
+@Override
LRESULT WM_UPDATEUISTATE (long /*int*/ wParam, long /*int*/ lParam) {
LRESULT result = super.WM_UPDATEUISTATE (wParam, lParam);
if (result != null) return result;
@@ -1359,6 +1390,7 @@
return result;
}
+@Override
LRESULT wmCommandChild (long /*int*/ wParam, long /*int*/ lParam) {
int code = OS.HIWORD (wParam);
switch (code) {
@@ -1380,6 +1412,7 @@
return super.wmCommandChild (wParam, lParam);
}
+@Override
LRESULT wmColorChild (long /*int*/ wParam, long /*int*/ lParam) {
/*
* Bug in Windows. For some reason, the HBRUSH that
@@ -1401,6 +1434,7 @@
return result;
}
+@Override
LRESULT wmDrawChild (long /*int*/ wParam, long /*int*/ lParam) {
if ((style & SWT.ARROW) == 0) return super.wmDrawChild (wParam, lParam);
DRAWITEMSTRUCT struct = new DRAWITEMSTRUCT ();
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Canvas.java b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Canvas.java
index bc9765d..b21ae46 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Canvas.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Canvas.java
@@ -153,6 +153,7 @@
return ime;
}
+@Override
void releaseChildren (boolean destroy) {
if (caret != null) {
caret.release (false);
@@ -165,6 +166,7 @@
super.releaseChildren (destroy);
}
+@Override
void reskinChildren (int flags) {
if (caret != null) caret.reskin (flags);
if (ime != null) ime.reskin (flags);
@@ -294,6 +296,7 @@
}
}
+@Override
public void setFont (Font font) {
checkWidget ();
if (caret != null) caret.setFont (font);
@@ -321,11 +324,13 @@
this.ime = ime;
}
+@Override
TCHAR windowClass () {
if (display.useOwnDC) return display.windowOwnDCClass;
return super.windowClass ();
}
+@Override
long /*int*/ windowProc (long /*int*/ hwnd, int msg, long /*int*/ wParam, long /*int*/ lParam) {
if (msg == Display.SWT_RESTORECARET) {
if ((state & CANVAS) != 0) {
@@ -339,6 +344,7 @@
return super.windowProc (hwnd, msg, wParam, lParam);
}
+@Override
LRESULT WM_CHAR (long /*int*/ wParam, long /*int*/ lParam) {
LRESULT result = super.WM_CHAR (wParam, lParam);
if (result != null) return result;
@@ -361,6 +367,7 @@
return result;
}
+@Override
LRESULT WM_IME_COMPOSITION (long /*int*/ wParam, long /*int*/ lParam) {
if (ime != null) {
LRESULT result = ime.WM_IME_COMPOSITION (wParam, lParam);
@@ -398,6 +405,7 @@
return super.WM_IME_COMPOSITION (wParam, lParam);
}
+@Override
LRESULT WM_IME_COMPOSITION_START (long /*int*/ wParam, long /*int*/ lParam) {
if (ime != null) {
LRESULT result = ime.WM_IME_COMPOSITION_START (wParam, lParam);
@@ -406,6 +414,7 @@
return super.WM_IME_COMPOSITION_START (wParam, lParam);
}
+@Override
LRESULT WM_IME_ENDCOMPOSITION (long /*int*/ wParam, long /*int*/ lParam) {
if (ime != null) {
LRESULT result = ime.WM_IME_ENDCOMPOSITION (wParam, lParam);
@@ -414,6 +423,7 @@
return super.WM_IME_ENDCOMPOSITION (wParam, lParam);
}
+@Override
LRESULT WM_INPUTLANGCHANGE (long /*int*/ wParam, long /*int*/ lParam) {
LRESULT result = super.WM_INPUTLANGCHANGE (wParam, lParam);
if (caret != null && caret.isFocusCaret ()) {
@@ -424,6 +434,7 @@
}
+@Override
LRESULT WM_KEYDOWN (long /*int*/ wParam, long /*int*/ lParam) {
LRESULT result = super.WM_KEYDOWN (wParam, lParam);
if (result != null) return result;
@@ -433,6 +444,7 @@
return result;
}
+@Override
LRESULT WM_KILLFOCUS (long /*int*/ wParam, long /*int*/ lParam) {
if (ime != null) {
LRESULT result = ime.WM_KILLFOCUS (wParam, lParam);
@@ -444,6 +456,7 @@
return result;
}
+@Override
LRESULT WM_LBUTTONDOWN (long /*int*/ wParam, long /*int*/ lParam) {
if (ime != null) {
LRESULT result = ime.WM_LBUTTONDOWN (wParam, lParam);
@@ -452,18 +465,21 @@
return super.WM_LBUTTONDOWN (wParam, lParam);
}
+@Override
LRESULT WM_SETFOCUS (long /*int*/ wParam, long /*int*/ lParam) {
LRESULT result = super.WM_SETFOCUS (wParam, lParam);
if (caret != null && caret.isFocusCaret ()) caret.setFocus ();
return result;
}
+@Override
LRESULT WM_SIZE (long /*int*/ wParam, long /*int*/ lParam) {
LRESULT result = super.WM_SIZE (wParam, lParam);
if (caret != null && caret.isFocusCaret ()) caret.resizeIME ();
return result;
}
+@Override
LRESULT WM_WINDOWPOSCHANGED (long /*int*/ wParam, long /*int*/ lParam) {
LRESULT result = super.WM_WINDOWPOSCHANGED (wParam, lParam);
//if (result != null) return result;
@@ -479,6 +495,7 @@
return result;
}
+@Override
LRESULT WM_WINDOWPOSCHANGING (long /*int*/ wParam, long /*int*/ lParam) {
LRESULT result = super.WM_WINDOWPOSCHANGING (wParam, lParam);
if (result != null) return result;
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Caret.java b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Caret.java
index 748c4bf..42db8fe 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Caret.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Caret.java
@@ -306,11 +306,13 @@
OS.ImmReleaseContext (hwnd, hIMC);
}
+@Override
void releaseParent () {
super.releaseParent ();
if (this == parent.getCaret ()) parent.setCaret (null);
}
+@Override
void releaseWidget () {
super.releaseWidget ();
parent = null;
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Combo.java b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Combo.java
index aa3d4d6f..4fff6dd 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Combo.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Combo.java
@@ -459,6 +459,7 @@
}
}
+@Override
long /*int*/ callWindowProc (long /*int*/ hwnd, int msg, long /*int*/ wParam, long /*int*/ lParam) {
if (handle == 0) return 0;
if (hwnd == handle) {
@@ -511,10 +512,12 @@
return OS.CallNextHookEx (cbtHook, (int)/*64*/nCode, wParam, lParam);
}
+@Override
boolean checkHandle (long /*int*/ hwnd) {
return hwnd == handle || hwnd == OS.GetDlgItem (handle, CBID_EDIT) || hwnd == OS.GetDlgItem (handle, CBID_LIST);
}
+@Override
protected void checkSubclass () {
if (!isValidSubclass ()) error (SWT.ERROR_INVALID_SUBCLASS);
}
@@ -618,6 +621,7 @@
OS.SendMessage (handle, OS.CB_SETEDITSEL, 0, -1);
}
+@Override
public Point computeSize (int wHint, int hHint, boolean changed) {
checkWidget ();
int width = 0, height = 0;
@@ -714,6 +718,7 @@
OS.SendMessage (handle, OS.WM_COPY, 0, 0);
}
+@Override
void createHandle () {
/*
* Feature in Windows. When the selection changes in a combo box,
@@ -763,6 +768,7 @@
}
}
+@Override
void createWidget() {
super.createWidget();
visibleCount = VISIBLE_COUNT;
@@ -806,6 +812,7 @@
OS.SendMessage (handle, OS.WM_CUT, 0, 0);
}
+@Override
int defaultBackground () {
return OS.GetSysColor (OS.COLOR_WINDOW);
}
@@ -847,6 +854,7 @@
return text;
}
+@Override
void deregister () {
super.deregister ();
long /*int*/ hwndText = OS.GetDlgItem (handle, CBID_EDIT);
@@ -901,6 +909,7 @@
clearSegmentsCount--;
}
+@Override
boolean dragDetect (long /*int*/ hwnd, int x, int y, boolean filter, boolean [] detect, boolean [] consume) {
if (filter && (style & SWT.READ_ONLY) == 0) {
long /*int*/ hwndText = OS.GetDlgItem (handle, CBID_EDIT);
@@ -1165,6 +1174,7 @@
return true;
}
+@Override
String getNameText () {
return getText ();
}
@@ -1204,6 +1214,7 @@
*
* @since 2.1.2
*/
+@Override
public int getOrientation () {
return super.getOrientation ();
}
@@ -1428,6 +1439,7 @@
return visibleCount;
}
+@Override
boolean hasFocus () {
long /*int*/ hwndFocus = OS.GetFocus ();
if (hwndFocus == handle) return true;
@@ -1542,6 +1554,7 @@
OS.SendMessage (handle, OS.WM_PASTE, 0, 0);
}
+@Override
void register () {
super.register ();
long /*int*/ hwndText = OS.GetDlgItem (handle, CBID_EDIT);
@@ -1831,6 +1844,7 @@
eventTable.unhook (SWT.Verify, listener);
}
+@Override
boolean sendKeyEvent (int type, int msg, long /*int*/ wParam, long /*int*/ lParam, Event event) {
if (!super.sendKeyEvent (type, msg, wParam, lParam, event)) {
return false;
@@ -1944,6 +1958,7 @@
}
}
+@Override
void setBackgroundImage (long /*int*/ hBitmap) {
super.setBackgroundImage (hBitmap);
long /*int*/ hwndText = OS.GetDlgItem (handle, CBID_EDIT);
@@ -1952,6 +1967,7 @@
if (hwndList != 0) OS.InvalidateRect (hwndList, null, true);
}
+@Override
void setBackgroundPixel (int pixel) {
super.setBackgroundPixel (pixel);
long /*int*/ hwndText = OS.GetDlgItem (handle, CBID_EDIT);
@@ -1960,6 +1976,7 @@
if (hwndList != 0) OS.InvalidateRect (hwndList, null, true);
}
+@Override
void setBounds (int x, int y, int width, int height, int flags) {
/*
* Feature in Windows. If the combo box has the CBS_DROPDOWN
@@ -2008,6 +2025,7 @@
}
}
+@Override
public void setFont (Font font) {
checkWidget ();
@@ -2027,6 +2045,7 @@
if ((style & SWT.H_SCROLL) != 0) setScrollWidth ();
}
+@Override
void setForegroundPixel (int pixel) {
super.setForegroundPixel (pixel);
long /*int*/ hwndText = OS.GetDlgItem (handle, CBID_EDIT);
@@ -2128,6 +2147,7 @@
*
* @since 2.1.2
*/
+@Override
public void setOrientation (int orientation) {
super.setOrientation (orientation);
}
@@ -2335,6 +2355,7 @@
}
}
+@Override
void setToolTipText (Shell shell, String string) {
long /*int*/ hwndText = OS.GetDlgItem (handle, CBID_EDIT);
long /*int*/ hwndList = OS.GetDlgItem (handle, CBID_LIST);
@@ -2367,6 +2388,7 @@
updateDropDownHeight ();
}
+@Override
void subclass () {
super.subclass ();
long /*int*/ newProc = display.windowProc;
@@ -2388,6 +2410,7 @@
return offset;
}
+@Override
boolean translateTraversal (MSG msg) {
/*
* When the combo box is dropped down, allow return
@@ -2406,6 +2429,7 @@
return super.translateTraversal (msg);
}
+@Override
boolean traverseEscape () {
if ((style & SWT.DROP_DOWN) != 0) {
if (OS.SendMessage (handle, OS.CB_GETDROPPEDSTATE, 0, 0) != 0) {
@@ -2416,6 +2440,7 @@
return super.traverseEscape ();
}
+@Override
boolean traverseReturn () {
if ((style & SWT.DROP_DOWN) != 0) {
if (OS.SendMessage (handle, OS.CB_GETDROPPEDSTATE, 0, 0) != 0) {
@@ -2426,6 +2451,7 @@
return super.traverseReturn ();
}
+@Override
void unsubclass () {
super.unsubclass ();
long /*int*/ hwndText = OS.GetDlgItem (handle, CBID_EDIT);
@@ -2467,6 +2493,7 @@
}
}
+@Override
boolean updateTextDirection(int textDirection) {
if (super.updateTextDirection(textDirection)) {
if (textDirection == AUTO_TEXT_DIRECTION) {
@@ -2484,6 +2511,7 @@
return false;
}
+@Override
void updateOrientation () {
int bits = OS.GetWindowLong (handle, OS.GWL_EXSTYLE);
if ((style & SWT.RIGHT_TO_LEFT) != 0) {
@@ -2587,10 +2615,12 @@
return mbcsPos;
}
+@Override
int widgetExtStyle () {
return super.widgetExtStyle () & ~OS.WS_EX_NOINHERITLAYOUT;
}
+@Override
int widgetStyle () {
int bits = super.widgetStyle () | OS.CBS_AUTOHSCROLL | OS.CBS_NOINTEGRALHEIGHT | OS.WS_HSCROLL |OS.WS_VSCROLL;
if ((style & SWT.SIMPLE) != 0) return bits | OS.CBS_SIMPLE;
@@ -2598,14 +2628,17 @@
return bits | OS.CBS_DROPDOWN;
}
+@Override
TCHAR windowClass () {
return ComboClass;
}
+@Override
long /*int*/ windowProc () {
return ComboProc;
}
+@Override
long /*int*/ windowProc (long /*int*/ hwnd, int msg, long /*int*/ wParam, long /*int*/ lParam) {
if (handle == 0) return 0;
if (hwnd != handle) {
@@ -2806,15 +2839,18 @@
return super.windowProc (hwnd, msg, wParam, lParam);
}
+@Override
LRESULT WM_CTLCOLOR (long /*int*/ wParam, long /*int*/ lParam) {
return wmColorChild (wParam, lParam);
}
+@Override
LRESULT WM_GETDLGCODE (long /*int*/ wParam, long /*int*/ lParam) {
long /*int*/ code = callWindowProc (handle, OS.WM_GETDLGCODE, wParam, lParam);
return new LRESULT (code | OS.DLGC_WANTARROWS);
}
+@Override
LRESULT WM_KILLFOCUS (long /*int*/ wParam, long /*int*/ lParam) {
/*
* Bug in Windows. When a combo box that is read only
@@ -2835,6 +2871,7 @@
return null;
}
+@Override
LRESULT WM_LBUTTONDOWN (long /*int*/ wParam, long /*int*/ lParam) {
/*
* Feature in Windows. When an editable combo box is dropped
@@ -2858,6 +2895,7 @@
return result;
}
+@Override
LRESULT WM_SETFOCUS (long /*int*/ wParam, long /*int*/ lParam) {
/*
* Return NULL - Focus notification is
@@ -2866,6 +2904,7 @@
return null;
}
+@Override
LRESULT WM_SIZE (long /*int*/ wParam, long /*int*/ lParam) {
/*
* Feature in Windows. When a combo box is resized,
@@ -2921,6 +2960,7 @@
return result;
}
+@Override
LRESULT WM_UPDATEUISTATE (long /*int*/ wParam, long /*int*/ lParam) {
LRESULT result = super.WM_UPDATEUISTATE (wParam, lParam);
if (result != null) return result;
@@ -2928,6 +2968,7 @@
return result;
}
+@Override
LRESULT WM_WINDOWPOSCHANGING (long /*int*/ wParam, long /*int*/ lParam) {
LRESULT result = super.WM_WINDOWPOSCHANGING (wParam, lParam);
if (result != null) return result;
@@ -2980,6 +3021,7 @@
return result;
}
+@Override
LRESULT wmChar (long /*int*/ hwnd, long /*int*/ wParam, long /*int*/ lParam) {
if (ignoreCharacter) return null;
LRESULT result = super.wmChar (hwnd, wParam, lParam);
@@ -3126,6 +3168,7 @@
return null;
}
+@Override
LRESULT wmCommandChild (long /*int*/ wParam, long /*int*/ lParam) {
int code = OS.HIWORD (wParam);
switch (code) {
@@ -3224,6 +3267,7 @@
return super.wmCommandChild (wParam, lParam);
}
+@Override
LRESULT wmIMEChar (long /*int*/ hwnd, long /*int*/ wParam, long /*int*/ lParam) {
/* Process a DBCS character */
@@ -3258,6 +3302,7 @@
return new LRESULT (result);
}
+@Override
LRESULT wmKeyDown (long /*int*/ hwnd, long /*int*/ wParam, long /*int*/ lParam) {
if (ignoreCharacter) return null;
LRESULT result = super.wmKeyDown (hwnd, wParam, lParam);
@@ -3299,6 +3344,7 @@
return result;
}
+@Override
LRESULT wmSysKeyDown (long /*int*/ hwnd, long /*int*/ wParam, long /*int*/ lParam) {
/*
* Feature in Windows. When an editable combo box is dropped
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Composite.java b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Composite.java
index 811abd4..c4d8715 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Composite.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Composite.java
@@ -185,12 +185,14 @@
}
}
+@Override
void checkBuffered () {
if (OS.IsWinCE || (state & CANVAS) == 0) {
super.checkBuffered ();
}
}
+@Override
void checkComposited () {
if ((state & CANVAS) != 0) {
if ((style & SWT.TRANSPARENT) != 0) {
@@ -202,10 +204,12 @@
}
}
+@Override
protected void checkSubclass () {
/* Do nothing - Subclassing is allowed */
}
+@Override
Widget [] computeTabList () {
Widget result [] = super.computeTabList ();
if (result.length == 0) return result;
@@ -223,6 +227,7 @@
return result;
}
+@Override
public Point computeSize (int wHint, int hHint, boolean changed) {
checkWidget ();
display.runSkin ();
@@ -302,6 +307,7 @@
OS.RestoreDC (hDC, nSavedDC);
}
+@Override
void createHandle () {
super.createHandle ();
state |= CANVAS;
@@ -374,6 +380,7 @@
return layoutCount > 0 ? this : parent.findDeferredControl ();
}
+@Override
Menu [] findMenus (Control control) {
if (control == this) return new Menu [0];
Menu result [] = super.findMenus (control);
@@ -391,6 +398,7 @@
return result;
}
+@Override
void fixChildren (Shell newShell, Shell oldShell, Decorations newDecorations, Decorations oldDecorations, Menu [] menus) {
super.fixChildren (newShell, oldShell, newDecorations, oldDecorations, menus);
Control [] children = _getChildren ();
@@ -829,6 +837,7 @@
}
}
+@Override
void markLayout (boolean changed, boolean all) {
if (layout != null) {
state |= LAYOUT_NEEDED;
@@ -854,6 +863,7 @@
return new Point (width, height);
}
+@Override
boolean redrawChildren () {
if (!super.redrawChildren ()) return false;
Control [] children = _getChildren ();
@@ -863,6 +873,7 @@
return true;
}
+@Override
void releaseParent () {
super.releaseParent ();
if ((state & CANVAS) != 0) {
@@ -883,6 +894,7 @@
}
}
+@Override
void releaseChildren (boolean destroy) {
Control [] children = _getChildren ();
for (int i=0; i<children.length; i++) {
@@ -894,6 +906,7 @@
super.releaseChildren (destroy);
}
+@Override
void releaseWidget () {
super.releaseWidget ();
if ((state & CANVAS) != 0 && (style & SWT.EMBEDDED) != 0) {
@@ -916,6 +929,7 @@
resizeChildren ();
}
+@Override
void reskinChildren (int flags) {
super.reskinChildren (flags);
Control [] children = _getChildren ();
@@ -989,6 +1003,7 @@
}
}
+@Override
void sendResize () {
setResizeChildren (false);
super.sendResize ();
@@ -1026,6 +1041,7 @@
}
}
+@Override
void setBounds (int x, int y, int width, int height, int flags, boolean defer) {
if (display.resizeCount > Display.RESIZE_LIMIT) {
defer = false;
@@ -1044,6 +1060,7 @@
}
}
+@Override
public boolean setFocus () {
checkWidget ();
Control [] children = _getChildren ();
@@ -1153,6 +1170,7 @@
}
}
+@Override
boolean setTabGroupFocus () {
if (isTabItem ()) return setTabItemFocus ();
boolean takeFocus = (style & SWT.NO_FOCUS) == 0;
@@ -1175,6 +1193,7 @@
return false;
}
+@Override
boolean updateTextDirection(int textDirection) {
super.updateTextDirection (textDirection);
/*
@@ -1222,6 +1241,7 @@
return control != null ? control.toolTipText : null;
}
+@Override
boolean translateMnemonic (Event event, Control control) {
if (super.translateMnemonic (event, control)) return true;
if (control != null) {
@@ -1234,6 +1254,7 @@
return false;
}
+@Override
boolean translateTraversal (MSG msg) {
if ((state & CANVAS) != 0 ) {
if ((style & SWT.EMBEDDED) != 0) return false;
@@ -1254,6 +1275,7 @@
return super.translateTraversal (msg);
}
+@Override
void updateBackgroundColor () {
super.updateBackgroundColor ();
Control [] children = _getChildren ();
@@ -1264,6 +1286,7 @@
}
}
+@Override
void updateBackgroundImage () {
super.updateBackgroundImage ();
Control [] children = _getChildren ();
@@ -1274,6 +1297,7 @@
}
}
+@Override
void updateBackgroundMode () {
super.updateBackgroundMode ();
Control [] children = _getChildren ();
@@ -1282,6 +1306,7 @@
}
}
+@Override
void updateFont (Font oldFont, Font newFont) {
super.updateFont (oldFont, newFont);
Control [] children = _getChildren ();
@@ -1297,6 +1322,7 @@
updateLayout (true, all);
}
+@Override
void updateLayout (boolean resize, boolean all) {
Composite parent = findDeferredControl ();
if (parent != null) {
@@ -1320,6 +1346,7 @@
}
}
+@Override
void updateOrientation () {
Control [] controls = _getChildren ();
RECT [] rects = new RECT [controls.length];
@@ -1349,11 +1376,13 @@
}
}
+@Override
int widgetStyle () {
/* Force clipping of children by setting WS_CLIPCHILDREN */
return super.widgetStyle () | OS.WS_CLIPCHILDREN;
}
+@Override
LRESULT WM_ERASEBKGND (long /*int*/ wParam, long /*int*/ lParam) {
LRESULT result = super.WM_ERASEBKGND (wParam, lParam);
if (result != null) return result;
@@ -1366,6 +1395,7 @@
return result;
}
+@Override
LRESULT WM_GETDLGCODE (long /*int*/ wParam, long /*int*/ lParam) {
LRESULT result = super.WM_GETDLGCODE (wParam, lParam);
if (result != null) return result;
@@ -1381,6 +1411,7 @@
return result;
}
+@Override
LRESULT WM_GETFONT (long /*int*/ wParam, long /*int*/ lParam) {
LRESULT result = super.WM_GETFONT (wParam, lParam);
if (result != null) return result;
@@ -1389,6 +1420,7 @@
return new LRESULT (font != null ? font.handle : defaultFont ());
}
+@Override
LRESULT WM_LBUTTONDOWN (long /*int*/ wParam, long /*int*/ lParam) {
LRESULT result = super.WM_LBUTTONDOWN (wParam, lParam);
if (result == LRESULT.ZERO) return result;
@@ -1402,6 +1434,7 @@
return result;
}
+@Override
LRESULT WM_NCHITTEST (long /*int*/ wParam, long /*int*/ lParam) {
LRESULT result = super.WM_NCHITTEST (wParam, lParam);
if (result != null) return result;
@@ -1438,6 +1471,7 @@
return result;
}
+@Override
LRESULT WM_PARENTNOTIFY (long /*int*/ wParam, long /*int*/ lParam) {
if ((state & CANVAS) != 0 && (style & SWT.EMBEDDED) != 0) {
if (OS.LOWORD (wParam) == OS.WM_CREATE) {
@@ -1449,6 +1483,7 @@
return super.WM_PARENTNOTIFY (wParam, lParam);
}
+@Override
LRESULT WM_PAINT (long /*int*/ wParam, long /*int*/ lParam) {
if ((state & DISPOSE_SENT) != 0) return LRESULT.ZERO;
if ((state & CANVAS) == 0 || (state & FOREIGN_HANDLE) != 0) {
@@ -1658,6 +1693,7 @@
return LRESULT.ZERO;
}
+@Override
LRESULT WM_PRINTCLIENT (long /*int*/ wParam, long /*int*/ lParam) {
LRESULT result = super.WM_PRINTCLIENT (wParam, lParam);
if (result != null) return result;
@@ -1694,11 +1730,13 @@
return result;
}
+@Override
LRESULT WM_SETFONT (long /*int*/ wParam, long /*int*/ lParam) {
if (lParam != 0) OS.InvalidateRect (handle, null, true);
return super.WM_SETFONT (wParam, lParam);
}
+@Override
LRESULT WM_SIZE (long /*int*/ wParam, long /*int*/ lParam) {
LRESULT result = null;
if ((state & RESIZE_DEFERRED) != 0) {
@@ -1747,6 +1785,7 @@
return result;
}
+@Override
LRESULT WM_SYSCOLORCHANGE (long /*int*/ wParam, long /*int*/ lParam) {
LRESULT result = super.WM_SYSCOLORCHANGE (wParam, lParam);
if (result != null) return result;
@@ -1758,6 +1797,7 @@
return result;
}
+@Override
LRESULT WM_SYSCOMMAND (long /*int*/ wParam, long /*int*/ lParam) {
LRESULT result = super.WM_SYSCOMMAND (wParam, lParam);
if (result != null) return result;
@@ -1798,6 +1838,7 @@
return result;
}
+@Override
LRESULT WM_UPDATEUISTATE (long /*int*/ wParam, long /*int*/ lParam) {
LRESULT result = super.WM_UPDATEUISTATE (wParam, lParam);
if (result != null) return result;
@@ -1807,6 +1848,7 @@
return result;
}
+@Override
LRESULT wmNCPaint (long /*int*/ hwnd, long /*int*/ wParam, long /*int*/ lParam) {
LRESULT result = super.wmNCPaint (hwnd, wParam, lParam);
if (result != null) return result;
@@ -1837,6 +1879,7 @@
return result;
}
+@Override
LRESULT wmNotify (NMHDR hdr, long /*int*/ wParam, long /*int*/ lParam) {
if (!OS.IsWinCE) {
switch (hdr.code) {
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/CoolBar.java b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/CoolBar.java
index 1adeebb..f283cad 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/CoolBar.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/CoolBar.java
@@ -117,6 +117,7 @@
}
}
+@Override
long /*int*/ callWindowProc (long /*int*/ hwnd, int msg, long /*int*/ wParam, long /*int*/ lParam) {
if (handle == 0) return 0;
return OS.CallWindowProc (ReBarProc, hwnd, msg, wParam, lParam);
@@ -134,10 +135,12 @@
return style & ~(SWT.H_SCROLL | SWT.V_SCROLL);
}
+@Override
protected void checkSubclass () {
if (!isValidSubclass ()) error (SWT.ERROR_INVALID_SUBCLASS);
}
+@Override
public Point computeSize (int wHint, int hHint, boolean changed) {
checkWidget ();
int width = 0, height = 0;
@@ -207,6 +210,7 @@
return new Point (width, height);
}
+@Override
void createHandle () {
super.createHandle ();
state &= ~(CANVAS | THEME_BACKGROUND);
@@ -295,6 +299,7 @@
originalItems = newOriginals;
}
+@Override
void createWidget () {
super.createWidget ();
items = new CoolItem [4];
@@ -367,6 +372,7 @@
originalItems = newOriginals;
}
+@Override
void drawThemeBackground (long /*int*/ hDC, long /*int*/ hwnd, RECT rect) {
if (OS.COMCTL32_MAJOR >= 6 && OS.IsAppThemed ()) {
if (background == -1 && (style & SWT.FLAT) != 0) {
@@ -386,6 +392,7 @@
OS.SetWindowOrgEx (hDC, lpPoint.x, lpPoint.y, null);
}
+@Override
Control findThemeControl () {
if ((style & SWT.FLAT) != 0) return this;
return background == -1 && backgroundImage == null ? this : super.findThemeControl ();
@@ -703,6 +710,7 @@
OS.SendMessage (handle, OS.RB_SETBANDINFO, index, rbBand);
}
+@Override
void releaseChildren (boolean destroy) {
if (items != null) {
for (int i=0; i<items.length; i++) {
@@ -716,6 +724,7 @@
super.releaseChildren (destroy);
}
+@Override
void removeControl (Control control) {
super.removeControl (control);
for (int i=0; i<items.length; i++) {
@@ -726,6 +735,7 @@
}
}
+@Override
void reskinChildren (int flags) {
if (items != null) {
for (int i=0; i<items.length; i++) {
@@ -736,6 +746,7 @@
super.reskinChildren (flags);
}
+@Override
void setBackgroundPixel (int pixel) {
if (pixel == -1) pixel = defaultBackground ();
OS.SendMessage (handle, OS.RB_SETBKCOLOR, 0, pixel);
@@ -755,6 +766,7 @@
}
}
+@Override
void setForegroundPixel (int pixel) {
if (pixel == -1) pixel = defaultForeground ();
OS.SendMessage (handle, OS.RB_SETTEXTCOLOR, 0, pixel);
@@ -980,6 +992,7 @@
setRedraw (true);
}
+@Override
int widgetStyle () {
int bits = super.widgetStyle () | OS.CCS_NODIVIDER | OS.CCS_NORESIZE;
bits |= OS.RBS_VARHEIGHT | OS.RBS_DBLCLKTOGGLE;
@@ -987,14 +1000,17 @@
return bits;
}
+@Override
TCHAR windowClass () {
return ReBarClass;
}
+@Override
long /*int*/ windowProc () {
return ReBarProc;
}
+@Override
LRESULT WM_COMMAND (long /*int*/ wParam, long /*int*/ lParam) {
/*
* Feature in Windows. When the coolbar window
@@ -1019,6 +1035,7 @@
return LRESULT.ZERO;
}
+@Override
LRESULT WM_ERASEBKGND (long /*int*/ wParam, long /*int*/ lParam) {
LRESULT result = super.WM_ERASEBKGND (wParam, lParam);
/*
@@ -1041,6 +1058,7 @@
return result;
}
+@Override
LRESULT WM_NOTIFY (long /*int*/ wParam, long /*int*/ lParam) {
/*
* Feature in Windows. When the cool bar window
@@ -1065,6 +1083,7 @@
return LRESULT.ZERO;
}
+@Override
LRESULT WM_SETREDRAW (long /*int*/ wParam, long /*int*/ lParam) {
LRESULT result = super.WM_SETREDRAW (wParam, lParam);
if (result != null) return result;
@@ -1097,6 +1116,7 @@
return new LRESULT (code);
}
+@Override
LRESULT WM_SIZE (long /*int*/ wParam, long /*int*/ lParam) {
if (ignoreResize) {
long /*int*/ code = callWindowProc (handle, OS.WM_SIZE, wParam, lParam);
@@ -1112,6 +1132,7 @@
return super.WM_SIZE (wParam, lParam);
}
+@Override
LRESULT wmNotifyChild (NMHDR hdr, long /*int*/ wParam, long /*int*/ lParam) {
switch (hdr.code) {
case OS.RBN_BEGINDRAG: {
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/CoolItem.java b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/CoolItem.java
index a1a4988..3057eca 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/CoolItem.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/CoolItem.java
@@ -151,6 +151,7 @@
addListener (SWT.DefaultSelection,typedListener);
}
+@Override
protected void checkSubclass () {
if (!isValidSubclass ()) error (SWT.ERROR_INVALID_SUBCLASS);
}
@@ -197,6 +198,7 @@
return new Point (width, height);
}
+@Override
void destroyWidget () {
parent.destroyItem (this);
releaseHandle ();
@@ -295,6 +297,7 @@
return parent;
}
+@Override
void releaseHandle () {
super.releaseHandle ();
parent = null;
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/DateTime.java b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/DateTime.java
index 824f07d..36560a3 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/DateTime.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/DateTime.java
@@ -221,6 +221,7 @@
addListener (SWT.DefaultSelection, typedListener);
}
+@Override
long /*int*/ callWindowProc (long /*int*/ hwnd, int msg, long /*int*/ wParam, long /*int*/ lParam) {
if (handle == 0) return 0;
return OS.CallWindowProc (windowProc (), hwnd, msg, wParam, lParam);
@@ -241,10 +242,12 @@
return style;
}
+@Override
protected void checkSubclass () {
if (!isValidSubclass ()) error (SWT.ERROR_INVALID_SUBCLASS);
}
+@Override
public Point computeSize (int wHint, int hHint, boolean changed) {
checkWidget ();
int width = 0, height = 0;
@@ -320,6 +323,7 @@
return new Point (width, height);
}
+@Override
void createHandle () {
super.createHandle ();
state &= ~(CANVAS | THEME_BACKGROUND);
@@ -331,6 +335,7 @@
}
}
+@Override
int defaultBackground () {
return OS.GetSysColor (OS.COLOR_WINDOW);
}
@@ -455,6 +460,7 @@
return systime.wMonth - 1;
}
+@Override
String getNameText() {
return (style & SWT.TIME) != 0 ? getHours() + ":" + getMinutes() + ":" + getSeconds()
: (getMonth() + 1) + "/" + getDay() + "/" + getYear();
@@ -503,6 +509,7 @@
return systime.wYear;
}
+@Override
void releaseWidget () {
super.releaseWidget ();
lastSystemTime = null;
@@ -669,6 +676,7 @@
lastSystemTime = null;
}
+@Override
public void setOrientation (int orientation) {
/* Currently supported only for CALENDAR style. */
if ((style & SWT.CALENDAR) != 0) super.setOrientation (orientation);
@@ -761,6 +769,7 @@
lastSystemTime = null;
}
+@Override
int widgetStyle () {
int bits = super.widgetStyle () | OS.WS_TABSTOP;
if ((style & SWT.CALENDAR) != 0) return bits | OS.MCS_NOTODAY;
@@ -778,14 +787,17 @@
return bits;
}
+@Override
TCHAR windowClass () {
return (style & SWT.CALENDAR) != 0 ? CalendarClass : DateTimeClass;
}
+@Override
long /*int*/ windowProc () {
return (style & SWT.CALENDAR) != 0 ? CalendarProc : DateTimeProc;
}
+@Override
LRESULT wmNotifyChild (NMHDR hdr, long /*int*/ wParam, long /*int*/ lParam) {
switch (hdr.code) {
case OS.DTN_CLOSEUP: {
@@ -821,6 +833,7 @@
return super.wmNotifyChild (hdr, wParam, lParam);
}
+@Override
LRESULT WM_CHAR (long /*int*/ wParam, long /*int*/ lParam) {
LRESULT result = super.WM_CHAR (wParam, lParam);
if (result != null) return result;
@@ -840,6 +853,7 @@
return result;
}
+@Override
LRESULT WM_LBUTTONDBLCLK (long /*int*/ wParam, long /*int*/ lParam) {
LRESULT result = super.WM_LBUTTONDBLCLK (wParam, lParam);
if (isDisposed ()) return LRESULT.ZERO;
@@ -856,6 +870,7 @@
return result;
}
+@Override
LRESULT WM_LBUTTONDOWN (long /*int*/ wParam, long /*int*/ lParam) {
LRESULT result = super.WM_LBUTTONDOWN (wParam, lParam);
if (result == LRESULT.ZERO) return result;
@@ -871,6 +886,7 @@
return result;
}
+@Override
LRESULT WM_LBUTTONUP (long /*int*/ wParam, long /*int*/ lParam) {
LRESULT result = super.WM_LBUTTONUP (wParam, lParam);
if (isDisposed ()) return LRESULT.ZERO;
@@ -879,6 +895,7 @@
return result;
}
+@Override
LRESULT WM_TIMER (long /*int*/ wParam, long /*int*/ lParam) {
LRESULT result = super.WM_TIMER (wParam, lParam);
if (result != null) return result;
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Display.java b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Display.java
index 12f8265..7f9fbaf 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Display.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Display.java
@@ -741,6 +741,7 @@
if (!isValidClass (getClass ())) error (SWT.ERROR_INVALID_SUBCLASS);
}
+@Override
protected void checkDevice () {
if (thread == null) error (SWT.ERROR_WIDGET_DISPOSED);
if (thread != Thread.currentThread ()) {
@@ -832,6 +833,7 @@
*
* @see #init
*/
+@Override
protected void create (DeviceData data) {
checkSubclass ();
checkDisplay (thread = Thread.currentThread (), true);
@@ -1177,6 +1179,7 @@
* @see Device#dispose
* @see #release
*/
+@Override
protected void destroy () {
if (this == Default) Default = null;
deregister (this);
@@ -1507,6 +1510,7 @@
* <li>ERROR_DEVICE_DISPOSED - if the receiver has been disposed</li>
* </ul>
*/
+@Override
public Rectangle getBounds () {
checkDevice ();
if (OS.GetSystemMetrics (OS.SM_CMONITORS) < 2) {
@@ -1574,6 +1578,7 @@
*
* @see #getBounds
*/
+@Override
public Rectangle getClientArea () {
checkDevice ();
if (OS.GetSystemMetrics (OS.SM_CMONITORS) < 2) {
@@ -2358,6 +2363,7 @@
*
* @see SWT
*/
+@Override
public Color getSystemColor (int id) {
checkDevice ();
int pixel = 0x00000000;
@@ -2466,6 +2472,7 @@
* <li>ERROR_DEVICE_DISPOSED - if the receiver has been disposed</li>
* </ul>
*/
+@Override
public Font getSystemFont () {
checkDevice ();
if (systemFont != null) return systemFont;
@@ -2678,6 +2685,7 @@
*
* @noreference This method is not intended to be referenced by clients.
*/
+@Override
public long /*int*/ internal_new_GC (GCData data) {
if (isDisposed()) error(SWT.ERROR_DEVICE_DISPOSED);
long /*int*/ hDC = OS.GetDC (0);
@@ -2704,6 +2712,7 @@
*
* @see #create
*/
+@Override
protected void init () {
super.init ();
@@ -2873,6 +2882,7 @@
*
* @noreference This method is not intended to be referenced by clients.
*/
+@Override
public void internal_dispose_GC (long /*int*/ hDC, GCData data) {
OS.ReleaseDC (0, hDC);
}
@@ -3811,6 +3821,7 @@
* @see Device#dispose
* @see #destroy
*/
+@Override
protected void release () {
sendEvent (SWT.Dispose, new Event ());
Shell [] shells = getShells ();
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/ExpandBar.java b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/ExpandBar.java
index 3622ae7..2f7c3f3 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/ExpandBar.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/ExpandBar.java
@@ -111,11 +111,13 @@
addListener (SWT.Collapse, typedListener);
}
+@Override
long /*int*/ callWindowProc (long /*int*/ hwnd, int msg, long /*int*/ wParam, long /*int*/ lParam) {
if (handle == 0) return 0;
return OS.DefWindowProc (hwnd, msg, wParam, lParam);
}
+@Override
protected void checkSubclass () {
if (!isValidSubclass ()) error (SWT.ERROR_INVALID_SUBCLASS);
}
@@ -125,6 +127,7 @@
return style | SWT.NO_BACKGROUND;
}
+@Override
public Point computeSize (int wHint, int hHint, boolean changed) {
checkWidget ();
int height = 0, width = 0;
@@ -176,6 +179,7 @@
return new Point (trim.width, trim.height);
}
+@Override
void createHandle () {
super.createHandle ();
state &= ~CANVAS;
@@ -200,6 +204,7 @@
layoutItems (index, true);
}
+@Override
void createWidget () {
super.createWidget ();
items = new ExpandItem [4];
@@ -208,6 +213,7 @@
}
}
+@Override
int defaultBackground() {
if (!isAppThemed ()) {
return OS.GetSysColor (OS.COLOR_WINDOW);
@@ -237,6 +243,7 @@
layoutItems (index, true);
}
+@Override
void drawThemeBackground (long /*int*/ hDC, long /*int*/ hwnd, RECT rect) {
RECT rect2 = new RECT ();
OS.GetClientRect (handle, rect2);
@@ -292,6 +299,7 @@
}
}
+@Override
Control findBackgroundControl () {
Control control = super.findBackgroundControl ();
if (!isAppThemed ()) {
@@ -300,6 +308,7 @@
return control;
}
+@Override
Control findThemeControl () {
return isAppThemed () ? this : super.findThemeControl ();
}
@@ -441,6 +450,7 @@
if (setScrollbar) setScrollbar ();
}
+@Override
void releaseChildren (boolean destroy) {
if (items != null) {
for (int i=0; i<items.length; i++) {
@@ -480,6 +490,7 @@
eventTable.unhook (SWT.Collapse, listener);
}
+@Override
void reskinChildren (int flags) {
if (items != null) {
for (int i=0; i<items.length; i++) {
@@ -490,6 +501,7 @@
super.reskinChildren (flags);
}
+@Override
void setBackgroundPixel (int pixel) {
super.setBackgroundPixel (pixel);
if (!OS.IsWinCE) {
@@ -498,12 +510,14 @@
}
}
+@Override
public void setFont (Font font) {
super.setFont (font);
hFont = font != null ? font.handle : 0;
layoutItems (0, true);
}
+@Override
void setForegroundPixel (int pixel) {
super.setForegroundPixel (pixel);
if (!OS.IsWinCE) {
@@ -567,6 +581,7 @@
OS.InvalidateRect (handle, null, true);
}
+@Override
boolean updateTextDirection(int textDirection) {
if (super.updateTextDirection(textDirection)) {
for (int i = 0, n = items.length; i < n; i++) {
@@ -625,14 +640,17 @@
}
}
+@Override
TCHAR windowClass () {
return display.windowClass;
}
+@Override
long /*int*/ windowProc () {
return display.windowProc;
}
+@Override
LRESULT WM_KEYDOWN (long /*int*/ wParam, long /*int*/ lParam) {
LRESULT result = super.WM_KEYDOWN (wParam, lParam);
if (result != null) return result;
@@ -672,12 +690,14 @@
return result;
}
+@Override
LRESULT WM_KILLFOCUS (long /*int*/ wParam, long /*int*/ lParam) {
LRESULT result = super.WM_KILLFOCUS (wParam, lParam);
if (focusItem != null) focusItem.redraw (true);
return result;
}
+@Override
LRESULT WM_LBUTTONDOWN (long /*int*/ wParam, long /*int*/ lParam) {
LRESULT result = super.WM_LBUTTONDOWN (wParam, lParam);
if (result == LRESULT.ZERO) return result;
@@ -697,6 +717,7 @@
return result;
}
+@Override
LRESULT WM_LBUTTONUP (long /*int*/ wParam, long /*int*/ lParam) {
LRESULT result = super.WM_LBUTTONUP (wParam, lParam);
if (result == LRESULT.ZERO) return result;
@@ -714,6 +735,7 @@
return result;
}
+@Override
LRESULT WM_MOUSELEAVE (long /*int*/ wParam, long /*int*/ lParam) {
LRESULT result = super.WM_MOUSELEAVE (wParam, lParam);
if (result != null) return result;
@@ -728,6 +750,7 @@
return result;
}
+@Override
LRESULT WM_MOUSEMOVE (long /*int*/ wParam, long /*int*/ lParam) {
LRESULT result = super.WM_MOUSEMOVE (wParam, lParam);
if (result == LRESULT.ZERO) return result;
@@ -744,10 +767,12 @@
return result;
}
+@Override
LRESULT WM_MOUSEWHEEL (long /*int*/ wParam, long /*int*/ lParam) {
return wmScrollWheel (true, wParam, lParam);
}
+@Override
LRESULT WM_PAINT (long /*int*/ wParam, long /*int*/ lParam) {
if ((state & DISPOSE_SENT) != 0) return LRESULT.ZERO;
@@ -779,6 +804,7 @@
return LRESULT.ZERO;
}
+@Override
LRESULT WM_PRINTCLIENT (long /*int*/ wParam, long /*int*/ lParam) {
LRESULT result = super.WM_PRINTCLIENT (wParam, lParam);
RECT rect = new RECT ();
@@ -792,6 +818,7 @@
return result;
}
+@Override
LRESULT WM_SETCURSOR (long /*int*/ wParam, long /*int*/ lParam) {
LRESULT result = super.WM_SETCURSOR (wParam, lParam);
if (result != null) return result;
@@ -809,12 +836,14 @@
return result;
}
+@Override
LRESULT WM_SETFOCUS (long /*int*/ wParam, long /*int*/ lParam) {
LRESULT result = super.WM_SETFOCUS (wParam, lParam);
if (focusItem != null) focusItem.redraw (true);
return result;
}
+@Override
LRESULT WM_SIZE (long /*int*/ wParam, long /*int*/ lParam) {
LRESULT result = super.WM_SIZE (wParam, lParam);
RECT rect = new RECT ();
@@ -829,6 +858,7 @@
return result;
}
+@Override
LRESULT wmScroll (ScrollBar bar, boolean update, long /*int*/ hwnd, int msg, long /*int*/ wParam, long /*int*/ lParam) {
LRESULT result = super.wmScroll (bar, true, hwnd, msg, wParam, lParam);
SCROLLINFO info = new SCROLLINFO ();
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/ExpandItem.java b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/ExpandItem.java
index 5057c8b..968801c 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/ExpandItem.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/ExpandItem.java
@@ -247,6 +247,7 @@
}
}
+@Override
void destroyWidget () {
parent.destroyItem (this);
releaseHandle ();
@@ -369,11 +370,13 @@
}
}
+@Override
void releaseHandle () {
super.releaseHandle ();
parent = null;
}
+@Override
void releaseWidget () {
super.releaseWidget ();
control = null;
@@ -475,6 +478,7 @@
if (expanded) parent.layoutItems (parent.indexOf (this) + 1, true);
}
+@Override
public void setImage (Image image) {
super.setImage (image);
int oldImageHeight = imageHeight;
@@ -492,6 +496,7 @@
}
}
+@Override
public void setText (String string) {
super.setText (string);
if ((state & HAS_AUTO_DIRECTION) != 0) {
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/FontDialog.java b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/FontDialog.java
index ba494ba..fb00669 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/FontDialog.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/FontDialog.java
@@ -107,6 +107,7 @@
* @return the FontData for the selected font, or null
* @deprecated use #getFontList ()
*/
+@Deprecated
public FontData getFontData () {
return fontData;
}
@@ -323,6 +324,7 @@
* @param fontData the FontData to use initially, or null
* @deprecated use #setFontList (FontData [])
*/
+@Deprecated
public void setFontData (FontData fontData) {
this.fontData = fontData;
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Group.java b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Group.java
index 5be415c..4ce3874 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Group.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Group.java
@@ -117,6 +117,7 @@
super (parent, checkStyle (style));
}
+@Override
long /*int*/ callWindowProc (long /*int*/ hwnd, int msg, long /*int*/ wParam, long /*int*/ lParam) {
if (handle == 0) return 0;
/*
@@ -144,10 +145,12 @@
return style & ~(SWT.H_SCROLL | SWT.V_SCROLL);
}
+@Override
protected void checkSubclass () {
if (!isValidSubclass ()) error (SWT.ERROR_INVALID_SUBCLASS);
}
+@Override
public Point computeSize (int wHint, int hHint, boolean changed) {
checkWidget ();
Point size = super.computeSize (wHint, hHint, changed);
@@ -175,6 +178,7 @@
return size;
}
+@Override
public Rectangle computeTrim (int x, int y, int width, int height) {
checkWidget ();
Rectangle trim = super.computeTrim (x, y, width, height);
@@ -194,6 +198,7 @@
return trim;
}
+@Override
void createHandle () {
/*
* Feature in Windows. When a button is created,
@@ -211,6 +216,7 @@
state &= ~CANVAS;
}
+@Override
void enableWidget (boolean enabled) {
super.enableWidget (enabled);
/*
@@ -244,6 +250,7 @@
return null;
}
+@Override
public Rectangle getClientArea () {
checkWidget ();
forceResize ();
@@ -264,6 +271,7 @@
return new Rectangle (x, y, width, height);
}
+@Override
String getNameText () {
return getText ();
}
@@ -285,16 +293,19 @@
return text;
}
+@Override
boolean mnemonicHit (char key) {
return setFocus ();
}
+@Override
boolean mnemonicMatch (char key) {
char mnemonic = findMnemonic (getText ());
if (mnemonic == '\0') return false;
return Character.toUpperCase (key) == Character.toUpperCase (mnemonic);
}
+@Override
void printWidget (long /*int*/ hwnd, long /*int*/ hdc, GC gc) {
/*
* Bug in Windows. For some reason, PrintWindow()
@@ -358,15 +369,18 @@
}
}
+@Override
void releaseWidget () {
super.releaseWidget ();
text = null;
}
+@Override
int resolveTextDirection () {
return resolveTextDirection (text);
}
+@Override
public void setFont (Font font) {
checkWidget ();
Rectangle oldRect = getClientArea ();
@@ -413,6 +427,7 @@
}
}
+@Override
boolean updateTextDirection(int textDirection) {
if (super.updateTextDirection(textDirection)) {
String string = fixText (OS.IsWindowEnabled (handle));
@@ -423,6 +438,7 @@
return false;
}
+@Override
int widgetStyle () {
/*
* Bug in Windows. When GetDCEx() is called with DCX_INTERSECTUPDATE,
@@ -438,14 +454,17 @@
return super.widgetStyle () | OS.BS_GROUPBOX | OS.WS_CLIPCHILDREN | OS.WS_CLIPSIBLINGS;
}
+@Override
TCHAR windowClass () {
return GroupClass;
}
+@Override
long /*int*/ windowProc () {
return GroupProc;
}
+@Override
LRESULT WM_ERASEBKGND (long /*int*/ wParam, long /*int*/ lParam) {
LRESULT result = super.WM_ERASEBKGND (wParam, lParam);
if (result != null) return result;
@@ -458,6 +477,7 @@
return LRESULT.ONE;
}
+@Override
LRESULT WM_NCHITTEST (long /*int*/ wParam, long /*int*/ lParam) {
LRESULT result = super.WM_NCHITTEST (wParam, lParam);
if (result != null) return result;
@@ -475,6 +495,7 @@
return new LRESULT (code);
}
+@Override
LRESULT WM_MOUSEMOVE (long /*int*/ wParam, long /*int*/ lParam) {
LRESULT result = super.WM_MOUSEMOVE (wParam, lParam);
if (result != null) return result;
@@ -487,6 +508,7 @@
return LRESULT.ZERO;
}
+@Override
LRESULT WM_PRINTCLIENT (long /*int*/ wParam, long /*int*/ lParam) {
LRESULT result = super.WM_PRINTCLIENT (wParam, lParam);
if (result != null) return result;
@@ -509,6 +531,7 @@
return result;
}
+@Override
LRESULT WM_UPDATEUISTATE (long /*int*/ wParam, long /*int*/ lParam) {
LRESULT result = super.WM_UPDATEUISTATE (wParam, lParam);
if (result != null) return result;
@@ -537,6 +560,7 @@
return result;
}
+@Override
LRESULT WM_WINDOWPOSCHANGING (long /*int*/ wParam, long /*int*/ lParam) {
LRESULT result = super.WM_WINDOWPOSCHANGING (wParam, lParam);
if (result != null) return result;
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/IME.java b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/IME.java
index 9a25be2..cc40314 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/IME.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/IME.java
@@ -320,11 +320,13 @@
return OS.IsDBLocale && hooks (SWT.ImeComposition);
}
+@Override
void releaseParent () {
super.releaseParent ();
if (this == parent.getIME ()) parent.setIME (null);
}
+@Override
void releaseWidget () {
super.releaseWidget ();
parent = null;
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Label.java b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Label.java
index 5bf95c6..970b510 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Label.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Label.java
@@ -101,6 +101,7 @@
super (parent, checkStyle (style));
}
+@Override
long /*int*/ callWindowProc (long /*int*/ hwnd, int msg, long /*int*/ wParam, long /*int*/ lParam) {
if (handle == 0) return 0;
/*
@@ -126,6 +127,7 @@
return checkBits (style, SWT.LEFT, SWT.CENTER, SWT.RIGHT, 0, 0, 0);
}
+@Override
public Point computeSize (int wHint, int hHint, boolean changed) {
checkWidget ();
int width = 0, height = 0, border = getBorderWidth ();
@@ -195,6 +197,7 @@
return new Point (width, height);
}
+@Override
void createHandle () {
super.createHandle ();
state |= THEME_BACKGROUND;
@@ -239,6 +242,7 @@
return image;
}
+@Override
String getNameText () {
return getText ();
}
@@ -261,6 +265,7 @@
return text;
}
+@Override
boolean mnemonicHit (char key) {
Control control = this;
while (control.parent != null) {
@@ -279,18 +284,21 @@
return false;
}
+@Override
boolean mnemonicMatch (char key) {
char mnemonic = findMnemonic (getText ());
if (mnemonic == '\0') return false;
return Character.toUpperCase (key) == Character.toUpperCase (mnemonic);
}
+@Override
void releaseWidget () {
super.releaseWidget ();
text = null;
image = null;
}
+@Override
int resolveTextDirection() {
return (style & SWT.SEPARATOR) != 0 ? SWT.NONE : resolveTextDirection(text);
}
@@ -435,12 +443,14 @@
}
}
+@Override
int widgetExtStyle () {
int bits = super.widgetExtStyle () & ~OS.WS_EX_CLIENTEDGE;
if ((style & SWT.BORDER) != 0) return bits | OS.WS_EX_STATICEDGE;
return bits;
}
+@Override
int widgetStyle () {
int bits = super.widgetStyle () | OS.SS_NOTIFY;
if ((style & SWT.SEPARATOR) != 0) return bits | OS.SS_OWNERDRAW;
@@ -453,14 +463,17 @@
return bits | OS.SS_LEFTNOWORDWRAP;
}
+@Override
TCHAR windowClass () {
return LabelClass;
}
+@Override
long /*int*/ windowProc () {
return LabelProc;
}
+@Override
LRESULT WM_ERASEBKGND (long /*int*/ wParam, long /*int*/ lParam) {
LRESULT result = super.WM_ERASEBKGND (wParam, lParam);
if (result != null) return result;
@@ -485,6 +498,7 @@
return result;
}
+@Override
LRESULT WM_SIZE (long /*int*/ wParam, long /*int*/ lParam) {
LRESULT result = super.WM_SIZE (wParam, lParam);
if (isDisposed ()) return result;
@@ -511,6 +525,7 @@
return result;
}
+@Override
LRESULT WM_UPDATEUISTATE (long /*int*/ wParam, long /*int*/ lParam) {
LRESULT result = super.WM_UPDATEUISTATE (wParam, lParam);
if (result != null) return result;
@@ -538,6 +553,7 @@
return result;
}
+@Override
LRESULT wmColorChild (long /*int*/ wParam, long /*int*/ lParam) {
/*
* Bug in Windows. For some reason, the HBRUSH that
@@ -560,6 +576,7 @@
return result;
}
+@Override
LRESULT WM_PAINT (long /*int*/ wParam, long /*int*/ lParam) {
if ((state & DISPOSE_SENT) != 0) return LRESULT.ZERO;
@@ -626,6 +643,7 @@
return super.WM_PAINT(wParam, lParam);
}
+@Override
LRESULT wmDrawChild (long /*int*/ wParam, long /*int*/ lParam) {
DRAWITEMSTRUCT struct = new DRAWITEMSTRUCT ();
OS.MoveMemory (struct, lParam, DRAWITEMSTRUCT.sizeof);
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Link.java b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Link.java
index 53ad648..1e84e90 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Link.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Link.java
@@ -152,6 +152,7 @@
addListener (SWT.DefaultSelection, typedListener);
}
+@Override
long /*int*/ callWindowProc (long /*int*/ hwnd, int msg, long /*int*/ wParam, long /*int*/ lParam) {
if (handle == 0) return 0;
if (LinkProc != 0) {
@@ -174,6 +175,7 @@
return OS.DefWindowProc (hwnd, msg, wParam, lParam);
}
+@Override
public Point computeSize (int wHint, int hHint, boolean changed) {
checkWidget ();
if (wHint != SWT.DEFAULT && wHint < 0) wHint = 0;
@@ -226,6 +228,7 @@
return new Point (width, height);
}
+@Override
void createHandle () {
super.createHandle ();
state |= THEME_BACKGROUND;
@@ -245,6 +248,7 @@
}
}
+@Override
void createWidget () {
super.createWidget ();
text = "";
@@ -287,6 +291,7 @@
}
}
+@Override
void enableWidget (boolean enabled) {
if (OS.COMCTL32_MAJOR >= 6) {
LITEM item = new LITEM ();
@@ -318,16 +323,19 @@
void initAccessible () {
Accessible accessible = getAccessible ();
accessible.addAccessibleListener (new AccessibleAdapter () {
+ @Override
public void getName (AccessibleEvent e) {
e.result = parse (text);
}
});
accessible.addAccessibleControlListener (new AccessibleControlAdapter () {
+ @Override
public void getChildAtPoint (AccessibleControlEvent e) {
e.childID = ACC.CHILDID_SELF;
}
+ @Override
public void getLocation (AccessibleControlEvent e) {
Rectangle rect = display.map (getParent (), null, getBounds ());
e.x = rect.x;
@@ -336,33 +344,40 @@
e.height = rect.height;
}
+ @Override
public void getChildCount (AccessibleControlEvent e) {
e.detail = 0;
}
+ @Override
public void getRole (AccessibleControlEvent e) {
e.detail = ACC.ROLE_LINK;
}
+ @Override
public void getState (AccessibleControlEvent e) {
e.detail = ACC.STATE_FOCUSABLE;
if (hasFocus ()) e.detail |= ACC.STATE_FOCUSED;
}
+ @Override
public void getDefaultAction (AccessibleControlEvent e) {
e.result = SWT.getMessage ("SWT_Press"); //$NON-NLS-1$
}
+ @Override
public void getSelection (AccessibleControlEvent e) {
if (hasFocus ()) e.childID = ACC.CHILDID_SELF;
}
+ @Override
public void getFocus (AccessibleControlEvent e) {
if (hasFocus ()) e.childID = ACC.CHILDID_SELF;
}
});
}
+@Override
String getNameText () {
return getText ();
}
@@ -412,6 +427,7 @@
return text;
}
+@Override
boolean mnemonicHit (char key) {
if (mnemonics != null) {
char uckey = Character.toUpperCase (key);
@@ -451,6 +467,7 @@
return false;
}
+@Override
boolean mnemonicMatch (char key) {
if (mnemonics != null) {
char uckey = Character.toUpperCase (key);
@@ -616,6 +633,7 @@
return mnemonic;
}
+@Override
void releaseWidget () {
super.releaseWidget ();
if (layout != null) layout.dispose ();
@@ -742,10 +760,12 @@
}
}
+@Override
int resolveTextDirection() {
return resolveTextDirection(text);
}
+@Override
boolean updateTextDirection(int textDirection) {
if (super.updateTextDirection(textDirection)) {
int flags = SWT.RIGHT_TO_LEFT | SWT.LEFT_TO_RIGHT;
@@ -759,19 +779,23 @@
return false;
}
+@Override
int widgetStyle () {
int bits = super.widgetStyle ();
return bits | OS.WS_TABSTOP;
}
+@Override
TCHAR windowClass () {
return OS.COMCTL32_MAJOR >= 6 ? LinkClass : display.windowClass;
}
+@Override
long /*int*/ windowProc () {
return LinkProc != 0 ? LinkProc : display.windowProc;
}
+@Override
LRESULT WM_CHAR (long /*int*/ wParam, long /*int*/ lParam) {
LRESULT result = super.WM_CHAR (wParam, lParam);
if (result != null) return result;
@@ -818,6 +842,7 @@
return result;
}
+@Override
LRESULT WM_GETDLGCODE (long /*int*/ wParam, long /*int*/ lParam) {
LRESULT result = super.WM_GETDLGCODE (wParam, lParam);
if (result != null) return result;
@@ -853,6 +878,7 @@
return result;
}
+@Override
LRESULT WM_GETFONT (long /*int*/ wParam, long /*int*/ lParam) {
LRESULT result = super.WM_GETFONT (wParam, lParam);
if (result != null) return result;
@@ -862,6 +888,7 @@
return new LRESULT (font);
}
+@Override
LRESULT WM_KEYDOWN (long /*int*/ wParam, long /*int*/ lParam) {
LRESULT result = super.WM_KEYDOWN (wParam, lParam);
if (result != null) return result;
@@ -882,12 +909,14 @@
return result;
}
+@Override
LRESULT WM_KILLFOCUS (long /*int*/ wParam, long /*int*/ lParam) {
LRESULT result = super.WM_KILLFOCUS (wParam, lParam);
if (OS.COMCTL32_MAJOR < 6) redraw ();
return result;
}
+@Override
LRESULT WM_LBUTTONDOWN (long /*int*/ wParam, long /*int*/ lParam) {
LRESULT result = super.WM_LBUTTONDOWN (wParam, lParam);
if (result == LRESULT.ZERO) return result;
@@ -926,6 +955,7 @@
return result;
}
+@Override
LRESULT WM_LBUTTONUP (long /*int*/ wParam, long /*int*/ lParam) {
LRESULT result = super.WM_LBUTTONUP (wParam, lParam);
if (result == LRESULT.ZERO) return result;
@@ -948,6 +978,7 @@
return result;
}
+@Override
LRESULT WM_NCHITTEST (long /*int*/ wParam, long /*int*/ lParam) {
LRESULT result = super.WM_NCHITTEST (wParam, lParam);
if (result != null) return result;
@@ -962,6 +993,7 @@
return result;
}
+@Override
LRESULT WM_MOUSEMOVE (long /*int*/ wParam, long /*int*/ lParam) {
LRESULT result = super.WM_MOUSEMOVE (wParam, lParam);
if (OS.COMCTL32_MAJOR < 6) {
@@ -997,6 +1029,7 @@
return result;
}
+@Override
LRESULT WM_PAINT (long /*int*/ wParam, long /*int*/ lParam) {
if ((state & DISPOSE_SENT) != 0) return LRESULT.ZERO;
if (OS.COMCTL32_MAJOR >= 6) {
@@ -1021,6 +1054,7 @@
return LRESULT.ZERO;
}
+@Override
LRESULT WM_PRINTCLIENT (long /*int*/ wParam, long /*int*/ lParam) {
LRESULT result = super.WM_PRINTCLIENT (wParam, lParam);
if (OS.COMCTL32_MAJOR < 6) {
@@ -1036,12 +1070,14 @@
return result;
}
+@Override
LRESULT WM_SETFOCUS (long /*int*/ wParam, long /*int*/ lParam) {
LRESULT result = super.WM_SETFOCUS (wParam, lParam);
if (OS.COMCTL32_MAJOR < 6) redraw ();
return result;
}
+@Override
LRESULT WM_SETFONT (long /*int*/ wParam, long /*int*/ lParam) {
if (OS.COMCTL32_MAJOR < 6) {
layout.setFont (Font.win32_new (display, wParam));
@@ -1050,6 +1086,7 @@
return super.WM_SETFONT (font = wParam, lParam);
}
+@Override
LRESULT WM_SIZE (long /*int*/ wParam, long /*int*/ lParam) {
LRESULT result = super.WM_SIZE (wParam, lParam);
if (OS.COMCTL32_MAJOR < 6) {
@@ -1061,6 +1098,7 @@
return result;
}
+@Override
LRESULT wmColorChild (long /*int*/ wParam, long /*int*/ lParam) {
LRESULT result = super.wmColorChild (wParam, lParam);
/*
@@ -1082,6 +1120,7 @@
return result;
}
+@Override
LRESULT wmNotifyChild (NMHDR hdr, long /*int*/ wParam, long /*int*/ lParam) {
if (OS.COMCTL32_MAJOR >= 6) {
switch (hdr.code) {
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/List.java b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/List.java
index cb58bf4..3f16621 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/List.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/List.java
@@ -184,6 +184,7 @@
addListener (SWT.DefaultSelection,typedListener);
}
+@Override
long /*int*/ callWindowProc (long /*int*/ hwnd, int msg, long /*int*/ wParam, long /*int*/ lParam) {
if (handle == 0) return 0;
boolean redraw = false;
@@ -213,6 +214,7 @@
return checkBits (style, SWT.SINGLE, SWT.MULTI, 0, 0, 0, 0);
}
+@Override
public Point computeSize (int wHint, int hHint, boolean changed) {
checkWidget ();
int width = 0, height = 0;
@@ -268,6 +270,7 @@
return new Point (width, height);
}
+@Override
int defaultBackground () {
return OS.GetSysColor (OS.COLOR_WINDOW);
}
@@ -1151,6 +1154,7 @@
OS.SendMessage (handle, OS.LB_SETCARETINDEX, index, 0);
}
+@Override
public void setFont (Font font) {
checkWidget ();
super.setFont (font);
@@ -1518,6 +1522,7 @@
OS.SendMessage (handle, OS.LB_SETTOPINDEX, newTop, 0);
}
+@Override
void updateMenuLocation (Event event) {
Rectangle clientArea = getClientArea ();
int x = clientArea.x, y = clientArea.y;
@@ -1555,6 +1560,7 @@
event.y = pt.y;
}
+@Override
boolean updateTextDirection (int textDirection) {
if (textDirection == AUTO_TEXT_DIRECTION) {
/*
@@ -1598,6 +1604,7 @@
return textDirection == AUTO_TEXT_DIRECTION || super.updateTextDirection (textDirection);
}
+@Override
int widgetStyle () {
int bits = super.widgetStyle () | OS.LBS_NOTIFY | OS.LBS_NOINTEGRALHEIGHT;
if ((style & SWT.SINGLE) != 0) return bits;
@@ -1608,14 +1615,17 @@
return bits;
}
+@Override
TCHAR windowClass () {
return ListClass;
}
+@Override
long /*int*/ windowProc () {
return ListProc;
}
+@Override
long /*int*/ windowProc (long /*int*/ hwnd, int msg, long /*int*/ wParam, long /*int*/ lParam) {
/* Below code is to support auto text direction. */
if (OS.IsUnicode && handle != 0 && lParam != 0 && (state & HAS_AUTO_DIRECTION) != 0) {
@@ -1652,6 +1662,7 @@
return super.windowProc (hwnd, msg, wParam, lParam);
}
+@Override
LRESULT WM_CHAR (long /*int*/ wParam, long /*int*/ lParam) {
LRESULT result = super.WM_CHAR (wParam, lParam);
if (result != null) return result;
@@ -1680,6 +1691,7 @@
return result;
}
+@Override
LRESULT WM_KEYDOWN (long /*int*/ wParam, long /*int*/ lParam) {
LRESULT result = super.WM_KEYDOWN (wParam, lParam);
if (result != null) return result;
@@ -1784,6 +1796,7 @@
return result;
}
+@Override
LRESULT WM_SETREDRAW (long /*int*/ wParam, long /*int*/ lParam) {
LRESULT result = super.WM_SETREDRAW (wParam, lParam);
if (result != null) return result;
@@ -1797,6 +1810,7 @@
return result;
}
+@Override
LRESULT WM_SIZE (long /*int*/ wParam, long /*int*/ lParam) {
/*
* Bug in Windows. If the top index is changed while the
@@ -1825,6 +1839,7 @@
return result;
}
+@Override
LRESULT wmCommandChild (long /*int*/ wParam, long /*int*/ lParam) {
int code = OS.HIWORD (wParam);
switch (code) {
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/MenuItem.java b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/MenuItem.java
index ef37bac..59f09b4 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/MenuItem.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/MenuItem.java
@@ -232,6 +232,7 @@
addListener (SWT.DefaultSelection,typedListener);
}
+@Override
protected void checkSubclass () {
if (!isValidSubclass ()) error (SWT.ERROR_INVALID_SUBCLASS);
}
@@ -240,6 +241,7 @@
return checkBits (style, SWT.PUSH, SWT.CHECK, SWT.RADIO, SWT.SEPARATOR, SWT.CASCADE, 0);
}
+@Override
void destroyWidget () {
parent.destroyItem (this);
releaseHandle ();
@@ -453,11 +455,13 @@
* <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
* </ul>
*/
+@Override
public Menu getMenu () {
checkWidget ();
return menu;
}
+@Override
String getNameText () {
if ((style & SWT.SEPARATOR) != 0) return "|";
return super.getNameText ();
@@ -546,6 +550,7 @@
return getEnabled () && parent.isEnabled ();
}
+@Override
void releaseChildren (boolean destroy) {
if (menu != null) {
menu.release (false);
@@ -554,18 +559,21 @@
super.releaseChildren (destroy);
}
+@Override
void releaseHandle () {
super.releaseHandle ();
parent = null;
id = -1;
}
+@Override
void releaseParent () {
super.releaseParent ();
if (menu != null) menu.dispose ();
menu = null;
}
+@Override
void releaseWidget () {
super.releaseWidget ();
if (hBitmap != 0) OS.DeleteObject (hBitmap);
@@ -649,6 +657,7 @@
}
+@Override
void reskinChildren (int flags) {
if (menu != null) {
menu.reskin (flags);
@@ -813,6 +822,7 @@
* <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
* </ul>
*/
+@Override
public void setImage (Image image) {
checkWidget ();
if ((style & SWT.SEPARATOR) != 0) return;
@@ -1103,6 +1113,7 @@
*
* @see #setAccelerator
*/
+@Override
public void setText (String string) {
checkWidget ();
if (string == null) error (SWT.ERROR_NULL_ARGUMENT);
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/ProgressBar.java b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/ProgressBar.java
index 4d3214c..73a1b8f 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/ProgressBar.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/ProgressBar.java
@@ -111,6 +111,7 @@
super (parent, checkStyle (style));
}
+@Override
long /*int*/ callWindowProc (long /*int*/ hwnd, int msg, long /*int*/ wParam, long /*int*/ lParam) {
if (handle == 0) return 0;
return OS.CallWindowProc (ProgressBarProc, hwnd, msg, wParam, lParam);
@@ -121,6 +122,7 @@
return checkBits (style, SWT.HORIZONTAL, SWT.VERTICAL, 0, 0, 0, 0);
}
+@Override
public Point computeSize (int wHint, int hHint, boolean changed) {
checkWidget ();
int border = getBorderWidth ();
@@ -137,11 +139,13 @@
return new Point (width, height);
}
+@Override
void createHandle () {
super.createHandle ();
startTimer ();
}
+@Override
int defaultForeground () {
return OS.GetSysColor (OS.COLOR_HIGHLIGHT);
}
@@ -221,6 +225,7 @@
return SWT.NORMAL;
}
+@Override
void releaseWidget () {
super.releaseWidget ();
stopTimer ();
@@ -248,11 +253,13 @@
}
}
+@Override
void setBackgroundPixel (int pixel) {
if (pixel == -1) pixel = OS.CLR_DEFAULT;
OS.SendMessage (handle, OS.PBM_SETBKCOLOR, 0, pixel);
}
+@Override
void setForegroundPixel (int pixel) {
if (pixel == -1) pixel = OS.CLR_DEFAULT;
OS.SendMessage (handle, OS.PBM_SETBARCOLOR, 0, pixel);
@@ -368,6 +375,7 @@
}
}
+@Override
int widgetStyle () {
int bits = super.widgetStyle ();
if ((style & SWT.SMOOTH) != 0) bits |= OS.PBS_SMOOTH;
@@ -376,14 +384,17 @@
return bits;
}
+@Override
TCHAR windowClass () {
return ProgressBarClass;
}
+@Override
long /*int*/ windowProc () {
return ProgressBarProc;
}
+@Override
LRESULT WM_GETDLGCODE (long /*int*/ wParam, long /*int*/ lParam) {
LRESULT result = super.WM_GETDLGCODE (wParam, lParam);
if (result != null) return result;
@@ -399,6 +410,7 @@
return new LRESULT (OS.DLGC_STATIC);
}
+@Override
LRESULT WM_SIZE (long /*int*/ wParam, long /*int*/ lParam) {
LRESULT result = super.WM_SIZE (wParam, lParam);
if (result != null) return result;
@@ -435,6 +447,7 @@
return result;
}
+@Override
LRESULT WM_TIMER (long /*int*/ wParam, long /*int*/ lParam) {
LRESULT result = super.WM_TIMER (wParam, lParam);
if (result != null) return result;
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Sash.java b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Sash.java
index c211d89..f6e2667 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Sash.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Sash.java
@@ -110,11 +110,13 @@
addListener (SWT.DefaultSelection,typedListener);
}
+@Override
long /*int*/ callWindowProc (long /*int*/ hwnd, int msg, long /*int*/ wParam, long /*int*/ lParam) {
if (handle == 0) return 0;
return OS.DefWindowProc (hwnd, msg, wParam, lParam);
}
+@Override
void createHandle () {
super.createHandle ();
state |= THEME_BACKGROUND;
@@ -124,6 +126,7 @@
return checkBits (style, SWT.HORIZONTAL, SWT.VERTICAL, 0, 0, 0, 0);
}
+@Override
public Point computeSize (int wHint, int hHint, boolean changed) {
checkWidget ();
int border = getBorderWidth ();
@@ -178,20 +181,24 @@
eventTable.unhook (SWT.DefaultSelection,listener);
}
+@Override
TCHAR windowClass () {
return display.windowClass;
}
+@Override
long /*int*/ windowProc () {
return display.windowProc;
}
+@Override
LRESULT WM_ERASEBKGND (long /*int*/ wParam, long /*int*/ lParam) {
super.WM_ERASEBKGND (wParam, lParam);
drawBackground (wParam);
return LRESULT.ONE;
}
+@Override
LRESULT WM_KEYDOWN (long /*int*/ wParam, long /*int*/ lParam) {
LRESULT result = super.WM_KEYDOWN (wParam, lParam);
if (result != null) return result;
@@ -254,10 +261,12 @@
return result;
}
+@Override
LRESULT WM_GETDLGCODE (long /*int*/ wParam, long /*int*/ lParam) {
return new LRESULT (OS.DLGC_STATIC);
}
+@Override
LRESULT WM_LBUTTONDOWN (long /*int*/ wParam, long /*int*/ lParam) {
LRESULT result = super.WM_LBUTTONDOWN (wParam, lParam);
if (result == LRESULT.ZERO) return result;
@@ -311,6 +320,7 @@
return result;
}
+@Override
LRESULT WM_LBUTTONUP (long /*int*/ wParam, long /*int*/ lParam) {
LRESULT result = super.WM_LBUTTONUP (wParam, lParam);
if (result == LRESULT.ZERO) return result;
@@ -341,6 +351,7 @@
return result;
}
+@Override
LRESULT WM_MOUSEMOVE (long /*int*/ wParam, long /*int*/ lParam) {
LRESULT result = super.WM_MOUSEMOVE (wParam, lParam);
if (result != null) return result;
@@ -396,6 +407,7 @@
return result;
}
+@Override
LRESULT WM_SETCURSOR (long /*int*/ wParam, long /*int*/ lParam) {
LRESULT result = super.WM_SETCURSOR (wParam, lParam);
if (result != null) return result;
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Scale.java b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Scale.java
index 1626942..168e9af 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Scale.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Scale.java
@@ -141,6 +141,7 @@
addListener (SWT.DefaultSelection,typedListener);
}
+@Override
long /*int*/ callWindowProc (long /*int*/ hwnd, int msg, long /*int*/ wParam, long /*int*/ lParam) {
if (handle == 0) return 0;
return OS.CallWindowProc (TrackBarProc, hwnd, msg, wParam, lParam);
@@ -150,6 +151,7 @@
return checkBits (style, SWT.HORIZONTAL, SWT.VERTICAL, 0, 0, 0, 0);
}
+@Override
public Point computeSize (int wHint, int hHint, boolean changed) {
checkWidget ();
int border = getBorderWidth ();
@@ -170,6 +172,7 @@
return new Point (width, height);
}
+@Override
void createHandle () {
super.createHandle ();
state |= THEME_BACKGROUND | DRAW_BACKGROUND;
@@ -179,6 +182,7 @@
createdAsRTL = (style & SWT.RIGHT_TO_LEFT) != 0;
}
+@Override
int defaultForeground () {
return OS.GetSysColor (OS.COLOR_BTNFACE);
}
@@ -287,6 +291,7 @@
eventTable.unhook (SWT.DefaultSelection,listener);
}
+@Override
void setBackgroundImage (long /*int*/ hImage) {
super.setBackgroundImage (hImage);
/*
@@ -300,6 +305,7 @@
ignoreResize = false;
}
+@Override
void setBackgroundPixel (int pixel) {
super.setBackgroundPixel (pixel);
/*
@@ -313,6 +319,7 @@
ignoreResize = false;
}
+@Override
void setBounds (int x, int y, int width, int height, int flags, boolean defer) {
/*
* Bug in Windows. If SetWindowPos() is called on a
@@ -443,20 +450,24 @@
OS.SendMessage (handle, OS.TBM_SETPOS, 1, value);
}
+@Override
int widgetStyle () {
int bits = super.widgetStyle () | OS.WS_TABSTOP | OS.TBS_BOTH | OS.TBS_AUTOTICKS;
if ((style & SWT.HORIZONTAL) != 0) return bits | OS.TBS_HORZ | OS.TBS_DOWNISLEFT;
return bits | OS.TBS_VERT;
}
+@Override
TCHAR windowClass () {
return TrackBarClass;
}
+@Override
long /*int*/ windowProc () {
return TrackBarProc;
}
+@Override
LRESULT WM_KEYDOWN (long /*int*/ wParam, long /*int*/ lParam) {
LRESULT result = super.WM_KEYDOWN (wParam, lParam);
if (result != null) return result;
@@ -480,6 +491,7 @@
return result;
}
+@Override
LRESULT WM_MOUSEWHEEL (long /*int*/ wParam, long /*int*/ lParam) {
LRESULT result = super.WM_MOUSEWHEEL (wParam, lParam);
if (result != null) return result;
@@ -508,6 +520,7 @@
return new LRESULT (code);
}
+@Override
LRESULT WM_PAINT (long /*int*/ wParam, long /*int*/ lParam) {
if ((state & DISPOSE_SENT) != 0) return LRESULT.ZERO;
@@ -542,11 +555,13 @@
return super.WM_PAINT (wParam, lParam);
}
+@Override
LRESULT WM_SIZE (long /*int*/ wParam, long /*int*/ lParam) {
if (ignoreResize) return null;
return super.WM_SIZE (wParam, lParam);
}
+@Override
LRESULT wmScrollChild (long /*int*/ wParam, long /*int*/ lParam) {
/* Do nothing when scrolling is ending */
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/ScrollBar.java b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/ScrollBar.java
index c764c15..fa74f01 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/ScrollBar.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/ScrollBar.java
@@ -180,6 +180,7 @@
*/
}
+@Override
void destroyWidget () {
long /*int*/ hwnd = hwndScrollBar ();
int type = scrollBarType ();
@@ -572,11 +573,13 @@
return getVisible () && parent.isVisible ();
}
+@Override
void releaseHandle () {
super.releaseHandle ();
parent = null;
}
+@Override
void releaseParent () {
super.releaseParent ();
if (parent.horizontalBar == this) parent.horizontalBar = null;
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Scrollable.java b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Scrollable.java
index 7e193cf..096be8d 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Scrollable.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Scrollable.java
@@ -81,6 +81,7 @@
super (parent, style);
}
+@Override
long /*int*/ callWindowProc (long /*int*/ hwnd, int msg, long /*int*/ wParam, long /*int*/ lParam) {
if (handle == 0) return 0;
return OS.DefWindowProc (hwnd, msg, wParam, lParam);
@@ -136,6 +137,7 @@
return bar;
}
+@Override
void createWidget () {
super.createWidget ();
if ((style & SWT.H_SCROLL) != 0) horizontalBar = createScrollBar (SWT.H_SCROLL);
@@ -266,6 +268,7 @@
return verticalBar;
}
+@Override
void releaseChildren (boolean destroy) {
if (horizontalBar != null) {
horizontalBar.release (false);
@@ -278,6 +281,7 @@
super.releaseChildren (destroy);
}
+@Override
void reskinChildren (int flags) {
if (horizontalBar != null) horizontalBar.reskin (flags);
if (verticalBar != null) verticalBar.reskin (flags);
@@ -288,6 +292,7 @@
return handle;
}
+@Override
int widgetExtStyle () {
return super.widgetExtStyle ();
/*
@@ -302,6 +307,7 @@
// return super.widgetExtStyle ();
}
+@Override
int widgetStyle () {
int bits = super.widgetStyle () | OS.WS_TABSTOP;
if ((style & SWT.H_SCROLL) != 0) bits |= OS.WS_HSCROLL;
@@ -309,14 +315,17 @@
return bits;
}
+@Override
TCHAR windowClass () {
return display.windowClass;
}
+@Override
long /*int*/ windowProc () {
return display.windowProc;
}
+@Override
LRESULT WM_HSCROLL (long /*int*/ wParam, long /*int*/ lParam) {
LRESULT result = super.WM_HSCROLL (wParam, lParam);
if (result != null) return result;
@@ -334,10 +343,12 @@
return result;
}
+@Override
LRESULT WM_MOUSEWHEEL (long /*int*/ wParam, long /*int*/ lParam) {
return wmScrollWheel ((state & CANVAS) != 0, wParam, lParam);
}
+@Override
LRESULT WM_SIZE (long /*int*/ wParam, long /*int*/ lParam) {
long /*int*/ code = callWindowProc (handle, OS.WM_SIZE, wParam, lParam);
super.WM_SIZE (wParam, lParam);
@@ -346,6 +357,7 @@
return new LRESULT (code);
}
+@Override
LRESULT WM_VSCROLL (long /*int*/ wParam, long /*int*/ lParam) {
LRESULT result = super.WM_VSCROLL (wParam, lParam);
if (result != null) return result;
@@ -362,6 +374,7 @@
return result;
}
+@Override
LRESULT wmNCPaint (long /*int*/ hwnd, long /*int*/ wParam, long /*int*/ lParam) {
LRESULT result = super.wmNCPaint (hwnd, wParam, lParam);
if (result != null) return result;
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Slider.java b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Slider.java
index 5dee484..9c922b5 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Slider.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Slider.java
@@ -152,6 +152,7 @@
addListener (SWT.DefaultSelection,typedListener);
}
+@Override
long /*int*/ callWindowProc (long /*int*/ hwnd, int msg, long /*int*/ wParam, long /*int*/ lParam) {
if (handle == 0) return 0;
/*
@@ -174,6 +175,7 @@
return checkBits (style, SWT.HORIZONTAL, SWT.VERTICAL, 0, 0, 0, 0);
}
+@Override
public Point computeSize (int wHint, int hHint, boolean changed) {
checkWidget ();
int border = getBorderWidth ();
@@ -190,6 +192,7 @@
return new Point (width, height);
}
+@Override
void createWidget () {
super.createWidget ();
increment = 1;
@@ -208,14 +211,17 @@
OS.SetScrollInfo (handle, OS.SB_CTL, info, true);
}
+@Override
int defaultBackground () {
return OS.GetSysColor (OS.COLOR_SCROLLBAR);
}
+@Override
int defaultForeground () {
return OS.GetSysColor (OS.COLOR_BTNFACE);
}
+@Override
void enableWidget (boolean enabled) {
super.enableWidget (enabled);
if (!OS.IsWinCE) {
@@ -229,6 +235,7 @@
}
}
+@Override
public boolean getEnabled () {
checkWidget ();
return (state & DISABLED) == 0;
@@ -370,6 +377,7 @@
eventTable.unhook (SWT.DefaultSelection,listener);
}
+@Override
void setBounds (int x, int y, int width, int height, int flags) {
super.setBounds (x, y, width, height, flags);
/*
@@ -597,6 +605,7 @@
SetScrollInfo (handle, OS.SB_CTL, info, true);
}
+@Override
int widgetExtStyle () {
/*
* Bug in Windows. If a scroll bar control is given a border,
@@ -609,6 +618,7 @@
return bits;
}
+@Override
int widgetStyle () {
int bits = super.widgetStyle () | OS.WS_TABSTOP;
/*
@@ -621,14 +631,17 @@
return bits | OS.SBS_VERT;
}
+@Override
TCHAR windowClass () {
return ScrollBarClass;
}
+@Override
long /*int*/ windowProc () {
return ScrollBarProc;
}
+@Override
LRESULT WM_KEYDOWN (long /*int*/ wParam, long /*int*/ lParam) {
LRESULT result = super.WM_KEYDOWN (wParam, lParam);
if (result != null) return result;
@@ -655,6 +668,7 @@
return result;
}
+@Override
LRESULT WM_LBUTTONDBLCLK (long /*int*/ wParam, long /*int*/ lParam) {
/*
* Feature in Windows. Windows uses the WS_TABSTOP
@@ -688,6 +702,7 @@
return result;
}
+@Override
LRESULT WM_LBUTTONDOWN (long /*int*/ wParam, long /*int*/ lParam) {
/*
* Feature in Windows. Windows uses the WS_TABSTOP
@@ -721,11 +736,13 @@
return result;
}
+@Override
LRESULT WM_SETFOCUS (long /*int*/ wParam, long /*int*/ lParam) {
if (ignoreFocus) return null;
return super.WM_SETFOCUS (wParam, lParam);
}
+@Override
LRESULT wmScrollChild (long /*int*/ wParam, long /*int*/ lParam) {
/* Do nothing when scrolling is ending */
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Spinner.java b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Spinner.java
index 0aa9b0b..d0aef39 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Spinner.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Spinner.java
@@ -107,6 +107,7 @@
super (parent, checkStyle (style));
}
+@Override
long /*int*/ callWindowProc (long /*int*/ hwnd, int msg, long /*int*/ wParam, long /*int*/ lParam) {
if (handle == 0) return 0;
if (hwnd == hwndText) {
@@ -129,14 +130,17 @@
return style & ~(SWT.H_SCROLL | SWT.V_SCROLL);
}
+@Override
boolean checkHandle (long /*int*/ hwnd) {
return hwnd == handle || hwnd == hwndText || hwnd == hwndUpDown;
}
+@Override
protected void checkSubclass () {
if (!isValidSubclass ()) error (SWT.ERROR_INVALID_SUBCLASS);
}
+@Override
void createHandle () {
super.createHandle ();
state &= ~(CANVAS | THEME_BACKGROUND);
@@ -280,10 +284,12 @@
addListener (SWT.Verify, typedListener);
}
+@Override
long /*int*/ borderHandle () {
return hwndText;
}
+@Override
public Point computeSize (int wHint, int hHint, boolean changed) {
checkWidget ();
int width = 0, height = 0;
@@ -332,6 +338,7 @@
return new Point (trim.width, trim.height);
}
+@Override
public Rectangle computeTrim (int x, int y, int width, int height) {
checkWidget ();
@@ -397,22 +404,26 @@
OS.SendMessage (hwndText, OS.WM_CUT, 0, 0);
}
+@Override
int defaultBackground () {
return OS.GetSysColor (OS.COLOR_WINDOW);
}
+@Override
void enableWidget (boolean enabled) {
super.enableWidget (enabled);
OS.EnableWindow (hwndText, enabled);
OS.EnableWindow (hwndUpDown, enabled);
}
+@Override
void deregister () {
super.deregister ();
display.removeControl (hwndText);
display.removeControl (hwndUpDown);
}
+@Override
boolean hasFocus () {
long /*int*/ hwndFocus = OS.GetFocus ();
if (hwndFocus == handle) return true;
@@ -646,12 +657,14 @@
OS.SendMessage (hwndText, OS.WM_PASTE, 0, 0);
}
+@Override
void register () {
super.register ();
display.addControl (hwndText, this);
display.addControl (hwndUpDown, this);
}
+@Override
void releaseHandle () {
super.releaseHandle ();
hwndText = hwndUpDown = 0;
@@ -730,6 +743,7 @@
eventTable.unhook (SWT.Verify, listener);
}
+@Override
boolean sendKeyEvent (int type, int msg, long /*int*/ wParam, long /*int*/ lParam, Event event) {
if (!super.sendKeyEvent (type, msg, wParam, lParam, event)) {
return false;
@@ -813,11 +827,13 @@
return false;
}
+@Override
void setBackgroundImage (long /*int*/ hBitmap) {
super.setBackgroundImage (hBitmap);
OS.InvalidateRect (hwndText, null, true);
}
+@Override
void setBackgroundPixel (int pixel) {
super.setBackgroundPixel (pixel);
OS.InvalidateRect (hwndText, null, true);
@@ -857,6 +873,7 @@
setSelection (pos, false, true, false);
}
+@Override
void setForegroundPixel (int pixel) {
super.setForegroundPixel (pixel);
OS.InvalidateRect (hwndText, null, true);
@@ -1058,6 +1075,7 @@
OS.SendMessage (hwndText, OS.EM_SETLIMITTEXT, limit, 0);
}
+@Override
void setToolTipText (Shell shell, String string) {
shell.setToolTipText (hwndText, string);
shell.setToolTipText (hwndUpDown, string);
@@ -1100,6 +1118,7 @@
setSelection (selection, true, true, false);
}
+@Override
void subclass () {
super.subclass ();
long /*int*/ newProc = display.windowProc;
@@ -1107,12 +1126,14 @@
OS.SetWindowLongPtr (hwndUpDown, OS.GWLP_WNDPROC, newProc);
}
+@Override
void unsubclass () {
super.unsubclass ();
OS.SetWindowLongPtr (hwndText, OS.GWLP_WNDPROC, EditProc);
OS.SetWindowLongPtr (hwndUpDown, OS.GWLP_WNDPROC, UpDownProc);
}
+@Override
void updateOrientation () {
super.updateOrientation ();
int bits = OS.GetWindowLong (hwndText, OS.GWL_EXSTYLE);
@@ -1172,10 +1193,12 @@
return event.text;
}
+@Override
int widgetExtStyle () {
return super.widgetExtStyle () & ~OS.WS_EX_CLIENTEDGE;
}
+@Override
long /*int*/ windowProc (long /*int*/ hwnd, int msg, long /*int*/ wParam, long /*int*/ lParam) {
if (hwnd == hwndText || hwnd == hwndUpDown) {
LRESULT result = null;
@@ -1236,22 +1259,26 @@
return super.windowProc (hwnd, msg, wParam, lParam);
}
+@Override
LRESULT WM_ERASEBKGND (long /*int*/ wParam, long /*int*/ lParam) {
super.WM_ERASEBKGND (wParam, lParam);
drawBackground (wParam);
return LRESULT.ONE;
}
+@Override
LRESULT WM_KILLFOCUS (long /*int*/ wParam, long /*int*/ lParam) {
return null;
}
+@Override
LRESULT WM_SETFOCUS (long /*int*/ wParam, long /*int*/ lParam) {
OS.SetFocus (hwndText);
OS.SendMessage (hwndText, OS.EM_SETSEL, 0, -1);
return null;
}
+@Override
LRESULT WM_SETFONT (long /*int*/ wParam, long /*int*/ lParam) {
LRESULT result = super.WM_SETFONT (wParam, lParam);
if (result != null) return result;
@@ -1259,6 +1286,7 @@
return result;
}
+@Override
LRESULT WM_SIZE (long /*int*/ wParam, long /*int*/ lParam) {
LRESULT result = super.WM_SIZE (wParam, lParam);
if (isDisposed ()) return result;
@@ -1272,6 +1300,7 @@
return result;
}
+@Override
LRESULT wmIMEChar(long /*int*/ hwnd, long /*int*/ wParam, long /*int*/ lParam) {
/* Process a DBCS character */
@@ -1306,6 +1335,7 @@
return new LRESULT (result);
}
+@Override
LRESULT wmChar (long /*int*/ hwnd, long /*int*/ wParam, long /*int*/ lParam) {
if (ignoreCharacter) return null;
LRESULT result = super.wmChar (hwnd, wParam, lParam);
@@ -1393,6 +1423,7 @@
return null;
}
+@Override
LRESULT wmCommandChild (long /*int*/ wParam, long /*int*/ lParam) {
int code = OS.HIWORD (wParam);
switch (code) {
@@ -1416,6 +1447,7 @@
return super.wmCommandChild (wParam, lParam);
}
+@Override
LRESULT wmKeyDown (long /*int*/ hwnd, long /*int*/ wParam, long /*int*/ lParam) {
if (ignoreCharacter) return null;
LRESULT result = super.wmKeyDown (hwnd, wParam, lParam);
@@ -1461,6 +1493,7 @@
return result;
}
+@Override
LRESULT wmKillFocus (long /*int*/ hwnd, long /*int*/ wParam, long /*int*/ lParam) {
boolean [] parseFail = new boolean [1];
int value = getSelectionText (parseFail);
@@ -1475,6 +1508,7 @@
return super.wmKillFocus (hwnd, wParam, lParam);
}
+@Override
LRESULT wmNotifyChild (NMHDR hdr, long /*int*/ wParam, long /*int*/ lParam) {
switch (hdr.code) {
case OS.UDN_DELTAPOS:
@@ -1504,6 +1538,7 @@
return super.wmNotifyChild (hdr, wParam, lParam);
}
+@Override
LRESULT wmScrollChild (long /*int*/ wParam, long /*int*/ lParam) {
int code = OS.LOWORD (wParam);
switch (code) {
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/TabFolder.java b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/TabFolder.java
index c82a698..02ed4ba 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/TabFolder.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/TabFolder.java
@@ -162,6 +162,7 @@
addListener(SWT.DefaultSelection,typedListener);
}
+@Override
long /*int*/ callWindowProc (long /*int*/ hwnd, int msg, long /*int*/ wParam, long /*int*/ lParam) {
if (handle == 0) return 0;
return OS.CallWindowProc (TabFolderProc, hwnd, msg, wParam, lParam);
@@ -187,10 +188,12 @@
return style & ~(SWT.H_SCROLL | SWT.V_SCROLL);
}
+@Override
protected void checkSubclass () {
if (!isValidSubclass ()) error (SWT.ERROR_INVALID_SUBCLASS);
}
+@Override
public Point computeSize (int wHint, int hHint, boolean changed) {
checkWidget ();
Point size = super.computeSize (wHint, hHint, changed);
@@ -212,6 +215,7 @@
return size;
}
+@Override
public Rectangle computeTrim (int x, int y, int width, int height) {
checkWidget ();
RECT rect = new RECT ();
@@ -253,6 +257,7 @@
}
}
+@Override
void createHandle () {
super.createHandle ();
state &= ~(CANVAS | THEME_BACKGROUND);
@@ -275,6 +280,7 @@
createdAsRTL = (style & SWT.RIGHT_TO_LEFT) != 0;
}
+@Override
void createWidget () {
super.createWidget ();
items = new TabItem [4];
@@ -307,6 +313,7 @@
}
}
+@Override
void drawThemeBackground (long /*int*/ hDC, long /*int*/ hwnd, RECT rect) {
RECT rect2 = new RECT ();
OS.GetClientRect (handle, rect2);
@@ -316,11 +323,13 @@
}
}
+@Override
Control findThemeControl () {
/* It is not possible to change the background of this control */
return this;
}
+@Override
public Rectangle getClientArea () {
checkWidget ();
forceResize ();
@@ -507,6 +516,7 @@
return -1;
}
+@Override
Point minimumSize (int wHint, int hHint, boolean flushCache) {
Control [] children = _getChildren ();
int width = 0, height = 0;
@@ -531,6 +541,7 @@
return new Point (width, height);
}
+@Override
boolean mnemonicHit (char key) {
for (int i=0; i<items.length; i++) {
TabItem item = items [i];
@@ -547,6 +558,7 @@
return false;
}
+@Override
boolean mnemonicMatch (char key) {
for (int i=0; i<items.length; i++) {
TabItem item = items [i];
@@ -560,6 +572,7 @@
return false;
}
+@Override
void releaseChildren (boolean destroy) {
if (items != null) {
int count = (int)/*64*/OS.SendMessage (handle, OS.TCM_GETITEMCOUNT, 0, 0);
@@ -574,6 +587,7 @@
super.releaseChildren (destroy);
}
+@Override
void releaseWidget () {
super.releaseWidget ();
if (imageList != null) {
@@ -583,6 +597,7 @@
imageList = null;
}
+@Override
void removeControl (Control control) {
super.removeControl (control);
int count = (int)/*64*/OS.SendMessage (handle, OS.TCM_GETITEMCOUNT, 0, 0);
@@ -618,6 +633,7 @@
}
+@Override
void reskinChildren (int flags) {
if (items != null) {
int count = (int)/*64*/OS.SendMessage (handle, OS.TCM_GETITEMCOUNT, 0, 0);
@@ -680,6 +696,7 @@
}
}
+@Override
public void setFont (Font font) {
checkWidget ();
Rectangle oldRect = getClientArea ();
@@ -745,6 +762,7 @@
}
}
+@Override
boolean updateTextDirection(int textDirection) {
if (super.updateTextDirection(textDirection)) {
if (textDirection != AUTO_TEXT_DIRECTION) {
@@ -758,6 +776,7 @@
return false;
}
+@Override
String toolTipText (NMTTDISPINFO hdr) {
if ((hdr.uFlags & OS.TTF_IDISHWND) != 0) {
return null;
@@ -787,6 +806,7 @@
return super.toolTipText (hdr);
}
+@Override
boolean traversePage (boolean next) {
int count = getItemCount ();
if (count <= 1) return false;
@@ -805,6 +825,7 @@
return false;
}
+@Override
void updateOrientation () {
super.updateOrientation ();
long /*int*/ hwndChild = OS.GetWindow (handle, OS.GW_CHILD);
@@ -851,6 +872,7 @@
}
}
+@Override
int widgetStyle () {
/*
* Bug in Windows. Under certain circumstances,
@@ -865,14 +887,17 @@
return bits | OS.TCS_TABS | OS.TCS_TOOLTIPS;
}
+@Override
TCHAR windowClass () {
return TabFolderClass;
}
+@Override
long /*int*/ windowProc () {
return TabFolderProc;
}
+@Override
LRESULT WM_GETDLGCODE (long /*int*/ wParam, long /*int*/ lParam) {
LRESULT result = super.WM_GETDLGCODE (wParam, lParam);
/*
@@ -884,6 +909,7 @@
return new LRESULT (OS.DLGC_BUTTON | OS.DLGC_WANTARROWS);
}
+@Override
LRESULT WM_GETOBJECT (long /*int*/ wParam, long /*int*/ lParam) {
/*
* Ensure that there is an accessible object created for this
@@ -894,6 +920,7 @@
return super.WM_GETOBJECT (wParam, lParam);
}
+@Override
LRESULT WM_KEYDOWN (long /*int*/ wParam, long /*int*/ lParam) {
LRESULT result = super.WM_KEYDOWN (wParam, lParam);
if (result != null) return result;
@@ -917,6 +944,7 @@
return result;
}
+@Override
LRESULT WM_MOUSELEAVE (long /*int*/ wParam, long /*int*/ lParam) {
LRESULT result = super.WM_MOUSELEAVE (wParam, lParam);
if (result != null) return result;
@@ -945,6 +973,7 @@
return result;
}
+@Override
LRESULT WM_NCHITTEST (long /*int*/ wParam, long /*int*/ lParam) {
LRESULT result = super.WM_NCHITTEST (wParam, lParam);
if (result != null) return result;
@@ -964,6 +993,7 @@
return new LRESULT (hittest);
}
+@Override
LRESULT WM_NOTIFY (long /*int*/ wParam, long /*int*/ lParam) {
/*
* Feature in Windows. When the tab folder window
@@ -988,6 +1018,7 @@
return LRESULT.ZERO;
}
+@Override
LRESULT WM_PARENTNOTIFY (long /*int*/ wParam, long /*int*/ lParam) {
LRESULT result = super.WM_PARENTNOTIFY (wParam, lParam);
if (result != null) return result;
@@ -1019,6 +1050,7 @@
return result;
}
+@Override
LRESULT WM_SIZE (long /*int*/ wParam, long /*int*/ lParam) {
LRESULT result = super.WM_SIZE (wParam, lParam);
/*
@@ -1040,6 +1072,7 @@
return result;
}
+@Override
LRESULT WM_WINDOWPOSCHANGING (long /*int*/ wParam, long /*int*/ lParam) {
LRESULT result = super.WM_WINDOWPOSCHANGING (wParam, lParam);
if (result != null) return result;
@@ -1089,6 +1122,7 @@
return result;
}
+@Override
LRESULT wmNotifyChild (NMHDR hdr, long /*int*/ wParam, long /*int*/ lParam) {
int code = hdr.code;
switch (code) {
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/TabItem.java b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/TabItem.java
index 54c7f77..ad1b055 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/TabItem.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/TabItem.java
@@ -144,10 +144,12 @@
OS.HeapFree (hHeap, 0, pszText);
}
+@Override
protected void checkSubclass () {
if (!isValidSubclass ()) error (SWT.ERROR_INVALID_SUBCLASS);
}
+@Override
void destroyWidget () {
parent.destroyItem (this);
releaseHandle ();
@@ -223,11 +225,13 @@
return toolTipText;
}
+@Override
void releaseHandle () {
super.releaseHandle ();
parent = null;
}
+@Override
void releaseParent () {
super.releaseParent ();
int index = parent.indexOf (this);
@@ -236,6 +240,7 @@
}
}
+@Override
void releaseWidget () {
super.releaseWidget ();
control = null;
@@ -286,6 +291,7 @@
oldControl.setVisible (false);
}
+@Override
public void setImage (Image image) {
checkWidget();
int index = parent.indexOf (this);
@@ -334,6 +340,7 @@
* </ul>
*
*/
+@Override
public void setText (String string) {
checkWidget();
if (string == null) error (SWT.ERROR_NULL_ARGUMENT);
@@ -351,6 +358,7 @@
}
}
+@Override
boolean updateTextDirection(int textDirection) {
/* AUTO is handled by super */
if (super.updateTextDirection(textDirection) && OS.IsUnicode) {
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Table.java b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Table.java
index 48b7fb2..e2dd3c3 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Table.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Table.java
@@ -143,6 +143,7 @@
super (parent, checkStyle (style));
}
+@Override
void _addListener (int eventType, Listener listener) {
super._addListener (eventType, listener);
switch (eventType) {
@@ -440,6 +441,7 @@
addListener (SWT.DefaultSelection,typedListener);
}
+@Override
long /*int*/ callWindowProc (long /*int*/ hwnd, int msg, long /*int*/ wParam, long /*int*/ lParam) {
return callWindowProc (hwnd, msg, wParam, lParam, false);
}
@@ -1158,6 +1160,7 @@
return new LRESULT (code);
}
+@Override
void checkBuffered () {
super.checkBuffered ();
if (OS.COMCTL32_MAJOR >= 6) style |= SWT.DOUBLE_BUFFERED;
@@ -1190,11 +1193,13 @@
return true;
}
+@Override
boolean checkHandle (long /*int*/ hwnd) {
if (hwnd == handle) return true;
return hwnd == OS.SendMessage (handle, OS.LVM_GETHEADER, 0, 0);
}
+@Override
protected void checkSubclass () {
if (!isValidSubclass ()) error (SWT.ERROR_INVALID_SUBCLASS);
}
@@ -1458,6 +1463,7 @@
}
}
+@Override
public Point computeSize (int wHint, int hHint, boolean changed) {
checkWidget ();
if (fixScrollWidth) setScrollWidth (null, true);
@@ -1519,6 +1525,7 @@
return new Point (width, height);
}
+@Override
void createHandle () {
super.createHandle ();
state &= ~(CANVAS | THEME_BACKGROUND);
@@ -1862,6 +1869,7 @@
if (count == 0) setScrollWidth (item, false);
}
+@Override
void createWidget () {
super.createWidget ();
itemHeight = hotIndex = -1;
@@ -1869,10 +1877,12 @@
columns = new TableColumn [4];
}
+@Override
int defaultBackground () {
return OS.GetSysColor (OS.COLOR_WINDOW);
}
+@Override
void deregister () {
super.deregister ();
long /*int*/ hwndHeader = OS.SendMessage (handle, OS.LVM_GETHEADER, 0, 0);
@@ -3073,12 +3083,14 @@
return (result != 0) && ((lvItem.state & OS.LVIS_SELECTED) != 0);
}
+@Override
void register () {
super.register ();
long /*int*/ hwndHeader = OS.SendMessage (handle, OS.LVM_GETHEADER, 0, 0);
if (hwndHeader != 0) display.addControl (hwndHeader, this);
}
+@Override
void releaseChildren (boolean destroy) {
if (_hasItems ()) {
int itemCount = (int)/*64*/OS.SendMessage (handle, OS.LVM_GETITEMCOUNT, 0, 0);
@@ -3132,6 +3144,7 @@
super.releaseChildren (destroy);
}
+@Override
void releaseWidget () {
super.releaseWidget ();
customDraw = false;
@@ -3412,6 +3425,7 @@
}
}
+@Override
void reskinChildren (int flags) {
if (_hasItems ()) {
int itemCount = (int)/*64*/OS.SendMessage (handle, OS.LVM_GETITEMCOUNT, 0, 0);
@@ -4118,6 +4132,7 @@
return event;
}
+@Override
void setBackgroundImage (long /*int*/ hBitmap) {
super.setBackgroundImage (hBitmap);
if (hBitmap != 0) {
@@ -4129,6 +4144,7 @@
}
}
+@Override
void setBackgroundPixel (int newPixel) {
int oldPixel = (int)/*64*/OS.SendMessage (handle, OS.LVM_GETBKCOLOR, 0, 0);
if (oldPixel != OS.CLR_NONE) {
@@ -4233,6 +4249,7 @@
}
}
+@Override
void setBounds (int x, int y, int width, int height, int flags, boolean defer) {
/*
* Bug in Windows. If the table column widths are adjusted
@@ -4526,6 +4543,7 @@
OS.SendMessage (handle, OS.LVM_SETSELECTIONMARK, 0, index);
}
+@Override
public void setFont (Font font) {
checkWidget ();
/*
@@ -4566,6 +4584,7 @@
OS.InvalidateRect (hwndHeader, null, true);
}
+@Override
void setForegroundPixel (int pixel) {
/*
* The Windows table control uses CLR_DEFAULT to indicate
@@ -4794,6 +4813,7 @@
}
}
+@Override
public void setRedraw (boolean redraw) {
checkWidget ();
/*
@@ -5561,6 +5581,7 @@
// redraw ();
}
+@Override
void subclass () {
super.subclass ();
if (HeaderProc != 0) {
@@ -5592,6 +5613,7 @@
return toolRect;
}
+@Override
String toolTipText (NMTTDISPINFO hdr) {
long /*int*/ hwndToolTip = OS.SendMessage (handle, OS.LVM_GETTOOLTIPS, 0, 0);
if (hwndToolTip == hdr.hwndFrom && toolTipText != null) return ""; //$NON-NLS-1$
@@ -5604,6 +5626,7 @@
return super.toolTipText (hdr);
}
+@Override
void unsubclass () {
super.unsubclass ();
if (HeaderProc != 0) {
@@ -5612,6 +5635,7 @@
}
}
+@Override
void update (boolean all) {
// checkWidget ();
/*
@@ -5661,6 +5685,7 @@
}
}
+@Override
void updateImages () {
if (sortColumn != null && !sortColumn.isDisposed ()) {
if (OS.COMCTL32_MAJOR < 6) {
@@ -5674,6 +5699,7 @@
}
}
+@Override
void updateMenuLocation (Event event) {
Rectangle clientArea = getClientArea ();
int x = clientArea.x, y = clientArea.y;
@@ -5704,6 +5730,7 @@
OS.SendMessage (handle, OS.LVM_SETEXTENDEDLISTVIEWSTYLE, OS.LVS_EX_HEADERDRAGDROP, newBits);
}
+@Override
void updateOrientation () {
super.updateOrientation ();
long /*int*/ hwndHeader = OS.SendMessage (handle, OS.LVM_GETHEADER, 0, 0);
@@ -5786,6 +5813,7 @@
}
}
+@Override
boolean updateTextDirection(int textDirection) {
if (super.updateTextDirection(textDirection)) {
if (textDirection == AUTO_TEXT_DIRECTION || (state & HAS_AUTO_DIRECTION) != 0) {
@@ -5801,6 +5829,7 @@
return false;
}
+@Override
int widgetStyle () {
int bits = super.widgetStyle () | OS.LVS_SHAREIMAGELISTS;
if ((style & SWT.HIDE_SELECTION) == 0) bits |= OS.LVS_SHOWSELALWAYS;
@@ -5816,14 +5845,17 @@
return bits;
}
+@Override
TCHAR windowClass () {
return TableClass;
}
+@Override
long /*int*/ windowProc () {
return TableProc;
}
+@Override
long /*int*/ windowProc (long /*int*/ hwnd, int msg, long /*int*/ wParam, long /*int*/ lParam) {
if (handle == 0) return 0;
if (hwnd != handle) {
@@ -5994,6 +6026,7 @@
return super.windowProc (hwnd, msg, wParam, lParam);
}
+@Override
LRESULT WM_CHAR (long /*int*/ wParam, long /*int*/ lParam) {
LRESULT result = super.WM_CHAR (wParam, lParam);
if (result != null) return result;
@@ -6036,6 +6069,7 @@
return result;
}
+@Override
LRESULT WM_CONTEXTMENU (long /*int*/ wParam, long /*int*/ lParam) {
/*
* Feature in Windows. For some reason, when the right
@@ -6053,6 +6087,7 @@
return super.WM_CONTEXTMENU (wParam, lParam);
}
+@Override
LRESULT WM_ERASEBKGND (long /*int*/ wParam, long /*int*/ lParam) {
LRESULT result = super.WM_ERASEBKGND (wParam, lParam);
if (findImageControl () != null) return LRESULT.ONE;
@@ -6065,6 +6100,7 @@
return result;
}
+@Override
LRESULT WM_GETOBJECT (long /*int*/ wParam, long /*int*/ lParam) {
/*
* Ensure that there is an accessible object created for this
@@ -6077,6 +6113,7 @@
return super.WM_GETOBJECT (wParam, lParam);
}
+@Override
LRESULT WM_KEYDOWN (long /*int*/ wParam, long /*int*/ lParam) {
LRESULT result = super.WM_KEYDOWN (wParam, lParam);
if (result != null) return result;
@@ -6145,6 +6182,7 @@
return result;
}
+@Override
LRESULT WM_KILLFOCUS (long /*int*/ wParam, long /*int*/ lParam) {
LRESULT result = super.WM_KILLFOCUS (wParam, lParam);
/*
@@ -6159,6 +6197,7 @@
return result;
}
+@Override
LRESULT WM_LBUTTONDBLCLK (long /*int*/ wParam, long /*int*/ lParam) {
/*
@@ -6209,6 +6248,7 @@
return LRESULT.ZERO;
}
+@Override
LRESULT WM_LBUTTONDOWN (long /*int*/ wParam, long /*int*/ lParam) {
/*
* Feature in Windows. For some reason, capturing
@@ -6247,6 +6287,7 @@
return result;
}
+@Override
LRESULT WM_MOUSEHOVER (long /*int*/ wParam, long /*int*/ lParam) {
/*
* Feature in Windows. Despite the fact that hot
@@ -6262,6 +6303,7 @@
return LRESULT.ZERO;
}
+@Override
LRESULT WM_PAINT (long /*int*/ wParam, long /*int*/ lParam) {
if ((state & DISPOSE_SENT) != 0) return LRESULT.ZERO;
@@ -6329,6 +6371,7 @@
return super.WM_PAINT (wParam, lParam);
}
+@Override
LRESULT WM_RBUTTONDBLCLK (long /*int*/ wParam, long /*int*/ lParam) {
/*
* Feature in Windows. When the user selects outside of
@@ -6353,6 +6396,7 @@
return LRESULT.ZERO;
}
+@Override
LRESULT WM_RBUTTONDOWN (long /*int*/ wParam, long /*int*/ lParam) {
/*
* Feature in Windows. For some reason, capturing
@@ -6364,6 +6408,7 @@
return sendMouseDownEvent (SWT.MouseDown, 3, OS.WM_RBUTTONDOWN, wParam, lParam);
}
+@Override
LRESULT WM_SETFOCUS (long /*int*/ wParam, long /*int*/ lParam) {
LRESULT result = super.WM_SETFOCUS (wParam, lParam);
/*
@@ -6399,6 +6444,7 @@
return result;
}
+@Override
LRESULT WM_SETFONT (long /*int*/ wParam, long /*int*/ lParam) {
LRESULT result = super.WM_SETFONT (wParam, lParam);
if (result != null) return result;
@@ -6423,6 +6469,7 @@
return result;
}
+@Override
LRESULT WM_SETREDRAW (long /*int*/ wParam, long /*int*/ lParam) {
LRESULT result = super.WM_SETREDRAW (wParam, lParam);
if (result != null) return result;
@@ -6455,6 +6502,7 @@
return code == 0 ? LRESULT.ZERO : new LRESULT (code);
}
+@Override
LRESULT WM_SIZE (long /*int*/ wParam, long /*int*/ lParam) {
if (ignoreResize) return null;
if (hooks (SWT.EraseItem) || hooks (SWT.PaintItem)) {
@@ -6467,6 +6515,7 @@
return super.WM_SIZE (wParam, lParam);
}
+@Override
LRESULT WM_SYSCOLORCHANGE (long /*int*/ wParam, long /*int*/ lParam) {
LRESULT result = super.WM_SYSCOLORCHANGE (wParam, lParam);
if (result != null) return result;
@@ -6483,6 +6532,7 @@
return result;
}
+@Override
LRESULT WM_HSCROLL (long /*int*/ wParam, long /*int*/ lParam) {
/*
* Bug in Windows. When a table that is drawing grid lines
@@ -6602,6 +6652,7 @@
return result;
}
+@Override
LRESULT WM_VSCROLL (long /*int*/ wParam, long /*int*/ lParam) {
/*
* When there are many columns in a table, scrolling performance
@@ -6724,6 +6775,7 @@
return result;
}
+@Override
LRESULT wmMeasureChild (long /*int*/ wParam, long /*int*/ lParam) {
MEASUREITEMSTRUCT struct = new MEASUREITEMSTRUCT ();
OS.MoveMemory (struct, lParam, MEASUREITEMSTRUCT.sizeof);
@@ -6738,6 +6790,7 @@
return null;
}
+@Override
LRESULT wmNotify (NMHDR hdr, long /*int*/ wParam, long /*int*/ lParam) {
long /*int*/ hwndToolTip = OS.SendMessage (handle, OS.LVM_GETTOOLTIPS, 0, 0);
if (hdr.hwndFrom == hwndToolTip) {
@@ -6752,6 +6805,7 @@
return super.wmNotify (hdr, wParam, lParam);
}
+@Override
LRESULT wmNotifyChild (NMHDR hdr, long /*int*/ wParam, long /*int*/ lParam) {
switch (hdr.code) {
case OS.LVN_ODFINDITEMA:
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/TableColumn.java b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/TableColumn.java
index 0534f7b..90708c2 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/TableColumn.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/TableColumn.java
@@ -186,10 +186,12 @@
return checkBits (style, SWT.LEFT, SWT.CENTER, SWT.RIGHT, 0, 0, 0);
}
+@Override
protected void checkSubclass () {
if (!isValidSubclass ()) error (SWT.ERROR_INVALID_SUBCLASS);
}
+@Override
void destroyWidget () {
parent.destroyItem (this);
releaseHandle ();
@@ -215,6 +217,7 @@
return SWT.LEFT;
}
+@Override
String getNameText () {
return getText ();
}
@@ -481,11 +484,13 @@
}
}
+@Override
void releaseHandle () {
super.releaseHandle ();
parent = null;
}
+@Override
void releaseParent () {
super.releaseParent ();
if (parent.sortColumn == this) {
@@ -595,6 +600,7 @@
}
}
+@Override
public void setImage (Image image) {
checkWidget();
if (image != null && image.isDisposed ()) {
@@ -777,6 +783,7 @@
}
}
+@Override
public void setText (String string) {
checkWidget ();
if (string == null) error (SWT.ERROR_NULL_ARGUMENT);
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/TableItem.java b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/TableItem.java
index b8af04c..f6114f7 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/TableItem.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/TableItem.java
@@ -123,6 +123,7 @@
return control;
}
+@Override
protected void checkSubclass () {
if (!isValidSubclass ()) error (SWT.ERROR_INVALID_SUBCLASS);
}
@@ -141,6 +142,7 @@
if ((parent.style & SWT.VIRTUAL) != 0) cached = false;
}
+@Override
void destroyWidget () {
parent.destroyItem (this);
releaseHandle ();
@@ -527,6 +529,7 @@
return grayed;
}
+@Override
public Image getImage () {
checkWidget();
if (!parent.checkData (this, true)) error (SWT.ERROR_WIDGET_DISPOSED);
@@ -595,6 +598,7 @@
return imageIndent;
}
+@Override
String getNameText () {
if ((parent.style & SWT.VIRTUAL) != 0) {
if (!cached) return "*virtual*"; //$NON-NLS-1$
@@ -617,6 +621,7 @@
return parent;
}
+@Override
public String getText () {
checkWidget();
if (!parent.checkData (this, true)) error (SWT.ERROR_WIDGET_DISPOSED);
@@ -698,11 +703,13 @@
OS.InvalidateRect (hwnd, rect, true);
}
+@Override
void releaseHandle () {
super.releaseHandle ();
parent = null;
}
+@Override
void releaseWidget () {
super.releaseWidget ();
strings = null;
@@ -1103,6 +1110,7 @@
redraw (index, drawText, true);
}
+@Override
public void setImage (Image image) {
checkWidget ();
setImage (0, image);
@@ -1121,6 +1129,7 @@
*
* @deprecated this functionality is not supported on most platforms
*/
+@Deprecated
public void setImageIndent (int indent) {
checkWidget();
if (indent < 0) return;
@@ -1232,6 +1241,7 @@
redraw (index, true, false);
}
+@Override
public void setText (String string) {
checkWidget();
setText (0, string);
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/TaskBar.java b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/TaskBar.java
index 389668e..079adbb 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/TaskBar.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/TaskBar.java
@@ -459,6 +459,7 @@
return result;
}
+@Override
void releaseChildren (boolean destroy) {
if (items != null) {
for (int i=0; i<items.length; i++) {
@@ -472,11 +473,13 @@
super.releaseChildren (destroy);
}
+@Override
void releaseParent () {
super.releaseParent ();
if (display.taskBar == this) display.taskBar = null;
}
+@Override
void releaseWidget () {
super.releaseWidget ();
if (mTaskbarList3 != 0) {
@@ -486,6 +489,7 @@
}
}
+@Override
void reskinChildren (int flags) {
if (items != null) {
for (int i=0; i<items.length; i++) {
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/TaskItem.java b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/TaskItem.java
index ce27010..12daa8c 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/TaskItem.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/TaskItem.java
@@ -79,10 +79,12 @@
parent.createItem (this, -1);
}
+@Override
protected void checkSubclass () {
if (!isValidSubclass ()) error (SWT.ERROR_INVALID_SUBCLASS);
}
+@Override
void destroyWidget () {
parent.destroyItem (this);
releaseHandle ();
@@ -99,6 +101,7 @@
* <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
* </ul>
*/
+@Override
public Menu getMenu () {
checkWidget ();
return menu;
@@ -192,11 +195,13 @@
if (progressState != SWT.DEFAULT) updateProgressState ();
}
+@Override
void releaseHandle () {
super.releaseHandle ();
parent = null;
}
+@Override
void releaseWidget () {
super.releaseWidget ();
overlayImage = null;
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Text.java b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Text.java
index fe8f503..6ddb901 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Text.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Text.java
@@ -161,6 +161,7 @@
super (parent, checkStyle (style));
}
+@Override
long /*int*/ callWindowProc (long /*int*/ hwnd, int msg, long /*int*/ wParam, long /*int*/ lParam) {
if (handle == 0) return 0;
boolean redraw = false;
@@ -271,6 +272,7 @@
return code;
}
+@Override
void createHandle () {
super.createHandle ();
OS.SendMessage (handle, OS.EM_LIMITTEXT, 0, 0);
@@ -661,6 +663,7 @@
}
}
+@Override
public Point computeSize (int wHint, int hHint, boolean changed) {
checkWidget ();
int height = 0, width = 0;
@@ -709,6 +712,7 @@
return new Point (trim.width, trim.height);
}
+@Override
public Rectangle computeTrim (int x, int y, int width, int height) {
checkWidget ();
Rectangle rect = super.computeTrim (x, y, width, height);
@@ -747,6 +751,7 @@
OS.SendMessage (handle, OS.WM_COPY, 0, 0);
}
+@Override
void createWidget () {
super.createWidget ();
message = "";
@@ -773,6 +778,7 @@
OS.SendMessage (handle, OS.WM_CUT, 0, 0);
}
+@Override
int defaultBackground () {
int bits = OS.GetWindowLong (handle, OS.GWL_STYLE);
return OS.GetSysColor ((bits & OS.ES_READONLY) != 0 ? OS.COLOR_3DFACE : OS.COLOR_WINDOW);
@@ -815,6 +821,7 @@
return text;
}
+@Override
boolean dragDetect (long /*int*/ hwnd, int x, int y, boolean filter, boolean [] detect, boolean [] consume) {
if (filter) {
int [] start = new int [1], end = new int [1];
@@ -887,6 +894,7 @@
OS.SetWindowLong (handle, OS.GWL_STYLE, bits2);
}
+@Override
public int getBorderWidth () {
checkWidget ();
/*
@@ -1184,6 +1192,7 @@
*
* @since 2.1.2
*/
+@Override
public int getOrientation () {
return super.getOrientation ();
}
@@ -1622,6 +1631,7 @@
OS.SendMessage (handle, OS.WM_PASTE, 0, 0);
}
+@Override
void releaseWidget () {
super.releaseWidget ();
message = null;
@@ -1728,6 +1738,7 @@
eventTable.unhook (SWT.Verify, listener);
}
+@Override
int resolveTextDirection() {
int textDirection = SWT.NONE;
int length = OS.GetWindowTextLength (handle);
@@ -1763,6 +1774,7 @@
OS.SendMessage (handle, OS.EM_SETSEL, 0, -1);
}
+@Override
boolean sendKeyEvent (int type, int msg, long /*int*/ wParam, long /*int*/ lParam, Event event) {
if (!super.sendKeyEvent (type, msg, wParam, lParam, event)) {
return false;
@@ -1877,6 +1889,7 @@
return false;
}
+@Override
void setBounds (int x, int y, int width, int height, int flags) {
/*
* Feature in Windows. When the caret is moved,
@@ -1942,6 +1955,7 @@
}
}
+@Override
void setDefaultFont () {
super.setDefaultFont ();
setMargins ();
@@ -2025,6 +2039,7 @@
OS.SendMessage (handle, OS.EM_SETREADONLY, editable ? 0 : 1, 0);
}
+@Override
public void setFont (Font font) {
checkWidget ();
super.setFont (font);
@@ -2101,6 +2116,7 @@
*
* @since 2.1.2
*/
+@Override
public void setOrientation (int orientation) {
super.setOrientation (orientation);
}
@@ -2173,6 +2189,7 @@
OS.SendMessage (handle, OS.EM_SCROLLCARET, 0, 0);
}
+@Override
public void setRedraw (boolean redraw) {
checkWidget ();
super.setRedraw (redraw);
@@ -2466,12 +2483,14 @@
return offset;
}
+@Override
void updateMenuLocation (Event event) {
Point point = display.map (this, null, getCaretLocation ());
event.x = point.x;
event.y = point.y + getLineHeight ();
}
+@Override
void updateOrientation (){
int bits = OS.GetWindowLong (handle, OS.GWL_EXSTYLE);
if ((style & SWT.RIGHT_TO_LEFT) != 0) {
@@ -2483,6 +2502,7 @@
fixAlignment ();
}
+@Override
boolean updateTextDirection(int textDirection) {
if (super.updateTextDirection(textDirection)) {
clearSegments (true);
@@ -2568,6 +2588,7 @@
return mbcsTotal;
}
+@Override
int widgetStyle () {
int bits = super.widgetStyle () | OS.ES_AUTOHSCROLL;
if ((style & SWT.PASSWORD) != 0) bits |= OS.ES_PASSWORD;
@@ -2600,14 +2621,17 @@
return bits;
}
+@Override
TCHAR windowClass () {
return EditClass;
}
+@Override
long /*int*/ windowProc () {
return EditProc;
}
+@Override
long /*int*/ windowProc (long /*int*/ hwnd, int msg, long /*int*/ wParam, long /*int*/ lParam) {
boolean processSegments = hooks (SWT.Segments) || filters (SWT.Segments), redraw = false, updateDirection = (state & HAS_AUTO_DIRECTION) != 0;
long /*int*/ code;
@@ -2683,6 +2707,7 @@
return code;
}
+@Override
LRESULT WM_CHAR (long /*int*/ wParam, long /*int*/ lParam) {
if (ignoreCharacter) return null;
LRESULT result = super.WM_CHAR (wParam, lParam);
@@ -2741,18 +2766,21 @@
return result;
}
+@Override
LRESULT WM_CLEAR (long /*int*/ wParam, long /*int*/ lParam) {
LRESULT result = super.WM_CLEAR (wParam, lParam);
if (result != null) return result;
return wmClipboard (OS.WM_CLEAR, wParam, lParam);
}
+@Override
LRESULT WM_CUT (long /*int*/ wParam, long /*int*/ lParam) {
LRESULT result = super.WM_CUT (wParam, lParam);
if (result != null) return result;
return wmClipboard (OS.WM_CUT, wParam, lParam);
}
+@Override
LRESULT WM_ERASEBKGND (long /*int*/ wParam, long /*int*/ lParam) {
LRESULT result = super.WM_ERASEBKGND (wParam, lParam);
if ((style & SWT.READ_ONLY) != 0) {
@@ -2779,6 +2807,7 @@
return result;
}
+@Override
LRESULT WM_GETDLGCODE (long /*int*/ wParam, long /*int*/ lParam) {
LRESULT result = super.WM_GETDLGCODE (wParam, lParam);
if (result != null) return result;
@@ -2812,6 +2841,7 @@
return null;
}
+@Override
LRESULT WM_GETOBJECT (long /*int*/ wParam, long /*int*/ lParam) {
/*
* Ensure that there is an accessible object created for this
@@ -2824,6 +2854,7 @@
return super.WM_GETOBJECT (wParam, lParam);
}
+@Override
LRESULT WM_IME_CHAR (long /*int*/ wParam, long /*int*/ lParam) {
/* Process a DBCS character */
@@ -2858,6 +2889,7 @@
return new LRESULT (result);
}
+@Override
LRESULT WM_LBUTTONDBLCLK (long /*int*/ wParam, long /*int*/ lParam) {
/*
* Prevent Windows from processing WM_LBUTTONDBLCLK
@@ -2896,6 +2928,7 @@
return result;
}
+@Override
LRESULT WM_LBUTTONDOWN (long /*int*/ wParam, long /*int*/ lParam) {
if (OS.IsPPC) {
LRESULT result = null;
@@ -2940,12 +2973,14 @@
return super.WM_LBUTTONDOWN (wParam, lParam);
}
+@Override
LRESULT WM_PASTE (long /*int*/ wParam, long /*int*/ lParam) {
LRESULT result = super.WM_PASTE (wParam, lParam);
if (result != null) return result;
return wmClipboard (OS.WM_PASTE, wParam, lParam);
}
+@Override
LRESULT WM_UNDO (long /*int*/ wParam, long /*int*/ lParam) {
LRESULT result = super.WM_UNDO (wParam, lParam);
if (result != null) return result;
@@ -3028,6 +3063,7 @@
return null;
}
+@Override
LRESULT wmColorChild (long /*int*/ wParam, long /*int*/ lParam) {
if ((style & SWT.READ_ONLY) != 0) {
if ((style & (SWT.BORDER | SWT.H_SCROLL | SWT.V_SCROLL)) == 0) {
@@ -3053,6 +3089,7 @@
return super.wmColorChild (wParam, lParam);
}
+@Override
LRESULT wmCommandChild (long /*int*/ wParam, long /*int*/ lParam) {
int code = OS.HIWORD (wParam);
switch (code) {
@@ -3110,6 +3147,7 @@
return super.wmCommandChild (wParam, lParam);
}
+@Override
LRESULT wmKeyDown (long /*int*/ hwnd, long /*int*/ wParam, long /*int*/ lParam) {
LRESULT result = super.wmKeyDown (hwnd, wParam, lParam);
if (result != null) return result;
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/ToolBar.java b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/ToolBar.java
index 9b1ea0d..eb8af7e 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/ToolBar.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/ToolBar.java
@@ -139,6 +139,7 @@
}
}
+@Override
long /*int*/ callWindowProc (long /*int*/ hwnd, int msg, long /*int*/ wParam, long /*int*/ lParam) {
if (handle == 0) return 0;
/*
@@ -176,15 +177,18 @@
return style & ~(SWT.H_SCROLL | SWT.V_SCROLL);
}
+@Override
void checkBuffered () {
super.checkBuffered ();
if (OS.COMCTL32_MAJOR >= 6) style |= SWT.DOUBLE_BUFFERED;
}
+@Override
protected void checkSubclass () {
if (!isValidSubclass ()) error (SWT.ERROR_INVALID_SUBCLASS);
}
+@Override
public Point computeSize (int wHint, int hHint, boolean changed) {
checkWidget ();
int width = 0, height = 0;
@@ -247,6 +251,7 @@
return new Point (width, height);
}
+@Override
public Rectangle computeTrim (int x, int y, int width, int height) {
checkWidget ();
Rectangle trim = super.computeTrim (x, y, width, height);
@@ -255,6 +260,7 @@
return trim;
}
+@Override
Widget computeTabGroup () {
ToolItem [] items = _getItems ();
if (tabItemList == null) {
@@ -272,6 +278,7 @@
return super.computeTabGroup ();
}
+@Override
Widget [] computeTabList () {
ToolItem [] items = _getItems ();
if (tabItemList == null) {
@@ -296,6 +303,7 @@
return result;
}
+@Override
void createHandle () {
super.createHandle ();
state &= ~CANVAS;
@@ -396,6 +404,7 @@
layoutItems ();
}
+@Override
void createWidget () {
super.createWidget ();
items = new ToolItem [4];
@@ -407,6 +416,7 @@
return -1; /* No Change */
}
+@Override
int defaultBackground () {
if (OS.IsWinCE) return OS.GetSysColor (OS.COLOR_BTNFACE);
return super.defaultBackground ();
@@ -459,6 +469,7 @@
layoutItems ();
}
+@Override
void enableWidget (boolean enabled) {
super.enableWidget (enabled);
/*
@@ -782,6 +793,7 @@
}
}
+@Override
boolean mnemonicHit (char ch) {
int key = Display.wcsToMbcs (ch);
int [] id = new int [1];
@@ -796,6 +808,7 @@
return true;
}
+@Override
boolean mnemonicMatch (char ch) {
int key = Display.wcsToMbcs (ch);
int [] id = new int [1];
@@ -813,6 +826,7 @@
return findMnemonic (items [id [0]].text) != '\0';
}
+@Override
void releaseChildren (boolean destroy) {
if (items != null) {
for (int i=0; i<items.length; i++) {
@@ -826,6 +840,7 @@
super.releaseChildren (destroy);
}
+@Override
void releaseWidget () {
super.releaseWidget ();
if (imageList != null) {
@@ -843,6 +858,7 @@
imageList = hotImageList = disabledImageList = null;
}
+@Override
void removeControl (Control control) {
super.removeControl (control);
for (int i=0; i<items.length; i++) {
@@ -853,6 +869,7 @@
}
}
+@Override
void reskinChildren (int flags) {
if (items != null) {
for (int i=0; i<items.length; i++) {
@@ -863,11 +880,13 @@
super.reskinChildren (flags);
}
+@Override
void setBackgroundImage (long /*int*/ hBitmap) {
super.setBackgroundImage (hBitmap);
setBackgroundTransparent (hBitmap != 0);
}
+@Override
void setBackgroundPixel (int pixel) {
super.setBackgroundPixel (pixel);
setBackgroundTransparent (pixel != -1);
@@ -898,6 +917,7 @@
}
}
+@Override
void setBounds (int x, int y, int width, int height, int flags) {
/*
* Feature in Windows. For some reason, when a tool bar is
@@ -917,6 +937,7 @@
super.setBounds (x, y, width, height, flags);
}
+@Override
void setDefaultFont () {
super.setDefaultFont ();
OS.SendMessage (handle, OS.TB_SETBITMAPSIZE, 0, 0);
@@ -976,6 +997,7 @@
setDropDownItems (true);
}
+@Override
public void setFont (Font font) {
checkWidget ();
setDropDownItems (false);
@@ -1023,6 +1045,7 @@
setDropDownItems (true);
}
+@Override
public boolean setParent (Composite parent) {
checkWidget ();
if (!super.setParent (parent)) return false;
@@ -1041,6 +1064,7 @@
return true;
}
+@Override
public void setRedraw (boolean redraw) {
checkWidget ();
setDropDownItems (false);
@@ -1099,6 +1123,7 @@
this.tabItemList = tabList;
}
+@Override
boolean setTabItemFocus () {
int index = 0;
while (index < items.length) {
@@ -1112,6 +1137,7 @@
return super.setTabItemFocus ();
}
+@Override
boolean updateTextDirection(int textDirection) {
if (super.updateTextDirection(textDirection)) {
ToolItem [] items = _getItems ();
@@ -1124,6 +1150,7 @@
return false;
}
+@Override
String toolTipText (NMTTDISPINFO hdr) {
if ((hdr.uFlags & OS.TTF_IDISHWND) != 0) {
return null;
@@ -1171,6 +1198,7 @@
return super.toolTipText (hdr);
}
+@Override
void updateOrientation () {
super.updateOrientation ();
if (imageList != null) {
@@ -1213,6 +1241,7 @@
}
}
+@Override
int widgetStyle () {
int bits = super.widgetStyle () | OS.CCS_NORESIZE | OS.TBSTYLE_TOOLTIPS | OS.TBSTYLE_CUSTOMERASE;
if (OS.COMCTL32_MAJOR >= 6 && OS.IsAppThemed ()) bits |= OS.TBSTYLE_TRANSPARENT;
@@ -1238,14 +1267,17 @@
return bits;
}
+@Override
TCHAR windowClass () {
return ToolBarClass;
}
+@Override
long /*int*/ windowProc () {
return ToolBarProc;
}
+@Override
LRESULT WM_CAPTURECHANGED (long /*int*/ wParam, long /*int*/ lParam) {
LRESULT result = super.WM_CAPTURECHANGED (wParam, lParam);
if (result != null) return result;
@@ -1267,6 +1299,7 @@
return result;
}
+@Override
LRESULT WM_CHAR (long /*int*/ wParam, long /*int*/ lParam) {
LRESULT result = super.WM_CHAR (wParam, lParam);
if (result != null) return result;
@@ -1285,6 +1318,7 @@
return result;
}
+@Override
LRESULT WM_COMMAND (long /*int*/ wParam, long /*int*/ lParam) {
/*
* Feature in Windows. When the toolbar window
@@ -1309,6 +1343,7 @@
return LRESULT.ZERO;
}
+@Override
LRESULT WM_ERASEBKGND (long /*int*/ wParam, long /*int*/ lParam) {
LRESULT result = super.WM_ERASEBKGND (wParam, lParam);
/*
@@ -1326,6 +1361,7 @@
return result;
}
+@Override
LRESULT WM_GETDLGCODE (long /*int*/ wParam, long /*int*/ lParam) {
LRESULT result = super.WM_GETDLGCODE (wParam, lParam);
/*
@@ -1337,6 +1373,7 @@
return new LRESULT (OS.DLGC_BUTTON | OS.DLGC_WANTARROWS);
}
+@Override
LRESULT WM_KEYDOWN (long /*int*/ wParam, long /*int*/ lParam) {
LRESULT result = super.WM_KEYDOWN (wParam, lParam);
if (result != null) return result;
@@ -1352,6 +1389,7 @@
return result;
}
+@Override
LRESULT WM_KILLFOCUS (long /*int*/ wParam, long /*int*/ lParam) {
int index = (int)/*64*/OS.SendMessage (handle, OS.TB_GETHOTITEM, 0, 0);
TBBUTTON lpButton = new TBBUTTON ();
@@ -1360,16 +1398,19 @@
return super.WM_KILLFOCUS (wParam, lParam);
}
+@Override
LRESULT WM_LBUTTONDOWN (long /*int*/ wParam, long /*int*/ lParam) {
if (ignoreMouse) return null;
return super.WM_LBUTTONDOWN (wParam, lParam);
}
+@Override
LRESULT WM_LBUTTONUP (long /*int*/ wParam, long /*int*/ lParam) {
if (ignoreMouse) return null;
return super.WM_LBUTTONUP (wParam, lParam);
}
+@Override
LRESULT WM_MOUSELEAVE (long /*int*/ wParam, long /*int*/ lParam) {
LRESULT result = super.WM_MOUSELEAVE (wParam, lParam);
if (result != null) return result;
@@ -1398,11 +1439,13 @@
return result;
}
+@Override
LRESULT WM_MOUSEMOVE (long /*int*/ wParam, long /*int*/ lParam) {
if (OS.GetMessagePos () != display.lastMouse) lastArrowId = -1;
return super.WM_MOUSEMOVE (wParam, lParam);
}
+@Override
LRESULT WM_NOTIFY (long /*int*/ wParam, long /*int*/ lParam) {
/*
* Feature in Windows. When the toolbar window
@@ -1427,6 +1470,7 @@
return LRESULT.ZERO;
}
+@Override
LRESULT WM_SETFOCUS (long /*int*/ wParam, long /*int*/ lParam) {
LRESULT result = super.WM_SETFOCUS (wParam, lParam);
if (lastFocusId != -1 && handle == OS.GetFocus ()) {
@@ -1436,6 +1480,7 @@
return result;
}
+@Override
LRESULT WM_SIZE (long /*int*/ wParam, long /*int*/ lParam) {
if (ignoreResize) {
long /*int*/ code = callWindowProc (handle, OS.WM_SIZE, wParam, lParam);
@@ -1478,6 +1523,7 @@
return result;
}
+@Override
LRESULT WM_WINDOWPOSCHANGING (long /*int*/ wParam, long /*int*/ lParam) {
LRESULT result = super.WM_WINDOWPOSCHANGING (wParam, lParam);
if (result != null) return result;
@@ -1520,12 +1566,14 @@
return result;
}
+@Override
LRESULT wmCommandChild (long /*int*/ wParam, long /*int*/ lParam) {
ToolItem child = items [OS.LOWORD (wParam)];
if (child == null) return null;
return child.wmCommandChild (wParam, lParam);
}
+@Override
LRESULT wmNotifyChild (NMHDR hdr, long /*int*/ wParam, long /*int*/ lParam) {
switch (hdr.code) {
case OS.TBN_DROPDOWN:
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/ToolItem.java b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/ToolItem.java
index f0c0423..700bd21 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/ToolItem.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/ToolItem.java
@@ -171,6 +171,7 @@
return checkBits (style, SWT.PUSH, SWT.CHECK, SWT.RADIO, SWT.SEPARATOR, SWT.DROP_DOWN, 0);
}
+@Override
protected void checkSubclass () {
if (!isValidSubclass ()) error (SWT.ERROR_INVALID_SUBCLASS);
}
@@ -215,6 +216,7 @@
return new Widget [0];
}
+@Override
void destroyWidget () {
parent.destroyItem (this);
releaseHandle ();
@@ -429,6 +431,7 @@
return (previous.getStyle () & SWT.SEPARATOR) != 0;
}
+@Override
void releaseWidget () {
super.releaseWidget ();
releaseImages ();
@@ -439,6 +442,7 @@
disabledImage2 = null;
}
+@Override
void releaseHandle () {
super.releaseHandle ();
parent = null;
@@ -700,6 +704,7 @@
updateImages (getEnabled () && parent.getEnabled ());
}
+@Override
public void setImage (Image image) {
checkWidget();
if ((style & SWT.SEPARATOR) != 0) return;
@@ -768,6 +773,7 @@
}
}
+@Override
boolean setTabItemFocus () {
if (parent.setTabItemFocus ()) {
long /*int*/ hwnd = parent.handle;
@@ -835,6 +841,7 @@
* <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
* </ul>
*/
+@Override
public void setText (String string) {
checkWidget();
if (string == null) error (SWT.ERROR_NULL_ARGUMENT);
@@ -860,6 +867,7 @@
parent.layoutItems ();
}
+@Override
boolean updateTextDirection(int textDirection) {
/* AUTO is handled by super */
if (super.updateTextDirection(textDirection) && text.length() != 0) {
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/ToolTip.java b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/ToolTip.java
index b5440a3..163e001 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/ToolTip.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/ToolTip.java
@@ -124,6 +124,7 @@
addListener (SWT.DefaultSelection,typedListener);
}
+@Override
void destroyWidget () {
if (parent != null) parent.destroyToolTip (this);
releaseHandle ();
@@ -266,6 +267,7 @@
return getVisible ();
}
+@Override
void releaseHandle () {
super.releaseHandle ();
parent = null;
@@ -273,6 +275,7 @@
id = -1;
}
+@Override
void releaseWidget () {
super.releaseWidget ();
if (item == null) {
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Tracker.java b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Tracker.java
index adb5362..e4114c7 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Tracker.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Tracker.java
@@ -644,6 +644,7 @@
return !cancelled;
}
+@Override
void releaseWidget () {
super.releaseWidget ();
parent = null;
@@ -961,6 +962,7 @@
}
}
+@Override
LRESULT wmKeyDown (long /*int*/ hwnd, long /*int*/ wParam, long /*int*/ lParam) {
LRESULT result = super.wmKeyDown (hwnd, wParam, lParam);
if (result != null) return result;
@@ -1095,6 +1097,7 @@
return result;
}
+@Override
LRESULT wmSysKeyDown (long /*int*/ hwnd, long /*int*/ wParam, long /*int*/ lParam) {
LRESULT result = super.wmSysKeyDown (hwnd, wParam, lParam);
if (result != null) return result;
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/TrayItem.java b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/TrayItem.java
index 88ec339..70d2c37 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/TrayItem.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/TrayItem.java
@@ -141,6 +141,7 @@
addListener (SWT.MenuDetect, typedListener);
}
+@Override
protected void checkSubclass () {
if (!isValidSubclass ()) error (SWT.ERROR_INVALID_SUBCLASS);
}
@@ -155,6 +156,7 @@
OS.Shell_NotifyIcon (OS.NIM_ADD, iconData);
}
+@Override
void destroyWidget () {
parent.destroyItem (this);
releaseHandle ();
@@ -327,11 +329,13 @@
if (toolTipText != null) setToolTipText (toolTipText);
}
+@Override
void releaseHandle () {
super.releaseHandle ();
parent = null;
}
+@Override
void releaseWidget () {
super.releaseWidget ();
if (toolTip != null) toolTip.item = null;
@@ -433,6 +437,7 @@
* <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
* </ul>
*/
+@Override
public void setImage (Image image) {
checkWidget ();
if (image != null && image.isDisposed ()) error (SWT.ERROR_INVALID_ARGUMENT);
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Tree.java b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Tree.java
index 845e168..69194cd 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Tree.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Tree.java
@@ -179,6 +179,7 @@
return checkBits (style, SWT.SINGLE, SWT.MULTI, 0, 0, 0, 0);
}
+@Override
void _addListener (int eventType, Listener listener) {
super._addListener (eventType, listener);
switch (eventType) {
@@ -255,6 +256,7 @@
return id != -1 ? items [id] : new TreeItem (this, SWT.NONE, -1, -1, hItem);
}
+@Override
void _removeListener (int eventType, Listener listener) {
super._removeListener (eventType, listener);
switch (eventType) {
@@ -374,6 +376,7 @@
addListener (SWT.Collapse, typedListener);
}
+@Override
long /*int*/ borderHandle () {
return hwndParent != 0 ? hwndParent : handle;
}
@@ -1455,6 +1458,7 @@
return new LRESULT (OS.CDRF_NOTIFYITEMDRAW | OS.CDRF_NOTIFYPOSTPAINT);
}
+@Override
long /*int*/ callWindowProc (long /*int*/ hwnd, int msg, long /*int*/ wParam, long /*int*/ lParam) {
if (handle == 0) return 0;
if (hwndParent != 0 && hwnd == hwndParent) {
@@ -1616,6 +1620,7 @@
return code;
}
+@Override
void checkBuffered () {
super.checkBuffered ();
if ((style & SWT.VIRTUAL) != 0) {
@@ -1667,6 +1672,7 @@
return true;
}
+@Override
boolean checkHandle (long /*int*/ hwnd) {
return hwnd == handle || (hwndParent != 0 && hwnd == hwndParent) || (hwndHeader != 0 && hwnd == hwndHeader);
}
@@ -1692,6 +1698,7 @@
return hParent == 0;
}
+@Override
protected void checkSubclass () {
if (!isValidSubclass ()) error (SWT.ERROR_INVALID_SUBCLASS);
}
@@ -1804,6 +1811,7 @@
return sortDirection == SWT.UP ? text1.compareTo (text2) : text2.compareTo (text1);
}
+@Override
public Point computeSize (int wHint, int hHint, boolean changed) {
checkWidget ();
int width = 0, height = 0;
@@ -1852,6 +1860,7 @@
return new Point (width, height);
}
+@Override
void createHandle () {
super.createHandle ();
state &= ~(CANVAS | THEME_BACKGROUND);
@@ -2331,6 +2340,7 @@
subclass ();
}
+@Override
void createWidget () {
super.createWidget ();
items = new TreeItem [4];
@@ -2338,10 +2348,12 @@
itemCount = -1;
}
+@Override
int defaultBackground () {
return OS.GetSysColor (OS.COLOR_WINDOW);
}
+@Override
void deregister () {
super.deregister ();
if (hwndParent != 0) display.removeControl (hwndParent);
@@ -2657,6 +2669,7 @@
updateScrollBar ();
}
+@Override
void destroyScrollBar (int type) {
super.destroyScrollBar (type);
int bits = OS.GetWindowLong (handle, OS.GWL_STYLE);
@@ -2672,6 +2685,7 @@
OS.SetWindowLong (handle, OS.GWL_STYLE, bits);
}
+@Override
void enableDrag (boolean enabled) {
int bits = OS.GetWindowLong (handle, OS.GWL_STYLE);
if (enabled && hooks (SWT.DragDetect)) {
@@ -2682,6 +2696,7 @@
OS.SetWindowLong (handle, OS.GWL_STYLE, bits);
}
+@Override
void enableWidget (boolean enabled) {
super.enableWidget (enabled);
/*
@@ -2834,6 +2849,7 @@
return -1;
}
+@Override
Widget findItem (long /*int*/ hItem) {
return _getItem (hItem);
}
@@ -3888,6 +3904,7 @@
}
}
+@Override
void register () {
super.register ();
if (hwndParent != 0) display.addControl (hwndParent, this);
@@ -3919,11 +3936,13 @@
}
}
+@Override
void releaseHandle () {
super.releaseHandle ();
hwndParent = hwndHeader = 0;
}
+@Override
void releaseChildren (boolean destroy) {
if (items != null) {
for (int i=0; i<items.length; i++) {
@@ -3946,6 +3965,7 @@
super.releaseChildren (destroy);
}
+@Override
void releaseWidget () {
super.releaseWidget ();
/*
@@ -4074,6 +4094,7 @@
eventTable.unhook (SWT.Collapse, listener);
}
+@Override
void reskinChildren (int flags) {
if (items != null) {
for (int i=0; i<items.length; i++) {
@@ -4250,6 +4271,7 @@
OS.InvalidateRect (handle, null, true);
}
+@Override
long /*int*/ scrolledHandle () {
if (hwndHeader == 0) return handle;
return columnCount == 0 && scrollWidth == 0 ? handle : hwndParent;
@@ -4484,6 +4506,7 @@
return event;
}
+@Override
void setBackgroundImage (long /*int*/ hBitmap) {
super.setBackgroundImage (hBitmap);
if (hBitmap != 0) {
@@ -4519,6 +4542,7 @@
updateFullSelection ();
}
+@Override
void setBackgroundPixel (int pixel) {
Control control = findImageControl ();
if (control != null) {
@@ -4546,6 +4570,7 @@
updateFullSelection ();
}
+@Override
void setCursor () {
/*
* Bug in Windows. Under certain circumstances, when WM_SETCURSOR
@@ -4723,12 +4748,14 @@
if (hOldStateList != 0) OS.ImageList_Destroy (hOldStateList);
}
+@Override
public void setFont (Font font) {
checkWidget ();
super.setFont (font);
if ((style & SWT.CHECK) != 0) setCheckboxImageList ();
}
+@Override
void setForegroundPixel (int pixel) {
/*
* Bug in Windows. When the tree is using the explorer
@@ -4784,6 +4811,7 @@
updateScrollBar ();
}
+@Override
public void setRedraw (boolean redraw) {
checkWidget ();
/*
@@ -5445,6 +5473,7 @@
}
}
+@Override
void subclass () {
super.subclass ();
if (hwndHeader != 0) {
@@ -5474,6 +5503,7 @@
return toolRect;
}
+@Override
String toolTipText (NMTTDISPINFO hdr) {
long /*int*/ hwndToolTip = OS.SendMessage (handle, OS.TVM_GETTOOLTIPS, 0, 0);
if (hwndToolTip == hdr.hwndFrom && toolTipText != null) return ""; //$NON-NLS-1$
@@ -5511,6 +5541,7 @@
return super.toolTipText (hdr);
}
+@Override
long /*int*/ topHandle () {
return hwndParent != 0 ? hwndParent : handle;
}
@@ -5587,6 +5618,7 @@
}
}
+@Override
void updateImages () {
if (sortColumn != null && !sortColumn.isDisposed ()) {
if (OS.COMCTL32_MAJOR < 6) {
@@ -5600,6 +5632,7 @@
}
}
+@Override
void updateMenuLocation (Event event) {
Rectangle clientArea = getClientArea ();
int x = clientArea.x, y = clientArea.y;
@@ -5619,6 +5652,7 @@
event.y = pt.y;
}
+@Override
void updateOrientation () {
super.updateOrientation ();
RECT rect = new RECT ();
@@ -5729,6 +5763,7 @@
}
}
+@Override
void unsubclass () {
super.unsubclass ();
if (hwndHeader != 0) {
@@ -5736,6 +5771,7 @@
}
}
+@Override
int widgetStyle () {
int bits = super.widgetStyle () | OS.TVS_SHOWSELALWAYS | OS.TVS_LINESATROOT | OS.TVS_HASBUTTONS | OS.TVS_NONEVENHEIGHT;
if (EXPLORER_THEME && !OS.IsWinCE && OS.WIN32_VERSION >= OS.VERSION (6, 0) && OS.IsAppThemed ()) {
@@ -5761,14 +5797,17 @@
return bits | OS.TVS_DISABLEDRAGDROP;
}
+@Override
TCHAR windowClass () {
return TreeClass;
}
+@Override
long /*int*/ windowProc () {
return TreeProc;
}
+@Override
long /*int*/ windowProc (long /*int*/ hwnd, int msg, long /*int*/ wParam, long /*int*/ lParam) {
if (hwndHeader != 0 && hwnd == hwndHeader) {
switch (msg) {
@@ -6024,6 +6063,7 @@
return super.windowProc (hwnd, msg, wParam, lParam);
}
+@Override
LRESULT WM_CHAR (long /*int*/ wParam, long /*int*/ lParam) {
LRESULT result = super.WM_CHAR (wParam, lParam);
if (result != null) return result;
@@ -6110,6 +6150,7 @@
return result;
}
+@Override
LRESULT WM_ERASEBKGND (long /*int*/ wParam, long /*int*/ lParam) {
LRESULT result = super.WM_ERASEBKGND (wParam, lParam);
if ((style & SWT.DOUBLE_BUFFERED) != 0) return LRESULT.ONE;
@@ -6117,6 +6158,7 @@
return result;
}
+@Override
LRESULT WM_GETOBJECT (long /*int*/ wParam, long /*int*/ lParam) {
/*
* Ensure that there is an accessible object created for this
@@ -6130,6 +6172,7 @@
return super.WM_GETOBJECT (wParam, lParam);
}
+@Override
LRESULT WM_HSCROLL (long /*int*/ wParam, long /*int*/ lParam) {
boolean fixScroll = false;
if ((style & SWT.DOUBLE_BUFFERED) != 0) {
@@ -6152,6 +6195,7 @@
return result;
}
+@Override
LRESULT WM_KEYDOWN (long /*int*/ wParam, long /*int*/ lParam) {
LRESULT result = super.WM_KEYDOWN (wParam, lParam);
if (result != null) return result;
@@ -6342,6 +6386,7 @@
return result;
}
+@Override
LRESULT WM_KILLFOCUS (long /*int*/ wParam, long /*int*/ lParam) {
/*
* Bug in Windows. When a tree item that has an image
@@ -6372,6 +6417,7 @@
return super.WM_KILLFOCUS (wParam, lParam);
}
+@Override
LRESULT WM_LBUTTONDBLCLK (long /*int*/ wParam, long /*int*/ lParam) {
TVHITTESTINFO lpht = new TVHITTESTINFO ();
lpht.x = OS.GET_X_LPARAM (lParam);
@@ -6444,6 +6490,7 @@
return result;
}
+@Override
LRESULT WM_LBUTTONDOWN (long /*int*/ wParam, long /*int*/ lParam) {
/*
* In a multi-select tree, if the user is collapsing a subtree that
@@ -6850,6 +6897,7 @@
return new LRESULT (code);
}
+@Override
LRESULT WM_MOUSEMOVE (long /*int*/ wParam, long /*int*/ lParam) {
Display display = this.display;
LRESULT result = super.WM_MOUSEMOVE (wParam, lParam);
@@ -6899,18 +6947,21 @@
return result;
}
+@Override
LRESULT WM_MOUSEWHEEL (long /*int*/ wParam, long /*int*/ lParam) {
LRESULT result = super.WM_MOUSEWHEEL (wParam, lParam);
if (itemToolTipHandle != 0) OS.ShowWindow (itemToolTipHandle, OS.SW_HIDE);
return result;
}
+@Override
LRESULT WM_MOVE (long /*int*/ wParam, long /*int*/ lParam) {
if (itemToolTipHandle != 0) OS.ShowWindow (itemToolTipHandle, OS.SW_HIDE);
if (ignoreResize) return null;
return super.WM_MOVE (wParam, lParam);
}
+@Override
LRESULT WM_RBUTTONDOWN (long /*int*/ wParam, long /*int*/ lParam) {
/*
* Feature in Windows. The receiver uses WM_RBUTTONDOWN
@@ -6980,6 +7031,7 @@
return LRESULT.ZERO;
}
+@Override
LRESULT WM_PAINT (long /*int*/ wParam, long /*int*/ lParam) {
if ((state & DISPOSE_SENT) != 0) return LRESULT.ZERO;
@@ -7061,6 +7113,7 @@
return super.WM_PAINT (wParam, lParam);
}
+@Override
LRESULT WM_PRINTCLIENT (long /*int*/ wParam, long /*int*/ lParam) {
LRESULT result = super.WM_PRINTCLIENT (wParam, lParam);
if (result != null) return result;
@@ -7080,6 +7133,7 @@
return new LRESULT (code);
}
+@Override
LRESULT WM_SETCURSOR (long /*int*/ wParam, long /*int*/ lParam) {
LRESULT result = super.WM_SETCURSOR (wParam, lParam);
if (result != null) return result;
@@ -7102,6 +7156,7 @@
return null;
}
+@Override
LRESULT WM_SETFOCUS (long /*int*/ wParam, long /*int*/ lParam) {
/*
* Bug in Windows. When a tree item that has an image
@@ -7132,6 +7187,7 @@
return super.WM_SETFOCUS (wParam, lParam);
}
+@Override
LRESULT WM_SETFONT (long /*int*/ wParam, long /*int*/ lParam) {
LRESULT result = super.WM_SETFONT (wParam, lParam);
if (result != null) return result;
@@ -7157,6 +7213,7 @@
return result;
}
+@Override
LRESULT WM_SETREDRAW (long /*int*/ wParam, long /*int*/ lParam) {
LRESULT result = super.WM_SETREDRAW (wParam, lParam);
if (result != null) return result;
@@ -7179,6 +7236,7 @@
return result;
}
+@Override
LRESULT WM_SIZE (long /*int*/ wParam, long /*int*/ lParam) {
if (itemToolTipHandle != 0) OS.ShowWindow (itemToolTipHandle, OS.SW_HIDE);
/*
@@ -7205,6 +7263,7 @@
return super.WM_SIZE (wParam, lParam);
}
+@Override
LRESULT WM_SYSCOLORCHANGE (long /*int*/ wParam, long /*int*/ lParam) {
LRESULT result = super.WM_SYSCOLORCHANGE (wParam, lParam);
if (result != null) return result;
@@ -7221,6 +7280,7 @@
return result;
}
+@Override
LRESULT WM_VSCROLL (long /*int*/ wParam, long /*int*/ lParam) {
boolean fixScroll = false;
if ((style & SWT.DOUBLE_BUFFERED) != 0) {
@@ -7253,6 +7313,7 @@
return result;
}
+@Override
LRESULT WM_TIMER (long /*int*/ wParam, long /*int*/ lParam) {
LRESULT result = super.WM_TIMER (wParam, lParam);
if (result != null) return result;
@@ -7289,6 +7350,7 @@
return result;
};
+@Override
LRESULT wmColorChild (long /*int*/ wParam, long /*int*/ lParam) {
if (findImageControl () != null) {
if (OS.COMCTL32_MAJOR < 6) {
@@ -7306,6 +7368,7 @@
return null;
}
+@Override
LRESULT wmNotify (NMHDR hdr, long /*int*/ wParam, long /*int*/ lParam) {
if (hdr.hwndFrom == itemToolTipHandle) {
LRESULT result = wmNotifyToolTip (hdr, wParam, lParam);
@@ -7318,6 +7381,7 @@
return super.wmNotify (hdr, wParam, lParam);
}
+@Override
LRESULT wmNotifyChild (NMHDR hdr, long /*int*/ wParam, long /*int*/ lParam) {
switch (hdr.code) {
case OS.TVN_GETDISPINFOA:
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/TreeColumn.java b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/TreeColumn.java
index 72419f7..1836f49 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/TreeColumn.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/TreeColumn.java
@@ -188,10 +188,12 @@
return checkBits (style, SWT.LEFT, SWT.CENTER, SWT.RIGHT, 0, 0, 0);
}
+@Override
protected void checkSubclass () {
if (!isValidSubclass ()) error (SWT.ERROR_INVALID_SUBCLASS);
}
+@Override
void destroyWidget () {
parent.destroyItem (this);
releaseHandle ();
@@ -242,6 +244,7 @@
return moveable;
}
+@Override
String getNameText () {
return getText ();
}
@@ -399,11 +402,13 @@
setWidth (Math.max (headerWidth, columnWidth + gridWidth));
}
+@Override
void releaseHandle () {
super.releaseHandle ();
parent = null;
}
+@Override
void releaseParent () {
super.releaseParent ();
if (parent.sortColumn == this) {
@@ -505,6 +510,7 @@
}
}
+@Override
public void setImage (Image image) {
checkWidget();
if (image != null && image.isDisposed ()) {
@@ -644,6 +650,7 @@
}
}
+@Override
public void setText (String string) {
checkWidget ();
if (string == null) error (SWT.ERROR_NULL_ARGUMENT);
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/TreeItem.java b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/TreeItem.java
index d8045bf..7d88c0c 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/TreeItem.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/TreeItem.java
@@ -230,6 +230,7 @@
return hItem;
}
+@Override
protected void checkSubclass () {
if (!isValidSubclass ()) error (SWT.ERROR_INVALID_SUBCLASS);
}
@@ -323,6 +324,7 @@
parent.clearAll (hItem, tvItem, all);
}
+@Override
void destroyWidget () {
TVITEM tvItem = new TVITEM ();
tvItem.mask = OS.TVIF_HANDLE | OS.TVIF_PARAM;
@@ -789,6 +791,7 @@
return parent.getItems (hItem);
}
+@Override
public Image getImage () {
checkWidget();
if (!parent.checkData (this, true)) error (SWT.ERROR_WIDGET_DISPOSED);
@@ -876,6 +879,7 @@
return hItem != 0 ? parent._getItem (hItem) : null;
}
+@Override
public String getText () {
checkWidget();
if (!parent.checkData (this, true)) error (SWT.ERROR_WIDGET_DISPOSED);
@@ -998,6 +1002,7 @@
OS.InvalidateRect (hwnd, rect, true);
}
+@Override
void releaseChildren (boolean destroy) {
if (destroy) {
TVITEM tvItem = new TVITEM ();
@@ -1007,12 +1012,14 @@
super.releaseChildren (destroy);
}
+@Override
void releaseHandle () {
super.releaseHandle ();
handle = 0;
parent = null;
}
+@Override
void releaseWidget () {
super.releaseWidget ();
strings = null;
@@ -1708,6 +1715,7 @@
}
}
+@Override
public void setImage (Image image) {
checkWidget ();
setImage (0, image);
@@ -1812,6 +1820,7 @@
}
}
+@Override
public void setText (String string) {
checkWidget();
setText (0, string);
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Widget.java b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Widget.java
index a844eda..a70f10b 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Widget.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Widget.java
@@ -1550,6 +1550,7 @@
*
* @return a string representation of the receiver
*/
+@Override
public String toString () {
String string = "*Disposed*"; //$NON-NLS-1$
if (!isDisposed ()) {
diff --git a/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet187.java b/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet187.java
index 13de8f9..e10d514 100644
--- a/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet187.java
+++ b/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet187.java
@@ -46,6 +46,7 @@
// and evalute expression using Script.
int DownloadComplete = 104;
controlSite.addEventListener(DownloadComplete, new OleListener() {
+ @Override
public void handleEvent(OleEvent event) {
int[] htmlDocumentID = webBrowser.getIDsOfNames(new String[]{"Document"});
if (htmlDocumentID == null) return;
diff --git a/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet199.java b/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet199.java
index 301b374..81fa1b5 100644
--- a/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet199.java
+++ b/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet199.java
@@ -71,6 +71,7 @@
int eventID = SheetSelectionChange;
OleListener listener = new OleListener() {
+ @Override
public void handleEvent (OleEvent e) {
System.out.println("selection has changed");
Variant[] args = e.arguments;
diff --git a/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet305.java b/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet305.java
index a02f278..41996dd 100644
--- a/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet305.java
+++ b/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet305.java
@@ -45,6 +45,7 @@
excelSheet.dispose();
OleListener listener = new OleListener() {
+ @Override
public void handleEvent(OleEvent e) {
// SheetSelectionChange(ByVal Sh As Object, ByVal Target As Excel.Range)
Variant[] args = e.arguments;
