diff options
| author | Eric Williams | 2019-03-26 19:06:08 +0000 |
|---|---|---|
| committer | Eric Williams | 2019-03-26 20:32:06 +0000 |
| commit | bed37f52a06e835d5652904242b705bda5376435 (patch) | |
| tree | 894eac5d734c69e08418304ed15e02ff8d71a4d2 | |
| parent | 824d043c2b8ee492d849e78e2aa282b068bc357a (diff) | |
| download | eclipse.platform.swt-bed37f52a06e835d5652904242b705bda5376435.tar.gz eclipse.platform.swt-bed37f52a06e835d5652904242b705bda5376435.tar.xz eclipse.platform.swt-bed37f52a06e835d5652904242b705bda5376435.zip | |
Bug 54579: [GTK] Remove 32-bit code
Remove 64 int casts.
Change-Id: Ie6ccaa9a2d056a934cc9813415fa86b12cf68b5a
Signed-off-by: Eric Williams <ericwill@redhat.com>
34 files changed, 223 insertions, 223 deletions
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Accessibility/gtk/org/eclipse/swt/accessibility/AccessibleObject.java b/bundles/org.eclipse.swt/Eclipse SWT Accessibility/gtk/org/eclipse/swt/accessibility/AccessibleObject.java index 1f4b047869..33254052f4 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT Accessibility/gtk/org/eclipse/swt/accessibility/AccessibleObject.java +++ b/bundles/org.eclipse.swt/Eclipse SWT Accessibility/gtk/org/eclipse/swt/accessibility/AccessibleObject.java @@ -113,7 +113,7 @@ class AccessibleObject { int length = size(listeners); if (length > 0) { AccessibleActionEvent event = new AccessibleActionEvent(accessible); - event.index = (int)/*64*/index; + event.index = (int)index; for (int i = 0; i < length; i++) { AccessibleActionListener listener = listeners.get(i); listener.doAction(event); @@ -187,7 +187,7 @@ class AccessibleObject { int length = size(listeners); if (length > 0) { AccessibleActionEvent event = new AccessibleActionEvent(accessible); - event.index = (int)/*64*/index; + event.index = (int)index; for (int i = 0; i < length; i++) { AccessibleActionListener listener = listeners.get(i); listener.getDescription(event); @@ -232,7 +232,7 @@ class AccessibleObject { int length = size(listeners); if (length > 0) { AccessibleActionEvent event = new AccessibleActionEvent(accessible); - event.index = (int)/*64*/index; + event.index = (int)index; for (int i = 0; i < length; i++) { AccessibleActionListener listener = listeners.get(i); listener.getKeyBinding(event); @@ -287,7 +287,7 @@ class AccessibleObject { int length = size(listeners); if (length > 0) { AccessibleActionEvent event = new AccessibleActionEvent(accessible); - event.index = (int)/*64*/index; + event.index = (int)index; for (int i = 0; i < length; i++) { AccessibleActionListener listener = listeners.get(i); listener.getName(event); @@ -432,7 +432,7 @@ class AccessibleObject { if (length > 0) { AccessibleControlEvent event = new AccessibleControlEvent (accessible); event.childID = object.id; - event.x = (int)/*64*/x; event.y = (int)/*64*/y; + event.x = (int)x; event.y = (int)y; int[] topWindowX = new int [1], topWindowY = new int [1]; if (coord_type == ATK.ATK_XY_WINDOW) { windowPoint (object, topWindowX, topWindowY); @@ -613,8 +613,8 @@ class AccessibleObject { } AccessibleTextAttributeEvent event = new AccessibleTextAttributeEvent(accessible); - event.start = (int)/*64*/start_offset; - event.end = (int)/*64*/end_offset; + event.start = (int)start_offset; + event.end = (int)end_offset; event.textStyle = style; event.attributes = attributes; for (int i = 0; i < length; i++) { @@ -766,8 +766,8 @@ class AccessibleObject { int length = size(listeners); if (length > 0) { AccessibleEditableTextEvent event = new AccessibleEditableTextEvent(accessible); - event.start = (int)/*64*/start_pos; - event.end = (int)/*64*/end_pos; + event.start = (int)start_pos; + event.end = (int)end_pos; for (int i = 0; i < length; i++) { AccessibleEditableTextListener listener = listeners.get(i); listener.copyText(event); @@ -806,8 +806,8 @@ class AccessibleObject { int length = size(listeners); if (length > 0) { AccessibleEditableTextEvent event = new AccessibleEditableTextEvent(accessible); - event.start = (int)/*64*/start_pos; - event.end = (int)/*64*/end_pos; + event.start = (int)start_pos; + event.end = (int)end_pos; for (int i = 0; i < length; i++) { AccessibleEditableTextListener listener = listeners.get(i); listener.cutText(event); @@ -845,8 +845,8 @@ class AccessibleObject { int length = size(listeners); if (length > 0) { AccessibleEditableTextEvent event = new AccessibleEditableTextEvent(accessible); - event.start = (int)/*64*/start_pos; - event.end = (int)/*64*/end_pos; + event.start = (int)start_pos; + event.end = (int)end_pos; event.string = ""; for (int i = 0; i < length; i++) { AccessibleEditableTextListener listener = listeners.get(i); @@ -884,7 +884,7 @@ class AccessibleObject { int length = size(listeners); if (length > 0) { AccessibleEditableTextEvent event = new AccessibleEditableTextEvent(accessible); - event.start = (int)/*64*/position; + event.start = (int)position; for (int i = 0; i < length; i++) { AccessibleEditableTextListener listener = listeners.get(i); listener.pasteText(event); @@ -1309,7 +1309,7 @@ class AccessibleObject { if (length > 0) { AccessibleControlEvent event = new AccessibleControlEvent (accessible); event.childID = object.id; - event.detail = (int)/*64*/parentResult; + event.detail = (int)parentResult; for (int i = 0; i < length; i++) { AccessibleControlListener listener = listeners.get (i); listener.getChildCount (event); @@ -1498,7 +1498,7 @@ class AccessibleObject { if (length > 0) { AccessibleControlEvent event = new AccessibleControlEvent(accessible); event.childID = ACC.CHILDID_CHILD_AT_INDEX; - event.detail = (int)/*64*/index; + event.detail = (int)index; for (int i = 0; i < length; i++) { AccessibleControlListener listener = listeners.get(i); listener.getChild(event); @@ -1511,7 +1511,7 @@ class AccessibleObject { } } object.updateChildren (); - AccessibleObject accObject = object.getChildByIndex ((int)/*64*/index); + AccessibleObject accObject = object.getChildByIndex ((int)index); if (accObject != null) { return OS.g_object_ref (accObject.atkHandle); } @@ -1733,8 +1733,8 @@ class AccessibleObject { int length = size(listeners); if (length > 0) { AccessibleTableEvent event = new AccessibleTableEvent(accessible); - event.row = (int)/*64*/row; - event.column = (int)/*64*/column; + event.row = (int)row; + event.column = (int)column; for (int i = 0; i < length; i++) { AccessibleTableListener listener = listeners.get(i); listener.getCell(event); @@ -1777,8 +1777,8 @@ class AccessibleObject { int length = size(listeners); if (length > 0) { AccessibleTableEvent event = new AccessibleTableEvent(accessible); - event.row = (int)/*64*/row; - event.column = (int)/*64*/column; + event.row = (int)row; + event.column = (int)column; for (int i = 0; i < length; i++) { AccessibleTableListener listener = listeners.get(i); listener.getCell(event); @@ -1903,7 +1903,7 @@ class AccessibleObject { int length = size(listeners); if (length > 0) { AccessibleTableEvent event = new AccessibleTableEvent(accessible); - event.count = (int)/*64*/parentResult; + event.count = (int)parentResult; for (int i = 0; i < length; i++) { AccessibleTableListener listener = listeners.get(i); listener.getColumnCount(event); @@ -1940,7 +1940,7 @@ class AccessibleObject { int length = size(listeners); if (length > 0) { AccessibleTableEvent event = new AccessibleTableEvent(accessible); - event.count = (int)/*64*/parentResult; + event.count = (int)parentResult; for (int i = 0; i < length; i++) { AccessibleTableListener listener = listeners.get(i); listener.getRowCount(event); @@ -1980,8 +1980,8 @@ class AccessibleObject { int length = size(listeners); if (length > 0) { AccessibleTableEvent event = new AccessibleTableEvent(accessible); - event.row = (int)/*64*/row; - event.column = (int)/*64*/column; + event.row = (int)row; + event.column = (int)column; for (int i = 0; i < length; i++) { AccessibleTableListener listener = listeners.get(i); listener.getCell(event); @@ -1992,7 +1992,7 @@ class AccessibleObject { length = size(listeners2); if (length > 0) { AccessibleTableCellEvent cellEvent = new AccessibleTableCellEvent(result); - cellEvent.count = (int)/*64*/parentResult; + cellEvent.count = (int)parentResult; for (int i = 0; i < length; i++) { AccessibleTableCellListener listener = listeners2.get(i); listener.getColumnSpan(cellEvent); @@ -2034,8 +2034,8 @@ class AccessibleObject { int length = size(listeners); if (length > 0) { AccessibleTableEvent event = new AccessibleTableEvent(accessible); - event.row = (int)/*64*/row; - event.column = (int)/*64*/column; + event.row = (int)row; + event.column = (int)column; for (int i = 0; i < length; i++) { AccessibleTableListener listener = listeners.get(i); listener.getCell(event); @@ -2046,7 +2046,7 @@ class AccessibleObject { length = size(listeners2); if (length > 0) { AccessibleTableCellEvent cellEvent = new AccessibleTableCellEvent(result); - cellEvent.count = (int)/*64*/parentResult; + cellEvent.count = (int)parentResult; for (int i = 0; i < length; i++) { AccessibleTableCellListener listener = listeners2.get(i); listener.getRowSpan(cellEvent); @@ -2158,7 +2158,7 @@ class AccessibleObject { int length = size(listeners); if (length > 0) { AccessibleTableEvent event = new AccessibleTableEvent(accessible); - event.column = (int)/*64*/column; + event.column = (int)column; if (parentResult != 0) event.result = getString (parentResult); for (int i = 0; i < length; i++) { AccessibleTableListener listener = listeners.get(i); @@ -2201,7 +2201,7 @@ class AccessibleObject { Accessible[] accessibles = event.accessibles; if (accessibles != null) { if (0 <= column && column < accessibles.length) { - return accessibles[(int)/*64*/column].getAccessibleObject().atkHandle; + return accessibles[(int)column].getAccessibleObject().atkHandle; } } } @@ -2241,7 +2241,7 @@ class AccessibleObject { int length = size(listeners); if (length > 0) { AccessibleTableEvent event = new AccessibleTableEvent(accessible); - event.row = (int)/*64*/row; + event.row = (int)row; if (parentResult != 0) event.result = getString (parentResult); for (int i = 0; i < length; i++) { AccessibleTableListener listener = listeners.get(i); @@ -2284,7 +2284,7 @@ class AccessibleObject { Accessible[] accessibles = event.accessibles; if (accessibles != null) { if (0 <= row && row < accessibles.length) { - return accessibles[(int)/*64*/row].getAccessibleObject().atkHandle; + return accessibles[(int)row].getAccessibleObject().atkHandle; } } } @@ -2408,7 +2408,7 @@ class AccessibleObject { if (length > 0) { AccessibleTableEvent event = new AccessibleTableEvent(accessible); event.isSelected = parentResult != 0; - event.column = (int)/*64*/column; + event.column = (int)column; for (int i = 0; i < length; i++) { AccessibleTableListener listener = listeners.get(i); listener.isColumnSelected(event); @@ -2446,7 +2446,7 @@ class AccessibleObject { if (length > 0) { AccessibleTableEvent event = new AccessibleTableEvent(accessible); event.isSelected = parentResult != 0; - event.row = (int)/*64*/row; + event.row = (int)row; for (int i = 0; i < length; i++) { AccessibleTableListener listener = listeners.get(i); listener.isRowSelected(event); @@ -2485,8 +2485,8 @@ class AccessibleObject { int length = size(listeners); if (length > 0) { AccessibleTableEvent event = new AccessibleTableEvent(accessible); - event.row = (int)/*64*/row; - event.column = (int)/*64*/column; + event.row = (int)row; + event.column = (int)column; for (int i = 0; i < length; i++) { AccessibleTableListener listener = listeners.get(i); listener.getCell(event); @@ -2532,7 +2532,7 @@ class AccessibleObject { int length = size(listeners); if (length > 0) { AccessibleTableEvent event = new AccessibleTableEvent(accessible); - event.row = (int)/*64*/row; + event.row = (int)row; for (int i = 0; i < length; i++) { AccessibleTableListener listener = listeners.get(i); listener.selectRow(event); @@ -2570,7 +2570,7 @@ class AccessibleObject { int length = size(listeners); if (length > 0) { AccessibleTableEvent event = new AccessibleTableEvent(accessible); - event.row = (int)/*64*/row; + event.row = (int)row; for (int i = 0; i < length; i++) { AccessibleTableListener listener = listeners.get(i); listener.deselectRow(event); @@ -2608,7 +2608,7 @@ class AccessibleObject { int length = size(listeners); if (length > 0) { AccessibleTableEvent event = new AccessibleTableEvent(accessible); - event.column = (int)/*64*/column; + event.column = (int)column; for (int i = 0; i < length; i++) { AccessibleTableListener listener = listeners.get(i); listener.selectColumn(event); @@ -2646,7 +2646,7 @@ class AccessibleObject { int length = size(listeners); if (length > 0) { AccessibleTableEvent event = new AccessibleTableEvent(accessible); - event.column = (int)/*64*/column; + event.column = (int)column; for (int i = 0; i < length; i++) { AccessibleTableListener listener = listeners.get(i); listener.deselectColumn(event); @@ -2726,8 +2726,8 @@ class AccessibleObject { int length = size(listeners); if (length > 0) { AccessibleTextEvent event = new AccessibleTextEvent(accessible); - event.start = (int)/*64*/offset; - event.end = (int)/*64*/(offset + 1); + event.start = (int)offset; + event.end = (int)(offset + 1); for (int i = 0; i < length; i++) { AccessibleTextExtendedListener listener = listeners.get(i); listener.getTextBounds(event); @@ -2780,8 +2780,8 @@ class AccessibleObject { int length = size(listeners); if (length > 0) { AccessibleTextEvent event = new AccessibleTextEvent(accessible); - event.start = (int)/*64*/start_offset; - event.end = (int)/*64*/end_offset; + event.start = (int)start_offset; + event.end = (int)end_offset; for (int i = 0; i < length; i++) { AccessibleTextExtendedListener listener = listeners.get(i); listener.getTextBounds(event); @@ -2833,7 +2833,7 @@ class AccessibleObject { int length = size(listeners); if (length > 0) { AccessibleTextAttributeEvent event = new AccessibleTextAttributeEvent(accessible); - event.offset = (int)/*64*/offset; + event.offset = (int)offset; for (int i = 0; i < length; i++) { AccessibleAttributeListener listener = listeners.get(i); listener.getTextAttributes(event); @@ -2975,8 +2975,8 @@ class AccessibleObject { int length = size(listeners); if (length > 0) { AccessibleTextEvent event = new AccessibleTextEvent(accessible); - event.x = (int)/*64*/x; - event.y = (int)/*64*/y; + event.x = (int)x; + event.y = (int)y; int[] topWindowX = new int [1], topWindowY = new int [1]; if (coords == ATK.ATK_XY_WINDOW) { windowPoint (object, topWindowX, topWindowY); @@ -3020,8 +3020,8 @@ class AccessibleObject { int length = size(listeners); if (length > 0) { AccessibleTextEvent event = new AccessibleTextEvent(accessible); - event.start = (int)/*64*/start_offset; - event.end = (int)/*64*/end_offset; + event.start = (int)start_offset; + event.end = (int)end_offset; for (int i = 0; i < length; i++) { AccessibleTextExtendedListener listener = listeners.get(i); listener.addSelection(event); @@ -3058,7 +3058,7 @@ class AccessibleObject { int length = size(listeners); if (length > 0) { AccessibleTextEvent event = new AccessibleTextEvent(accessible); - event.index = (int)/*64*/selection_num; + event.index = (int)selection_num; for (int i = 0; i < length; i++) { AccessibleTextExtendedListener listener = listeners.get(i); listener.removeSelection(event); @@ -3095,7 +3095,7 @@ class AccessibleObject { int length = size(listeners); if (length > 0) { AccessibleTextEvent event = new AccessibleTextEvent(accessible); - event.offset = (int)/*64*/offset; + event.offset = (int)offset; for (int i = 0; i < length; i++) { AccessibleTextExtendedListener listener = listeners.get(i); listener.setCaretOffset(event); @@ -3134,9 +3134,9 @@ class AccessibleObject { int length = size(listeners); if (length > 0) { AccessibleTextEvent event = new AccessibleTextEvent(accessible); - event.index = (int)/*64*/selection_num; - event.start = (int)/*64*/start_offset; - event.end = (int)/*64*/end_offset; + event.index = (int)selection_num; + event.start = (int)start_offset; + event.end = (int)end_offset; for (int i = 0; i < length; i++) { AccessibleTextExtendedListener listener = listeners.get(i); listener.setSelection(event); @@ -3188,7 +3188,7 @@ class AccessibleObject { if (length > 0) { AccessibleTextEvent event = new AccessibleTextEvent (object.accessible); event.childID = object.id; - event.offset = (int)/*64*/parentResult; + event.offset = (int)parentResult; for (int i = 0; i < length; i++) { AccessibleTextListener listener = listeners2.get(i); listener.getCaretOffset (event); @@ -3299,8 +3299,8 @@ class AccessibleObject { int length = size(listeners); if (length > 0) { AccessibleTextEvent event = new AccessibleTextEvent(accessible); - event.start = (int)/*64*/offset; - event.end = (int)/*64*/(offset + 1); + event.start = (int)offset; + event.end = (int)(offset + 1); event.type = ACC.TEXT_BOUNDARY_CHAR; for (int i = 0; i < length; i++) { AccessibleTextExtendedListener listener = listeners.get(i); @@ -3310,7 +3310,7 @@ class AccessibleObject { return text != null && text.length() > 0 ? text.charAt(0) : 0; } String text = object.getText (); - if (text != null && text.length() > offset) return text.charAt ((int)/*64*/offset); + if (text != null && text.length() > offset) return text.charAt ((int)offset); } AtkTextIface iface = getParentTextIface (atkObject); if (iface != null && iface.get_character_at_offset != 0) { @@ -3436,7 +3436,7 @@ class AccessibleObject { int length = size(listeners); if (length > 0) { AccessibleTextEvent event = new AccessibleTextEvent(accessible); - event.index = (int)/*64*/selection_num; + event.index = (int)selection_num; event.start = parentStart[0]; event.end = parentEnd[0]; for (int i = 0; i < length; i++) { @@ -3508,8 +3508,8 @@ class AccessibleObject { int length = size(listeners); if (length > 0) { AccessibleTextEvent event = new AccessibleTextEvent(accessible); - event.start = (int)/*64*/start_offset; - event.end = (int)/*64*/end_offset; + event.start = (int)start_offset; + event.end = (int)end_offset; event.type = ACC.TEXT_BOUNDARY_ALL; for (int i = 0; i < length; i++) { AccessibleTextExtendedListener listener = listeners.get(i); @@ -3525,7 +3525,7 @@ class AccessibleObject { end_offset = Math.min (end_offset, text.length ()); } start_offset = Math.min (start_offset, end_offset); - text = text.substring ((int)/*64*/start_offset, (int)/*64*/end_offset); + text = text.substring ((int)start_offset, (int)end_offset); return getStringPtr (text); } } @@ -3563,9 +3563,9 @@ class AccessibleObject { if (length > 0) { long charCount = atkText_get_character_count (atkObject); AccessibleTextEvent event = new AccessibleTextEvent(accessible); - event.start = event.end = (int)/*64*/offset_value; + event.start = event.end = (int)offset_value; event.count = 1; - switch ((int)/*64*/boundary_type) { + switch ((int)boundary_type) { case ATK.ATK_TEXT_BOUNDARY_CHAR: event.type = ACC.TEXT_BOUNDARY_CHAR; break; case ATK.ATK_TEXT_BOUNDARY_WORD_START: event.type = ACC.TEXT_BOUNDARY_WORD; break; case ATK.ATK_TEXT_BOUNDARY_WORD_END: event.type = ACC.TEXT_BOUNDARY_WORD; break; @@ -3580,7 +3580,7 @@ class AccessibleObject { AccessibleTextExtendedListener listener = listeners.get(i); listener.getText(event); } - switch ((int)/*64*/boundary_type) { + switch ((int)boundary_type) { case ATK.ATK_TEXT_BOUNDARY_WORD_START: case ATK.ATK_TEXT_BOUNDARY_SENTENCE_START: case ATK.ATK_TEXT_BOUNDARY_LINE_START: @@ -3630,14 +3630,14 @@ class AccessibleObject { C.memmove (end_offset, new int[] {event.end}, 4); return getStringPtr (event.result); } - int offset = (int)/*64*/offset_value; + int offset = (int)offset_value; String text = object.getText (); if (text != null && text.length () > 0) { length = text.length (); offset = Math.min (offset, length - 1); int startBounds = offset; int endBounds = offset; - switch ((int)/*64*/boundary_type) { + switch ((int)boundary_type) { case ATK.ATK_TEXT_BOUNDARY_CHAR: { if (length > offset) endBounds++; break; @@ -3671,7 +3671,7 @@ class AccessibleObject { startBounds = endBounds = length; break; } - int wordEnd1 = nextIndexOfChar (text, " !?.\n", (int)/*64*/offset); + int wordEnd1 = nextIndexOfChar (text, " !?.\n", (int)offset); if (wordEnd1 == -1) { startBounds = endBounds = length; break; @@ -3828,9 +3828,9 @@ class AccessibleObject { if (length > 0) { long charCount = atkText_get_character_count (atkObject); AccessibleTextEvent event = new AccessibleTextEvent(accessible); - event.start = event.end = (int)/*64*/offset_value; + event.start = event.end = (int)offset_value; event.count = 0; - switch ((int)/*64*/boundary_type) { + switch ((int)boundary_type) { case ATK.ATK_TEXT_BOUNDARY_CHAR: event.type = ACC.TEXT_BOUNDARY_CHAR; break; case ATK.ATK_TEXT_BOUNDARY_WORD_START: event.type = ACC.TEXT_BOUNDARY_WORD; break; case ATK.ATK_TEXT_BOUNDARY_WORD_END: event.type = ACC.TEXT_BOUNDARY_WORD; break; @@ -3845,7 +3845,7 @@ class AccessibleObject { AccessibleTextExtendedListener listener = listeners.get(i); listener.getText(event); } - switch ((int)/*64*/boundary_type) { + switch ((int)boundary_type) { case ATK.ATK_TEXT_BOUNDARY_WORD_START: case ATK.ATK_TEXT_BOUNDARY_SENTENCE_START: case ATK.ATK_TEXT_BOUNDARY_LINE_START: @@ -3895,14 +3895,14 @@ class AccessibleObject { C.memmove (end_offset, new int[] {event.end}, 4); return getStringPtr (event.result); } - int offset = (int)/*64*/offset_value; + int offset = (int)offset_value; String text = object.getText (); if (text != null && text.length () > 0) { length = text.length (); offset = Math.min (offset, length - 1); int startBounds = offset; int endBounds = offset; - switch ((int)/*64*/boundary_type) { + switch ((int)boundary_type) { case ATK.ATK_TEXT_BOUNDARY_CHAR: { if (length > offset) endBounds++; break; @@ -4036,9 +4036,9 @@ class AccessibleObject { if (length > 0) { long charCount = atkText_get_character_count (atkObject); AccessibleTextEvent event = new AccessibleTextEvent(accessible); - event.start = event.end = (int)/*64*/offset_value; + event.start = event.end = (int)offset_value; event.count = -1; - switch ((int)/*64*/boundary_type) { + switch ((int)boundary_type) { case ATK.ATK_TEXT_BOUNDARY_CHAR: event.type = ACC.TEXT_BOUNDARY_CHAR; break; case ATK.ATK_TEXT_BOUNDARY_WORD_START: event.type = ACC.TEXT_BOUNDARY_WORD; break; case ATK.ATK_TEXT_BOUNDARY_WORD_END: event.type = ACC.TEXT_BOUNDARY_WORD; break; @@ -4055,7 +4055,7 @@ class AccessibleObject { } C.memmove (start_offset, new int[] {event.start}, 4); C.memmove (end_offset, new int[] {event.end}, 4); - switch ((int)/*64*/boundary_type) { + switch ((int)boundary_type) { case ATK.ATK_TEXT_BOUNDARY_WORD_START: case ATK.ATK_TEXT_BOUNDARY_SENTENCE_START: case ATK.ATK_TEXT_BOUNDARY_LINE_START: @@ -4103,14 +4103,14 @@ class AccessibleObject { } return getStringPtr (event.result); } - int offset = (int)/*64*/offset_value; + int offset = (int)offset_value; String text = object.getText (); if (text != null && text.length () > 0) { length = text.length (); offset = Math.min (offset, length - 1); int startBounds = offset; int endBounds = offset; - switch ((int)/*64*/boundary_type) { + switch ((int)boundary_type) { case ATK.ATK_TEXT_BOUNDARY_CHAR: { if (length >= offset && offset > 0) startBounds--; break; diff --git a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/gtk/org/eclipse/swt/dnd/DragSource.java b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/gtk/org/eclipse/swt/dnd/DragSource.java index 6870ec56a2..8cbf16e5f8 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/gtk/org/eclipse/swt/dnd/DragSource.java +++ b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/gtk/org/eclipse/swt/dnd/DragSource.java @@ -238,7 +238,7 @@ static long DragEnd(long widget, long context){ static long DragGetData(long widget, long context, long selection_data, long info, long time){ DragSource source = FindDragSource(widget); if (source == null) return 0; - source.dragGetData(widget, context, selection_data, (int)/*64*/info, (int)/*64*/time); + source.dragGetData(widget, context, selection_data, (int)info, (int)time); return 0; } diff --git a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/gtk/org/eclipse/swt/dnd/DropTarget.java b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/gtk/org/eclipse/swt/dnd/DropTarget.java index c2d3bb191f..35e0c4e9f1 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/gtk/org/eclipse/swt/dnd/DropTarget.java +++ b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/gtk/org/eclipse/swt/dnd/DropTarget.java @@ -243,27 +243,27 @@ static int checkStyle (int style) { static long Drag_Data_Received ( long widget, long context, long x, long y, long data, long info, long time){ DropTarget target = FindDropTarget(widget); if (target == null) return 0; - target.drag_data_received (widget, context, (int)/*64*/x, (int)/*64*/y, data, (int)/*64*/info, (int)/*64*/time); + target.drag_data_received (widget, context, (int)x, (int)y, data, (int)info, (int)time); return 0; } static long Drag_Drop(long widget, long context, long x, long y, long time) { DropTarget target = FindDropTarget(widget); if (target == null) return 0; - return target.drag_drop (widget, context, (int)/*64*/x, (int)/*64*/y, (int)/*64*/time) ? 1 : 0; + return target.drag_drop (widget, context, (int)x, (int)y, (int)time) ? 1 : 0; } static long Drag_Leave ( long widget, long context, long time){ DropTarget target = FindDropTarget(widget); if (target == null) return 0; - target.drag_leave (widget, context, (int)/*64*/time); + target.drag_leave (widget, context, (int)time); return 0; } static long Drag_Motion ( long widget, long context, long x, long y, long time){ DropTarget target = FindDropTarget(widget); if (target == null) return 0; - return target.drag_motion (widget, context, (int)/*64*/x, (int)/*64*/y, (int)/*64*/time) ? 1 : 0; + return target.drag_motion (widget, context, (int)x, (int)y, (int)time) ? 1 : 0; } static DropTarget FindDropTarget(long handle) { diff --git a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/gtk/org/eclipse/swt/dnd/FileTransfer.java b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/gtk/org/eclipse/swt/dnd/FileTransfer.java index 0c55180d39..02e3fa0022 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/gtk/org/eclipse/swt/dnd/FileTransfer.java +++ b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/gtk/org/eclipse/swt/dnd/FileTransfer.java @@ -188,7 +188,7 @@ public Object nativeToJava(TransferData transferData) { long utf16Ptr = OS.g_utf8_to_utf16(utf8Ptr, -1, null, items_written, null); OS.g_free(utf8Ptr); if (utf16Ptr == 0) continue; - length = (int)/*64*/items_written[0]; + length = (int)items_written[0]; char[] buffer = new char[length]; C.memmove(buffer, utf16Ptr, length * 2); OS.g_free(utf16Ptr); diff --git a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/gtk/org/eclipse/swt/dnd/Transfer.java b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/gtk/org/eclipse/swt/dnd/Transfer.java index f7ff46fddf..5cf4b73998 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/gtk/org/eclipse/swt/dnd/Transfer.java +++ b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/gtk/org/eclipse/swt/dnd/Transfer.java @@ -135,7 +135,7 @@ abstract protected Object nativeToJava(TransferData transferData); public static int registerType(String formatName){ if (formatName == null) return GDK.GDK_NONE; byte[] buffer = Converter.wcsToMbcs(formatName, true); - return (int)/*64*/GDK.gdk_atom_intern(buffer, false); + return (int)GDK.gdk_atom_intern(buffer, false); } /** diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/common/org/eclipse/swt/internal/LONG.java b/bundles/org.eclipse.swt/Eclipse SWT PI/common/org/eclipse/swt/internal/LONG.java index 182ced004e..9022c05700 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/common/org/eclipse/swt/internal/LONG.java +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/common/org/eclipse/swt/internal/LONG.java @@ -31,6 +31,6 @@ public class LONG { @Override public int hashCode () { - return (int)/*64*/(value ^ (value >>> 32)); + return (int)(value ^ (value >>> 32)); } } diff --git a/bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/org/eclipse/swt/browser/WebKit.java b/bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/org/eclipse/swt/browser/WebKit.java index 4240ac0a9f..a789deac01 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/org/eclipse/swt/browser/WebKit.java +++ b/bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/org/eclipse/swt/browser/WebKit.java @@ -1043,7 +1043,7 @@ long webkit_authenticate (long web_view, long request){ } long webViewProc (long handle, long user_data) { - switch ((int)/*64*/user_data) { + switch ((int)user_data) { case CLOSE_WEB_VIEW: return webkit_close_web_view (handle); case WEB_VIEW_READY: return webkit_web_view_ready (handle); default: return 0; @@ -1051,7 +1051,7 @@ long webViewProc (long handle, long user_data) { } long webViewProc (long handle, long arg0, long user_data) { - switch ((int)/*64*/user_data) { + switch ((int)user_data) { case CREATE_WEB_VIEW: return webkit_create_web_view (handle, arg0); case DOWNLOAD_REQUESTED: return webkit_download_requested (handle, arg0); // webkit1 case NOTIFY_LOAD_STATUS: return webkit_notify_load_status (handle, arg0); // Webkit1 @@ -1066,7 +1066,7 @@ long webViewProc (long handle, long arg0, long user_data) { } long webViewProc (long handle, long arg0, long arg1, long user_data) { - switch ((int)/*64*/user_data) { + switch ((int)user_data) { case HOVERING_OVER_LINK: return webkit_hovering_over_link (handle, arg0, arg1); // Webkit1 only case MOUSE_TARGET_CHANGED: return webkit_mouse_target_changed (handle, arg0, arg1); // Webkit2 only. case DECIDE_POLICY: return webkit_decide_policy(handle, arg0, (int)arg1, user_data); @@ -1075,7 +1075,7 @@ long webViewProc (long handle, long arg0, long arg1, long user_data) { } long webViewProc (long handle, long arg0, long arg1, long arg2, long user_data) { - switch ((int)/*64*/user_data) { + switch ((int)user_data) { case CONSOLE_MESSAGE: return webkit_console_message (handle, arg0, arg1, arg2); case WINDOW_OBJECT_CLEARED: return webkit_window_object_cleared (handle, arg0, arg1, arg2); case CONTEXT_MENU: return webkit_context_menu(handle, arg0, arg1, arg2); @@ -1085,7 +1085,7 @@ long webViewProc (long handle, long arg0, long arg1, long arg2, long user_data) } long webViewProc (long handle, long arg0, long arg1, long arg2, long arg3, long user_data) { - switch ((int)/*64*/user_data) { + switch ((int)user_data) { case MIME_TYPE_POLICY_DECISION_REQUESTED: return webkit_mime_type_policy_decision_requested (handle, arg0, arg1, arg2, arg3); // Webkit1 case NAVIGATION_POLICY_DECISION_REQUESTED: return webkit_navigation_policy_decision_requested (handle, arg0, arg1, arg2, arg3); case RESOURCE_REQUEST_STARTING: return webkit_resource_request_starting (handle, arg0, arg1, arg2, arg3); // Webkit1 @@ -3450,7 +3450,7 @@ long webkit_load_failed_tls (long web_view, long failing_uri, long certificate, OS.g_object_ref(certificate); tlsErrorCertificate = certificate; convertUri (failing_uri); - switch ((int)/*64*/error) { + switch ((int)error) { case WebKitGTK.G_TLS_CERTIFICATE_UNKNOWN_CA: { tlsErrorType = SWT.getMessage("SWT_InvalidCert_UnknownCA"); break; @@ -3951,11 +3951,11 @@ static Object convertToJava (long ctx, long value) { long string = WebKitGTK.JSValueToStringCopy (ctx, value, null); if (string == 0) return ""; //$NON-NLS-1$ long length = WebKitGTK.JSStringGetMaximumUTF8CStringSize (string); - byte[] bytes = new byte[(int)/*64*/length]; + byte[] bytes = new byte[(int)length]; length = WebKitGTK.JSStringGetUTF8CString (string, bytes, length); WebKitGTK.JSStringRelease (string); /* length-1 is needed below to exclude the terminator character */ - return new String (bytes, 0, (int)/*64*/length - 1, StandardCharsets.UTF_8); + return new String (bytes, 0, (int)length - 1, StandardCharsets.UTF_8); } case WebKitGTK.kJSTypeNull: // FALL THROUGH diff --git a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/graphics/Cursor.java b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/graphics/Cursor.java index d29e5beb3c..2d938e40f9 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/graphics/Cursor.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/graphics/Cursor.java @@ -611,7 +611,7 @@ public static Cursor gtk_new(Device device, long handle) { */ @Override public int hashCode() { - return (int)/*64*/handle; + return (int)handle; } /** diff --git a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/graphics/Device.java b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/graphics/Device.java index 6e5e6e453d..fe4f23b8a7 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/graphics/Device.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/graphics/Device.java @@ -877,7 +877,7 @@ long logProc (long log_domain, long log_level, long message, long user_data) { if (DEBUG || debug) { new Error ().printStackTrace (); } - OS.g_log_default_handler (log_domain, (int)/*64*/log_level, message, 0); + OS.g_log_default_handler (log_domain, (int)log_level, message, 0); } return 0; } @@ -1106,7 +1106,7 @@ protected int getDeviceZoom() { * @since 3.105 */ protected long gsettingsProc (long gobject, long arg1, long user_data) { - switch((int)/*64*/user_data) { + switch((int)user_data) { case CHANGE_SCALEFACTOR: this.scaleFactor = getDeviceZoom (); DPIUtil.setDeviceZoom (scaleFactor); diff --git a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/graphics/Font.java b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/graphics/Font.java index a3c99db051..21e63f974e 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/graphics/Font.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/graphics/Font.java @@ -248,7 +248,7 @@ public static Font gtk_new(Device device, long handle) { */ @Override public int hashCode() { - return (int)/*64*/handle; + return (int)handle; } void init(String name, float height, int style, byte[] fontString) { diff --git a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/graphics/GC.java b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/graphics/GC.java index e8f0edba4d..93f253915a 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/graphics/GC.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/graphics/GC.java @@ -2564,7 +2564,7 @@ public boolean getXORMode() { */ @Override public int hashCode() { - return (int)/*64*/handle; + return (int)handle; } double[] identity() { diff --git a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/graphics/Image.java b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/graphics/Image.java index e3ea1be3db..f1e3372130 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/graphics/Image.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/graphics/Image.java @@ -1238,7 +1238,7 @@ public int hashCode () { } else if (imageFileNameProvider != null) { return imageFileNameProvider.hashCode(); } else { - return (int)/*64*/surface; + return (int)surface; } } diff --git a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/graphics/Region.java b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/graphics/Region.java index 710e2c3724..74495a3e00 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/graphics/Region.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/graphics/Region.java @@ -372,7 +372,7 @@ public static Region gtk_new(Device device, long handle) { */ @Override public int hashCode() { - return (int)/*64*/handle; + return (int)handle; } /** diff --git a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/graphics/TextLayout.java b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/graphics/TextLayout.java index 4556b35c6c..0a874f8b6d 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/graphics/TextLayout.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/graphics/TextLayout.java @@ -154,7 +154,7 @@ void computeRuns () { OS.memmove (attr, attribute, PangoAttribute.sizeof); OS.pango_attr_list_insert(attrList, attr); OS.pango_attr_list_insert(selAttrList, OS.pango_attribute_copy(attr)); - int pos = (int)/*64*/OS.g_utf16_pointer_to_offset(ptr, ptr + bytePos); + int pos = (int)OS.g_utf16_pointer_to_offset(ptr, ptr + bytePos); chars[pos + lineIndex * 2] = ZWS; chars[pos + lineIndex * 2 + 1] = ZWNBS; segmentsText.getChars(oldPos, pos, chars, oldPos + lineIndex * 2); @@ -196,8 +196,8 @@ void computeRuns () { if (style == null) continue; int start = translateOffset(styleItem.start); int end = translateOffset(styles[i+1].start - 1); - int byteStart = (int)/*64*/(OS.g_utf16_offset_to_pointer(ptr, start) - ptr); - int byteEnd = (int)/*64*/(OS.g_utf16_offset_to_pointer(ptr, end + 1) - ptr); + int byteStart = (int)(OS.g_utf16_offset_to_pointer(ptr, start) - ptr); + int byteEnd = (int)(OS.g_utf16_offset_to_pointer(ptr, end + 1) - ptr); byteStart = Math.min(byteStart, strlen); byteEnd = Math.min(byteEnd, strlen); Font font = style.font; @@ -493,9 +493,9 @@ void drawInPixels(GC gc, int x, int y, int selectionStart, int selectionEnd, Col OS.pango_layout_iter_get_line_extents(iter, null, rect); if (OS.pango_layout_iter_next_line(iter)) { int bytePos = OS.pango_layout_iter_get_index(iter); - lineEnd = (int)/*64*/OS.g_utf16_pointer_to_offset(ptr, ptr + bytePos); + lineEnd = (int)OS.g_utf16_pointer_to_offset(ptr, ptr + bytePos); } else { - lineEnd = (int)/*64*/OS.g_utf16_strlen(ptr, -1); + lineEnd = (int)OS.g_utf16_strlen(ptr, -1); } boolean extent = false; if (lineIndex == lineCount - 1 && (flags & SWT.LAST_LINE_SELECTION) != 0) { @@ -544,7 +544,7 @@ void drawInPixels(GC gc, int x, int y, int selectionStart, int selectionEnd, Col } else { selectionStart = Math.min(Math.max(0, selectionStart), length - 1); selectionEnd = Math.min(Math.max(0, selectionEnd), length - 1); - length = (int)/*64*/OS.g_utf16_strlen(OS.pango_layout_get_text(layout), -1); + length = (int)OS.g_utf16_strlen(OS.pango_layout_get_text(layout), -1); selectionStart = translateOffset(selectionStart); selectionEnd = translateOffset(selectionEnd); if (selectionForeground == null) selectionForeground = device.getSystemColor(SWT.COLOR_LIST_SELECTION_TEXT); @@ -564,8 +564,8 @@ void drawInPixels(GC gc, int x, int y, int selectionStart, int selectionEnd, Col } } else { long ptr = OS.pango_layout_get_text(layout); - int byteSelStart = (int)/*64*/(OS.g_utf16_offset_to_pointer(ptr, selectionStart) - ptr); - int byteSelEnd = (int)/*64*/(OS.g_utf16_offset_to_pointer(ptr, selectionEnd + 1) - ptr); + int byteSelStart = (int)(OS.g_utf16_offset_to_pointer(ptr, selectionStart) - ptr); + int byteSelEnd = (int)(OS.g_utf16_offset_to_pointer(ptr, selectionEnd + 1) - ptr); int strlen = C.strlen(ptr); byteSelStart = Math.min(byteSelStart, strlen); byteSelEnd = Math.min(byteSelEnd, strlen); @@ -630,8 +630,8 @@ void drawBorder(GC gc, int x, int y, GdkRGBA selectionColor) { } start = translateOffset(start); int end = translateOffset(styles[i+1].start - 1); - int byteStart = (int)/*64*/(OS.g_utf16_offset_to_pointer(ptr, start) - ptr); - int byteEnd = (int)/*64*/(OS.g_utf16_offset_to_pointer(ptr, end + 1) - ptr); + int byteStart = (int)(OS.g_utf16_offset_to_pointer(ptr, start) - ptr); + int byteEnd = (int)(OS.g_utf16_offset_to_pointer(ptr, end + 1) - ptr); int[] ranges = new int[]{byteStart, byteEnd}; long rgn = GDK.gdk_pango_layout_get_clip_region(layout, x, y, ranges, ranges.length / 2); if (rgn != 0) { @@ -799,8 +799,8 @@ Rectangle getBoundsInPixels(int start, int end) { start = translateOffset(start); end = translateOffset(end); long ptr = OS.pango_layout_get_text(layout); - int byteStart = (int)/*64*/(OS.g_utf16_offset_to_pointer (ptr, start) - ptr); - int byteEnd = (int)/*64*/(OS.g_utf16_offset_to_pointer (ptr, end + 1) - ptr); + int byteStart = (int)(OS.g_utf16_offset_to_pointer (ptr, start) - ptr); + int byteEnd = (int)(OS.g_utf16_offset_to_pointer (ptr, end + 1) - ptr); int strlen = C.strlen(ptr); byteStart = Math.min(byteStart, strlen); byteEnd = Math.min(byteEnd, strlen); @@ -1112,7 +1112,7 @@ public int[] getLineOffsets() { for (int i = 0; i < lineCount; i++) { long linePtr = OS.pango_layout_get_line(layout, i); OS.memmove(line, linePtr, PangoLayoutLine.sizeof); - int pos = (int)/*64*/OS.g_utf16_pointer_to_offset(ptr, ptr + line.start_index); + int pos = (int)OS.g_utf16_pointer_to_offset(ptr, ptr + line.start_index); offsets[i] = untranslateOffset(pos); } offsets[lineCount] = text.length(); @@ -1146,7 +1146,7 @@ Point getLocationInPixels(int offset, boolean trailing) { if (!(0 <= offset && offset <= length)) SWT.error(SWT.ERROR_INVALID_RANGE); offset = translateOffset(offset); long ptr = OS.pango_layout_get_text(layout); - int byteOffset = (int)/*64*/(OS.g_utf16_offset_to_pointer(ptr, offset) - ptr); + int byteOffset = (int)(OS.g_utf16_offset_to_pointer(ptr, offset) - ptr); int strlen = C.strlen(ptr); byteOffset = Math.min(byteOffset, strlen); PangoRectangle pos = new PangoRectangle(); @@ -1202,8 +1202,8 @@ int _getOffset (int offset, int movement, boolean forward) { if (attrs[0] == 0) return offset + step; long ptr = OS.pango_layout_get_text(layout); - int utf8Offset = (int)/*64*/OS.g_utf16_offset_to_utf8_offset (ptr, translateOffset(offset)); - int utf8Length = (int)/*64*/OS.g_utf8_strlen(ptr, -1); + int utf8Offset = (int)OS.g_utf16_offset_to_utf8_offset (ptr, translateOffset(offset)); + int utf8Length = (int)OS.g_utf8_strlen(ptr, -1); utf8Offset += step; PangoLogAttr logAttr = new PangoLogAttr(); while (0 <= utf8Offset && utf8Offset <= utf8Length) { @@ -1231,7 +1231,7 @@ int _getOffset (int offset, int movement, boolean forward) { if (utf8Offset == 0) limit = true; } if (found || limit) { - int testOffset = (int)/*64*/OS.g_utf8_offset_to_utf16_offset (ptr, utf8Offset); + int testOffset = (int)OS.g_utf8_offset_to_utf16_offset (ptr, utf8Offset); if (found && invalidOffsets != null) { for (int i = 0; i < invalidOffsets.length; i++) { if (testOffset == invalidOffsets[i]) { @@ -1348,11 +1348,11 @@ int getOffsetInPixels(int x, int y, int[] trailing) { int[] piTrailing = new int[1]; OS.pango_layout_xy_to_index(layout, x * OS.PANGO_SCALE, y * OS.PANGO_SCALE, index, piTrailing); long ptr = OS.pango_layout_get_text(layout); - int offset = (int)/*64*/OS.g_utf16_pointer_to_offset(ptr, ptr + index[0]); + int offset = (int)OS.g_utf16_pointer_to_offset(ptr, ptr + index[0]); if (trailing != null) { trailing[0] = piTrailing[0]; if (piTrailing[0] != 0) { - trailing[0] = (int)/*64*/OS.g_utf8_offset_to_utf16_offset(ptr, OS.g_utf8_pointer_to_offset(ptr, ptr + index[0]) + piTrailing[0]) - offset; + trailing[0] = (int)OS.g_utf8_offset_to_utf16_offset(ptr, OS.g_utf8_pointer_to_offset(ptr, ptr + index[0]) + piTrailing[0]) - offset; } } return untranslateOffset(offset); diff --git a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/internal/Converter.java b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/internal/Converter.java index 6c3ff7457e..f690365720 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/internal/Converter.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/internal/Converter.java @@ -130,7 +130,7 @@ public static char [] mbcsToWcs (byte [] buffer) { long [] items_written = new long [1]; long ptr = OS.g_utf8_to_utf16 (buffer, buffer.length, null, items_written, null); if (ptr == 0) return EmptyCharArray; - int length = (int)/*64*/items_written [0]; + int length = (int)items_written [0]; char [] chars = new char [length]; C.memmove (chars, ptr, length * 2); OS.g_free (ptr); @@ -208,7 +208,7 @@ public static byte [] wcsToMbcs (char [] chars, boolean terminate) { */ long ptr = OS.g_utf16_to_utf8 (chars, chars.length, items_read, items_written, null); if (ptr == 0) return terminate ? NullByteArray : EmptyByteArray; - int written = (int)/*64*/items_written [0]; + int written = (int)items_written [0]; byte [] bytes = new byte [written + (terminate ? 1 : 0)]; C.memmove (bytes, ptr, written); OS.g_free (ptr); diff --git a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Button.java b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Button.java index 4d05adc04a..dfd7391478 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Button.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Button.java @@ -1191,7 +1191,7 @@ long windowProc (long handle, long arg0, long user_data) { * Instead lets override windowProc() here and check for paintHandle() compatibility. * Fixes bug 481485 without re-introducing bug 483791. */ - switch ((int)/*64*/user_data) { + switch ((int)user_data) { case DRAW: { if (paintHandle() == handle) { return gtk_draw(handle, arg0); diff --git a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Combo.java b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Combo.java index a975a86c67..6a2d5384da 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Combo.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Combo.java @@ -957,7 +957,7 @@ boolean dragDetect(int x, int y, boolean filter, boolean dragOnTimeout, boolean[ long layout = GTK.gtk_entry_get_layout (entryHandle); OS.pango_layout_xy_to_index (layout, x * OS.PANGO_SCALE, y * OS.PANGO_SCALE, index, trailing); long ptr = OS.pango_layout_get_text (layout); - int position = (int)/*64*/OS.g_utf8_pointer_to_offset (ptr, ptr + index[0]) + trailing[0]; + int position = (int)OS.g_utf8_pointer_to_offset (ptr, ptr + index[0]) + trailing[0]; int [] start = new int [1]; int [] end = new int [1]; GTK.gtk_editable_get_selection_bounds (entryHandle, start, end); @@ -1045,7 +1045,7 @@ public int getCaretPosition () { return 0; } long ptr = GTK.gtk_entry_get_text (entryHandle); - return (int)/*64*/OS.g_utf8_offset_to_utf16_offset (ptr, GTK.gtk_editable_get_position (entryHandle)); + return (int)OS.g_utf8_offset_to_utf16_offset (ptr, GTK.gtk_editable_get_position (entryHandle)); } @Override @@ -1212,8 +1212,8 @@ public Point getSelection () { if (entryHandle != 0) { GTK.gtk_editable_get_selection_bounds (entryHandle, start, end); long ptr = GTK.gtk_entry_get_text (entryHandle); - start[0] = (int)/*64*/OS.g_utf8_offset_to_utf16_offset (ptr, start[0]); - end[0] = (int)/*64*/OS.g_utf8_offset_to_utf16_offset (ptr, end[0]); + start[0] = (int)OS.g_utf8_offset_to_utf16_offset (ptr, start[0]); + end[0] = (int)OS.g_utf8_offset_to_utf16_offset (ptr, end[0]); } return new Point(start [0], end [0]); } @@ -1454,15 +1454,15 @@ long gtk_delete_text (long widget, long start_pos, long end_pos) { if (!hooks (SWT.Verify) && !filters (SWT.Verify)) return 0; long ptr = GTK.gtk_entry_get_text (entryHandle); if (end_pos == -1) end_pos = OS.g_utf8_strlen (ptr, -1); - int start = (int)/*64*/OS.g_utf8_offset_to_utf16_offset (ptr, start_pos); - int end = (int)/*64*/OS.g_utf8_offset_to_utf16_offset (ptr, end_pos); + int start = (int)OS.g_utf8_offset_to_utf16_offset (ptr, start_pos); + int end = (int)OS.g_utf8_offset_to_utf16_offset (ptr, end_pos); String newText = verifyText ("", start, end); if (newText == null) { OS.g_signal_stop_emission_by_name (entryHandle, OS.delete_text); } else { if (newText.length () > 0) { int [] pos = new int [1]; - pos [0] = (int)/*64*/end_pos; + pos [0] = (int)end_pos; byte [] buffer = Converter.wcsToMbcs (newText, false); OS.g_signal_handlers_block_matched (entryHandle, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, CHANGED); OS.g_signal_handlers_block_matched (entryHandle, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, INSERT_TEXT); @@ -1621,14 +1621,14 @@ long gtk_focus_out_event (long widget, long event) { long gtk_insert_text (long widget, long new_text, long new_text_length, long position) { if (!hooks (SWT.Verify) && !filters (SWT.Verify)) return 0; if (new_text == 0 || new_text_length == 0) return 0; - byte [] buffer = new byte [(int)/*64*/new_text_length]; + byte [] buffer = new byte [(int)new_text_length]; C.memmove (buffer, new_text, buffer.length); String oldText = new String (Converter.mbcsToWcs (buffer)); int [] pos = new int [1]; C.memmove (pos, position, 4); long ptr = GTK.gtk_entry_get_text (entryHandle); - if (pos [0] == -1) pos [0] = (int)/*64*/OS.g_utf8_strlen (ptr, -1); - int start = (int)/*64*/OS.g_utf8_offset_to_utf16_offset (ptr, pos [0]); + if (pos [0] == -1) pos [0] = (int)OS.g_utf8_strlen (ptr, -1); + int start = (int)OS.g_utf8_offset_to_utf16_offset (ptr, pos [0]); String newText = verifyText (oldText, start, start); if (newText != oldText) { int [] newStart = new int [1], newEnd = new int [1]; @@ -2497,8 +2497,8 @@ public void setSelection (Point selection) { if ((style & SWT.READ_ONLY) != 0) return; if (entryHandle != 0) { long ptr = GTK.gtk_entry_get_text (entryHandle); - int start = (int)/*64*/OS.g_utf16_offset_to_utf8_offset (ptr, selection.x); - int end = (int)/*64*/OS.g_utf16_offset_to_utf8_offset (ptr, selection.y); + int start = (int)OS.g_utf16_offset_to_utf8_offset (ptr, selection.x); + int end = (int)OS.g_utf16_offset_to_utf8_offset (ptr, selection.y); GTK.gtk_editable_set_position (entryHandle, start); GTK.gtk_editable_select_region (entryHandle, start, end); } @@ -2548,7 +2548,7 @@ public void setText (String string) { */ if (hooks (SWT.Verify) || filters (SWT.Verify)) { long ptr = GTK.gtk_entry_get_text (entryHandle); - string = verifyText (string, 0, (int)/*64*/OS.g_utf16_strlen (ptr, -1)); + string = verifyText (string, 0, (int)OS.g_utf16_strlen (ptr, -1)); if (string == null) return; } byte [] buffer = Converter.wcsToMbcs (string, true); diff --git a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Control.java b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Control.java index 67587395de..5b2e0a4b04 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Control.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Control.java @@ -6738,7 +6738,7 @@ void updateLayout (boolean all) { @Override long windowProc (long handle, long arg0, long user_data) { - switch ((int)/*64*/user_data) { + switch ((int)user_data) { case EXPOSE_EVENT_INVERSE: { if ((state & OBSCURED) != 0) break; Control control = findBackgroundControl (); diff --git a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/DateTime.java b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/DateTime.java index b859dbee69..ba938b20c1 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/DateTime.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/DateTime.java @@ -2006,8 +2006,8 @@ Point getSelection () { int [] end = new int [1]; GTK.gtk_editable_get_selection_bounds (textEntryHandle, start, end); long ptr = GTK.gtk_entry_get_text (textEntryHandle); - start[0] = (int)/*64*/OS.g_utf8_offset_to_utf16_offset (ptr, start[0]); - end[0] = (int)/*64*/OS.g_utf8_offset_to_utf16_offset (ptr, end[0]); + start[0] = (int)OS.g_utf8_offset_to_utf16_offset (ptr, start[0]); + end[0] = (int)OS.g_utf8_offset_to_utf16_offset (ptr, end[0]); selection = new Point (start [0], end [0]); return selection; @@ -2060,8 +2060,8 @@ String getText (String str,int start, int end) { void setSelection (int start, int end) { checkWidget (); long ptr = GTK.gtk_entry_get_text (textEntryHandle); - start = (int)/*64*/OS.g_utf16_offset_to_utf8_offset (ptr, start); - end = (int)/*64*/OS.g_utf16_offset_to_utf8_offset (ptr, end); + start = (int)OS.g_utf16_offset_to_utf8_offset (ptr, start); + end = (int)OS.g_utf16_offset_to_utf8_offset (ptr, end); GTK.gtk_editable_set_position (textEntryHandle, start); GTK.gtk_editable_select_region (textEntryHandle, start, end); } diff --git a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/DirectoryDialog.java b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/DirectoryDialog.java index ec46198aec..4175660e87 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/DirectoryDialog.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/DirectoryDialog.java @@ -206,7 +206,7 @@ String openNativeChooserDialog () { long utf16Ptr = OS.g_utf8_to_utf16 (utf8Ptr, -1, null, items_written, null); OS.g_free (utf8Ptr); if (utf16Ptr != 0) { - int clength = (int)/*64*/items_written [0]; + int clength = (int)items_written [0]; char [] chars = new char [clength]; C.memmove (chars, utf16Ptr, clength * 2); OS.g_free (utf16Ptr); @@ -310,7 +310,7 @@ String openChooserDialog () { long utf16Ptr = OS.g_utf8_to_utf16 (utf8Ptr, -1, null, items_written, null); OS.g_free (utf8Ptr); if (utf16Ptr != 0) { - int clength = (int)/*64*/items_written [0]; + int clength = (int)items_written [0]; char [] chars = new char [clength]; C.memmove (chars, utf16Ptr, clength * 2); OS.g_free (utf16Ptr); diff --git a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Display.java b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Display.java index 997bffac97..abed41f598 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Display.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Display.java @@ -3635,7 +3635,7 @@ Widget getWidget (long handle) { long index = OS.g_object_get_qdata (handle, SWT_OBJECT_INDEX) - 1; if (0 <= index && index < widgetTable.length) { lastHandle = handle; - return lastWidget = widgetTable [(int)/*64*/index]; + return lastWidget = widgetTable [(int)index]; } return null; } @@ -5526,11 +5526,11 @@ public void setData (Object data) { } long setDirectionProc (long widget, long direction) { - GTK.gtk_widget_set_direction (widget, (int)/*64*/ direction); + GTK.gtk_widget_set_direction (widget, (int)direction); if (GTK.GTK_IS_MENU_ITEM (widget)) { long submenu = GTK.gtk_menu_item_get_submenu (widget); if (submenu != 0) { - GTK.gtk_widget_set_direction (submenu, (int)/*64*/ direction); + GTK.gtk_widget_set_direction (submenu, (int)direction); GTK.gtk_container_forall (submenu, setDirectionProc, direction); } } @@ -5826,7 +5826,7 @@ public void timerExec (int milliseconds, Runnable runnable) { long timerProc (long i) { if (timerList == null) return 0; - int index = (int)/*64*/i; + int index = (int)i; if (0 <= index && index < timerList.length) { Runnable runnable = timerList [index]; timerList [index] = null; @@ -6032,7 +6032,7 @@ String simple_color_parser (String output, String value, int index) { } long signalProc (long gobject, long arg1, long user_data) { - switch((int)/*64*/user_data) { + switch((int)user_data) { case STYLE_UPDATED: settingsChanged = true; break; @@ -6254,7 +6254,7 @@ long gdk_device_get_surface_at_position (int[] win_x, int[] win_y) { */ @Override protected long gsettingsProc (long gobject, long arg1, long user_data) { - switch((int)/*64*/user_data) { + switch((int)user_data) { case CHANGE_SCALEFACTOR: this.scaleFactor = getDeviceZoom (); DPIUtil.setDeviceZoom (scaleFactor); diff --git a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/ExpandItem.java b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/ExpandItem.java index 338abb7e19..00613e3ea5 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/ExpandItem.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/ExpandItem.java @@ -689,7 +689,7 @@ void showWidget (int index) { @Override long windowProc (long handle, long user_data) { - switch ((int)/*64*/user_data) { + switch ((int)user_data) { case ACTIVATE_INVERSE: { expanded = GTK.gtk_expander_get_expanded (handle); parent.layoutItems (0, false); diff --git a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/FileDialog.java b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/FileDialog.java index 5918789636..0dafa9c886 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/FileDialog.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/FileDialog.java @@ -132,7 +132,7 @@ String computeResultChooserDialog () { long utf16Ptr = OS.g_utf8_to_utf16 (utf8Ptr, -1, null, items_written, null); OS.g_free (utf8Ptr); if (utf16Ptr != 0) { - int clength = (int)/*64*/items_written [0]; + int clength = (int)items_written [0]; char [] chars = new char [clength]; C.memmove (chars, utf16Ptr, clength * 2); OS.g_free (utf16Ptr); @@ -165,7 +165,7 @@ String computeResultChooserDialog () { long utf16Ptr = OS.g_utf8_to_utf16 (utf8Ptr, -1, null, items_written, null); OS.g_free (utf8Ptr); if (utf16Ptr != 0) { - int clength = (int)/*64*/items_written [0]; + int clength = (int)items_written [0]; char [] chars = new char [clength]; C.memmove (chars, utf16Ptr, clength * 2); OS.g_free (utf16Ptr); diff --git a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/IME.java b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/IME.java index 877c82afe7..e7ff12acdf 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/IME.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/IME.java @@ -315,8 +315,8 @@ long gtk_preedit_changed (long imcontext) { int [] end = new int [1]; for (int i = 0; i < count; i++) { OS.pango_attr_iterator_range (iterator, start, end); - ranges [i * 2] = (int)/*64*/OS.g_utf16_pointer_to_offset (preeditString [0], preeditString [0] + start [0]); - ranges [i * 2 + 1] = (int)/*64*/OS.g_utf16_pointer_to_offset (preeditString [0], preeditString [0] + end [0]) - 1; + ranges [i * 2] = (int)OS.g_utf16_pointer_to_offset (preeditString [0], preeditString [0] + start [0]); + ranges [i * 2 + 1] = (int)OS.g_utf16_pointer_to_offset (preeditString [0], preeditString [0] + end [0]) - 1; styles [i] = new TextStyle (null, null, null); long attr = OS.pango_attr_iterator_get (iterator, OS.PANGO_ATTR_FOREGROUND); if (attr != 0) { diff --git a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Label.java b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Label.java index 82b52673f7..148a145f39 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Label.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Label.java @@ -719,7 +719,7 @@ long windowProc (long handle, long arg0, long user_data) { * Instead lets override windowProc() here and check for paintHandle() compatibility. * Fixes bug 481485 without re-introducing bug 483791. */ - switch ((int)/*64*/user_data) { + switch ((int)user_data) { case DRAW: { if (paintHandle() == handle) { return gtk_draw(handle, arg0); diff --git a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/ScrollBar.java b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/ScrollBar.java index ca9aede38c..abdedc58f0 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/ScrollBar.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/ScrollBar.java @@ -535,7 +535,7 @@ long gtk_button_press_event (long widget, long eventPtr) { @Override long gtk_change_value (long widget, long scroll, long value1, long value2) { - detail = (int)/*64*/scroll; + detail = (int)scroll; return 0; } diff --git a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Shell.java b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Shell.java index 5fcdea87dd..8c53662fc8 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Shell.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Shell.java @@ -1532,7 +1532,7 @@ long gtk_draw (long widget, long cairo) { @Override long gtk_focus (long widget, long directionType) { - switch ((int)/*64*/directionType) { + switch ((int)directionType) { case GTK.GTK_DIR_TAB_FORWARD: case GTK.GTK_DIR_TAB_BACKWARD: Control control = display.getFocusControl (); @@ -1617,7 +1617,7 @@ long gtk_move_focus (long widget, long directionType) { Control control = display.getFocusControl (); if (control != null) { long focusHandle = control.focusHandle (); - GTK.gtk_widget_child_focus (focusHandle, (int)/*64*/directionType); + GTK.gtk_widget_child_focus (focusHandle, (int)directionType); } OS.g_signal_stop_emission_by_name (shellHandle, OS.move_focus); return 1; diff --git a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Slider.java b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Slider.java index 3ffcb1385e..8f4f9d300d 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Slider.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Slider.java @@ -192,7 +192,7 @@ long gtk_button_press_event (long widget, long eventPtr) { @Override long gtk_change_value (long widget, long scroll, long value1, long value2) { - detail = (int)/*64*/scroll; + detail = (int)scroll; return 0; } diff --git a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Spinner.java b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Spinner.java index 95c4b705a2..9638dc8773 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Spinner.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Spinner.java @@ -677,15 +677,15 @@ long gtk_delete_text (long widget, long start_pos, long end_pos) { if (!hooks (SWT.Verify) && !filters (SWT.Verify)) return 0; long ptr = GTK.gtk_entry_get_text (GTK.GTK4 ? entryHandle : handle); if (end_pos == -1) end_pos = OS.g_utf8_strlen (ptr, -1); - int start = (int)/*64*/OS.g_utf8_offset_to_utf16_offset (ptr, start_pos); - int end = (int)/*64*/OS.g_utf8_offset_to_utf16_offset (ptr, end_pos); + int start = (int)OS.g_utf8_offset_to_utf16_offset (ptr, start_pos); + int end = (int)OS.g_utf8_offset_to_utf16_offset (ptr, end_pos); String newText = verifyText ("", start, end); if (newText == null) { OS.g_signal_stop_emission_by_name (handle, OS.delete_text); } else { if (newText.length () > 0) { int [] pos = new int [1]; - pos [0] = (int)/*64*/end_pos; + pos [0] = (int)end_pos; byte [] buffer = Converter.wcsToMbcs (newText, false); OS.g_signal_handlers_block_matched (handle, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, CHANGED); OS.g_signal_handlers_block_matched (handle, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, INSERT_TEXT); @@ -714,14 +714,14 @@ long gtk_focus_out_event (long widget, long event) { long gtk_insert_text (long widget, long new_text, long new_text_length, long position) { // if (!hooks (SWT.Verify) && !filters (SWT.Verify)) return 0; if (new_text == 0 || new_text_length == 0) return 0; - byte [] buffer = new byte [(int)/*64*/new_text_length]; + byte [] buffer = new byte [(int)new_text_length]; C.memmove (buffer, new_text, buffer.length); String oldText = new String (Converter.mbcsToWcs (buffer)); int [] pos = new int [1]; C.memmove (pos, position, 4); long ptr = GTK.gtk_entry_get_text (GTK.GTK4 ? entryHandle : handle); - if (pos [0] == -1) pos [0] = (int)/*64*/OS.g_utf8_strlen (ptr, -1); - int start = (int)/*64*/OS.g_utf16_pointer_to_offset (ptr, pos [0]); + if (pos [0] == -1) pos [0] = (int)OS.g_utf8_strlen (ptr, -1); + int start = (int)OS.g_utf16_pointer_to_offset (ptr, pos [0]); String newText = verifyText (oldText, start, start); if (newText != oldText) { int [] newStart = new int [1], newEnd = new int [1]; diff --git a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/TabFolder.java b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/TabFolder.java index 36f9c3aa28..fc20a5d2e0 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/TabFolder.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/TabFolder.java @@ -553,7 +553,7 @@ long gtk_switch_page (long widget, long page, long page_num) { } else { return 0; } - TabItem item = items [(int)/*64*/page_num]; + TabItem item = items [(int)page_num]; Control control = item.getControl (); if (control != null && !control.isDisposed ()) { control.setBoundsInPixels(getClientAreaInPixels()); diff --git a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Table.java b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Table.java index 5dae096f76..3b5da88772 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Table.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Table.java @@ -2953,7 +2953,7 @@ void rendererRender (long cell, long cr, long snapshot, long widget, long backgr if (item != null) { if (GTK.GTK_IS_CELL_RENDERER_TOGGLE (cell) || ( (GTK.GTK_IS_CELL_RENDERER_PIXBUF (cell) || GTK.GTK_VERSION > OS.VERSION(3, 13, 0)) && (columnIndex != 0 || (style & SWT.CHECK) == 0))) { - drawFlags = (int)/*64*/flags; + drawFlags = (int)flags; drawState = SWT.FOREGROUND; long [] ptr = new long [1]; GTK.gtk_tree_model_get (modelHandle, item.handle, Table.BACKGROUND_COLUMN, ptr, -1); @@ -4155,7 +4155,7 @@ void updateScrollBarValue (ScrollBar bar) { @Override long windowProc (long handle, long arg0, long user_data) { - switch ((int)/*64*/user_data) { + switch ((int)user_data) { case EXPOSE_EVENT: { /* * If this Table has any child widgets, propagate the draw signal diff --git a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Text.java b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Text.java index d3a2283d41..984095f5c9 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Text.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Text.java @@ -490,7 +490,7 @@ void applySegments () { } byte [] buffer = Converter.wcsToMbcs (separator, false); long ptr = GTK.gtk_entry_get_text (handle); - pos [0] = (int)/*64*/OS.g_utf16_offset_to_utf8_offset (ptr, pos [0]); + pos [0] = (int)OS.g_utf16_offset_to_utf8_offset (ptr, pos [0]); GTK.gtk_editable_insert_text (handle, buffer, buffer.length, pos); } OS.g_signal_handlers_unblock_matched (handle, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, CHANGED); @@ -504,7 +504,7 @@ void applySegments () { for (int i = 0; i < nSegments; i++) { GTK.gtk_text_buffer_get_bounds (bufferHandle, startIter, endIter); long ptr = GTK.gtk_text_buffer_get_text (bufferHandle, startIter, endIter, true); - GTK.gtk_text_buffer_get_iter_at_offset (bufferHandle, pos, (int)/*64*/OS.g_utf16_offset_to_utf8_offset (ptr, segments[i] + i)); + GTK.gtk_text_buffer_get_iter_at_offset (bufferHandle, pos, (int)OS.g_utf16_offset_to_utf8_offset (ptr, segments[i] + i)); OS.g_free (ptr); if (segmentsChars != null && segmentsChars.length > i) { separator [0] = segmentsChars [i]; @@ -529,8 +529,8 @@ void clearSegments (boolean applyText) { long ptr = GTK.gtk_entry_get_text (handle); int start, end; for (int i = 0; i < nSegments; i++) { - start = (int)/*64*/OS.g_utf16_offset_to_utf8_offset (ptr, segments[i]); - end = (int)/*64*/OS.g_utf16_offset_to_utf8_offset (ptr, segments[i] + 1); + start = (int)OS.g_utf16_offset_to_utf8_offset (ptr, segments[i]); + end = (int)OS.g_utf16_offset_to_utf8_offset (ptr, segments[i] + 1); GTK.gtk_editable_delete_text (handle, start, end); } OS.g_signal_handlers_unblock_matched (handle, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, DELETE_TEXT); @@ -546,8 +546,8 @@ void clearSegments (boolean applyText) { for (int i = 0; i < nSegments; i++) { GTK.gtk_text_buffer_get_bounds (bufferHandle, startIter, endIter); long ptr = GTK.gtk_text_buffer_get_text (bufferHandle, startIter, endIter, true); - GTK.gtk_text_buffer_get_iter_at_offset (bufferHandle, start, (int)/*64*/OS.g_utf16_offset_to_utf8_offset (ptr, segments[i])); - GTK.gtk_text_buffer_get_iter_at_offset (bufferHandle, end, (int)/*64*/OS.g_utf16_offset_to_utf8_offset (ptr, segments[i] + 1)); + GTK.gtk_text_buffer_get_iter_at_offset (bufferHandle, start, (int)OS.g_utf16_offset_to_utf8_offset (ptr, segments[i])); + GTK.gtk_text_buffer_get_iter_at_offset (bufferHandle, end, (int)OS.g_utf16_offset_to_utf8_offset (ptr, segments[i] + 1)); GTK.gtk_text_buffer_delete (bufferHandle, start, end); OS.g_free (ptr); } @@ -920,7 +920,7 @@ public int getCaretPosition () { int result; if ((style & SWT.SINGLE) != 0) { long ptr = GTK.gtk_entry_get_text (handle); - result = (int)/*64*/OS.g_utf8_offset_to_utf16_offset (ptr, GTK.gtk_editable_get_position (handle)); + result = (int)OS.g_utf8_offset_to_utf16_offset (ptr, GTK.gtk_editable_get_position (handle)); } else { byte [] position = new byte [ITER_SIZEOF]; long mark = GTK.gtk_text_buffer_get_insert (bufferHandle); @@ -928,7 +928,7 @@ public int getCaretPosition () { byte [] zero = new byte [ITER_SIZEOF]; GTK.gtk_text_buffer_get_iter_at_offset(bufferHandle, zero, 0); long ptr = GTK.gtk_text_buffer_get_text (bufferHandle, zero, position, true); - result = (int)/*64*/OS.g_utf8_offset_to_utf16_offset (ptr, GTK.gtk_text_iter_get_offset (position)); + result = (int)OS.g_utf8_offset_to_utf16_offset (ptr, GTK.gtk_text_iter_get_offset (position)); OS.g_free (ptr); } return untranslateOffset (result); @@ -949,13 +949,13 @@ public int getCharCount () { int result; if ((style & SWT.SINGLE) != 0) { long ptr = GTK.gtk_entry_get_text (handle); - result = (int)/*64*/OS.g_utf16_strlen (ptr, -1); + result = (int)OS.g_utf16_strlen (ptr, -1); } else { byte [] startIter = new byte [ITER_SIZEOF]; byte [] endIter = new byte [ITER_SIZEOF]; GTK.gtk_text_buffer_get_bounds (bufferHandle, startIter, endIter); long ptr = GTK.gtk_text_buffer_get_text (bufferHandle, startIter, endIter, true); - result = (int)/*64*/OS.g_utf16_strlen(ptr, -1); + result = (int)OS.g_utf16_strlen(ptr, -1); OS.g_free (ptr); } return untranslateOffset (result); @@ -1123,14 +1123,14 @@ public int getOrientation () { long layout = GTK.gtk_entry_get_layout (handle); OS.pango_layout_xy_to_index (layout, point.x * OS.PANGO_SCALE, point.y * OS.PANGO_SCALE, index, trailing); long ptr = OS.pango_layout_get_text (layout); - position = (int)/*64*/OS.g_utf16_pointer_to_offset (ptr, ptr + index[0]) + trailing[0]; + position = (int)OS.g_utf16_pointer_to_offset (ptr, ptr + index[0]) + trailing[0]; } else { byte [] p = new byte [ITER_SIZEOF]; GTK.gtk_text_view_get_iter_at_location (handle, p, point.x, point.y); byte [] zero = new byte [ITER_SIZEOF]; GTK.gtk_text_buffer_get_iter_at_offset(bufferHandle, zero, 0); long ptr = GTK.gtk_text_buffer_get_text (bufferHandle, zero, p, true); - position = (int)/*64*/OS.g_utf8_offset_to_utf16_offset (ptr, GTK.gtk_text_iter_get_offset (p)); + position = (int)OS.g_utf8_offset_to_utf16_offset (ptr, GTK.gtk_text_iter_get_offset (p)); OS.g_free (ptr); } return untranslateOffset (position); @@ -1162,8 +1162,8 @@ public Point getSelection () { int [] end = new int [1]; GTK.gtk_editable_get_selection_bounds (handle, start, end); long ptr = GTK.gtk_entry_get_text (handle); - start[0] = (int)/*64*/OS.g_utf8_offset_to_utf16_offset (ptr, start[0]); - end[0] = (int)/*64*/OS.g_utf8_offset_to_utf16_offset (ptr, end[0]); + start[0] = (int)OS.g_utf8_offset_to_utf16_offset (ptr, start[0]); + end[0] = (int)OS.g_utf8_offset_to_utf16_offset (ptr, end[0]); selection = new Point (start [0], end [0]); } else { byte [] startIter = new byte [ITER_SIZEOF]; @@ -1172,8 +1172,8 @@ public Point getSelection () { byte [] zero = new byte [ITER_SIZEOF]; GTK.gtk_text_buffer_get_iter_at_offset(bufferHandle, zero, 0); long ptr = GTK.gtk_text_buffer_get_text (bufferHandle, zero, endIter, true); - int start = (int)/*64*/OS.g_utf8_offset_to_utf16_offset (ptr, GTK.gtk_text_iter_get_offset (startIter)); - int end = (int)/*64*/OS.g_utf8_offset_to_utf16_offset (ptr, GTK.gtk_text_iter_get_offset (endIter)); + int start = (int)OS.g_utf8_offset_to_utf16_offset (ptr, GTK.gtk_text_iter_get_offset (startIter)); + int end = (int)OS.g_utf8_offset_to_utf16_offset (ptr, GTK.gtk_text_iter_get_offset (endIter)); OS.g_free (ptr); selection = new Point (start, end); } @@ -1566,8 +1566,8 @@ long gtk_delete_range (long widget, long iter1, long iter2) { byte [] zero = new byte [ITER_SIZEOF]; GTK.gtk_text_buffer_get_iter_at_offset(bufferHandle, zero, 0); long ptr = GTK.gtk_text_buffer_get_text (bufferHandle, zero, endIter, true); - start = (int)/*64*/OS.g_utf8_offset_to_utf16_offset (ptr, start); - end = (int)/*64*/OS.g_utf8_offset_to_utf16_offset (ptr, end); + start = (int)OS.g_utf8_offset_to_utf16_offset (ptr, start); + end = (int)OS.g_utf8_offset_to_utf16_offset (ptr, end); OS.g_free (ptr); String newText = verifyText ("", start, end); if (newText == null) { @@ -1603,8 +1603,8 @@ long gtk_delete_text (long widget, long start_pos, long end_pos) { if (!hooks (SWT.Verify) && !filters (SWT.Verify)) return 0; long ptr = GTK.gtk_entry_get_text (handle); if (end_pos == -1) end_pos = OS.g_utf8_strlen (ptr, -1); - int start = (int)/*64*/OS.g_utf8_offset_to_utf16_offset (ptr, start_pos); - int end = (int)/*64*/OS.g_utf8_offset_to_utf16_offset (ptr, end_pos); + int start = (int)OS.g_utf8_offset_to_utf16_offset (ptr, start_pos); + int end = (int)OS.g_utf8_offset_to_utf16_offset (ptr, end_pos); String newText = verifyText ("", start, end); if (newText == null) { /* Remember the selection when the text was deleted */ @@ -1618,7 +1618,7 @@ long gtk_delete_text (long widget, long start_pos, long end_pos) { } else { if (newText.length () > 0) { int [] pos = new int [1]; - pos [0] = (int)/*64*/end_pos; + pos [0] = (int)end_pos; byte [] buffer = Converter.wcsToMbcs (newText, false); OS.g_signal_handlers_block_matched (handle, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, CHANGED); OS.g_signal_handlers_block_matched (handle, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, INSERT_TEXT); @@ -1716,13 +1716,13 @@ long gtk_icon_release (long widget, long icon_pos, long event) { long gtk_insert_text (long widget, long new_text, long new_text_length, long position) { if (!hooks (SWT.Verify) && !filters (SWT.Verify)) return 0; if (new_text == 0 || new_text_length == 0) return 0; - byte [] buffer = new byte [(int)/*64*/new_text_length]; + byte [] buffer = new byte [(int)new_text_length]; C.memmove (buffer, new_text, buffer.length); String oldText = new String (Converter.mbcsToWcs (buffer)); int [] pos = new int [1]; C.memmove (pos, position, 4); long ptr = GTK.gtk_entry_get_text (handle); - if (pos [0] == -1) pos [0] = (int)/*64*/OS.g_utf8_strlen (ptr, -1); + if (pos [0] == -1) pos [0] = (int)OS.g_utf8_strlen (ptr, -1); /* Use the selection when the text was deleted */ int start = pos [0], end = pos [0]; if (fixStart != -1 && fixEnd != -1) { @@ -1730,8 +1730,8 @@ long gtk_insert_text (long widget, long new_text, long new_text_length, long pos end = fixEnd; fixStart = fixEnd = -1; } - start = (int)/*64*/OS.g_utf8_offset_to_utf16_offset (ptr, start); - end = (int)/*64*/OS.g_utf8_offset_to_utf16_offset (ptr, end); + start = (int)OS.g_utf8_offset_to_utf16_offset (ptr, start); + end = (int)OS.g_utf8_offset_to_utf16_offset (ptr, end); String newText = verifyText (oldText, start, end); if (newText != oldText && handle != 0) { int [] newStart = new int [1], newEnd = new int [1]; @@ -1771,7 +1771,7 @@ long gtk_key_press_event (long widget, long event) { if (GTK.GTK4) { long [] eventString = new long [1]; GDK.gdk_event_get_string(event, eventString); - length = (int)/*64*/OS.g_utf16_strlen (eventString[0], -1); + length = (int)OS.g_utf16_strlen (eventString[0], -1); } else { GdkEventKey gdkEvent = new GdkEventKey (); OS.memmove(gdkEvent, event, GdkEventKey.sizeof); @@ -1819,10 +1819,10 @@ long gtk_text_buffer_insert_text (long widget, long iter, long text, long length byte [] zero = new byte [ITER_SIZEOF]; GTK.gtk_text_buffer_get_iter_at_offset(bufferHandle, zero, 0); long ptr = GTK.gtk_text_buffer_get_text (bufferHandle, zero, position, true); - start = (int)/*64*/OS.g_utf8_offset_to_utf16_offset (ptr, start); - end = (int)/*64*/OS.g_utf8_offset_to_utf16_offset (ptr, end); + start = (int)OS.g_utf8_offset_to_utf16_offset (ptr, start); + end = (int)OS.g_utf8_offset_to_utf16_offset (ptr, end); OS.g_free(ptr); - byte [] buffer = new byte [(int)/*64*/length]; + byte [] buffer = new byte [(int)length]; C.memmove (buffer, text, buffer.length); String oldText = new String (Converter.mbcsToWcs (buffer)); String newText = verifyText (oldText, start, end); @@ -1913,7 +1913,7 @@ private boolean insideBlockSelection (int x, int y) { long layout = GTK.gtk_entry_get_layout (handle); OS.pango_layout_xy_to_index (layout, x * OS.PANGO_SCALE, y * OS.PANGO_SCALE, index, trailing); long ptr = OS.pango_layout_get_text (layout); - position = (int)/*64*/OS.g_utf8_pointer_to_offset (ptr, ptr + index[0]) + trailing[0]; + position = (int)OS.g_utf8_pointer_to_offset (ptr, ptr + index[0]) + trailing[0]; } else { byte [] p = new byte [ITER_SIZEOF]; GTK.gtk_text_view_get_iter_at_location (handle, p, x, y); @@ -2482,14 +2482,14 @@ public void setSelection (int start) { start = translateOffset (start); if ((style & SWT.SINGLE) != 0) { long ptr = GTK.gtk_entry_get_text (handle); - start = (int)/*64*/OS.g_utf16_offset_to_utf8_offset (ptr, start); + start = (int)OS.g_utf16_offset_to_utf8_offset (ptr, start); GTK.gtk_editable_set_position (handle, start); } else { byte [] startIter = new byte [ITER_SIZEOF]; byte [] endIter = new byte [ITER_SIZEOF]; GTK.gtk_text_buffer_get_bounds (bufferHandle, startIter, endIter); long ptr = GTK.gtk_text_buffer_get_text (bufferHandle, startIter, endIter, true); - start = (int)/*64*/OS.g_utf16_offset_to_utf8_offset (ptr, start); + start = (int)OS.g_utf16_offset_to_utf8_offset (ptr, start); OS.g_free (ptr); GTK.gtk_text_buffer_get_iter_at_offset (bufferHandle, startIter, start); GTK.gtk_text_buffer_place_cursor (bufferHandle, startIter); @@ -2528,8 +2528,8 @@ public void setSelection (int start, int end) { end = translateOffset (end); if ((style & SWT.SINGLE) != 0) { long ptr = GTK.gtk_entry_get_text (handle); - start = (int)/*64*/OS.g_utf16_offset_to_utf8_offset (ptr, start); - end = (int)/*64*/OS.g_utf16_offset_to_utf8_offset (ptr, end); + start = (int)OS.g_utf16_offset_to_utf8_offset (ptr, start); + end = (int)OS.g_utf16_offset_to_utf8_offset (ptr, end); GTK.gtk_editable_set_position (handle, start); GTK.gtk_editable_select_region (handle, start, end); } else { @@ -2537,8 +2537,8 @@ public void setSelection (int start, int end) { byte [] endIter = new byte [ITER_SIZEOF]; GTK.gtk_text_buffer_get_bounds (bufferHandle, startIter, endIter); long ptr = GTK.gtk_text_buffer_get_text (bufferHandle, startIter, endIter, true); - start = (int)/*64*/OS.g_utf16_offset_to_utf8_offset (ptr, start); - end = (int)/*64*/OS.g_utf16_offset_to_utf8_offset (ptr, end); + start = (int)OS.g_utf16_offset_to_utf8_offset (ptr, start); + end = (int)OS.g_utf16_offset_to_utf8_offset (ptr, end); OS.g_free (ptr); GTK.gtk_text_buffer_get_iter_at_offset (bufferHandle, startIter, start); GTK.gtk_text_buffer_get_iter_at_offset (bufferHandle, endIter, end); @@ -2901,7 +2901,7 @@ String verifyText (String string, int start, int end) { @Override long windowProc (long handle, long user_data) { if (hooks (SWT.Segments) || filters (SWT.Segments) || segments != null) { - switch ((int)/*64*/user_data) { + switch ((int)user_data) { case BACKSPACE: case COPY_CLIPBOARD: case CUT_CLIPBOARD: @@ -2924,7 +2924,7 @@ long windowProc (long handle, long user_data) { @Override long windowProc (long handle, long arg0, long user_data) { if (hooks (SWT.Segments) || filters (SWT.Segments) || segments != null) { - switch ((int)/*64*/user_data) { + switch ((int)user_data) { case DIRECTION_CHANGED: { clearSegments (true); applySegments (); @@ -2938,7 +2938,7 @@ long windowProc (long handle, long arg0, long user_data) { @Override long windowProc (long handle, long arg0, long arg1, long user_data) { if (hooks (SWT.Segments) || filters (SWT.Segments) || segments != null) { - switch ((int)/*64*/user_data) { + switch ((int)user_data) { case DELETE_FROM_CURSOR: { clearSegments (true); break; @@ -2955,7 +2955,7 @@ long windowProc (long handle, long arg0, long arg1, long user_data) { @Override long windowProc (long handle, long arg0, long arg1, long arg2, long user_data) { if (hooks (SWT.Segments) || filters (SWT.Segments) || segments != null) { - switch ((int)/*64*/user_data) { + switch ((int)user_data) { case MOVE_CURSOR: { if (arg0 == GTK.GTK_MOVEMENT_VISUAL_POSITIONS) { clearSegments (true); diff --git a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Tree.java b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Tree.java index 76a1d5810d..1aeafeecb0 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Tree.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Tree.java @@ -3049,7 +3049,7 @@ void rendererRender (long cell, long cr, long snapshot, long widget, long backgr if (item != null) { if (GTK.GTK_IS_CELL_RENDERER_TOGGLE (cell) || ( (GTK.GTK_IS_CELL_RENDERER_PIXBUF (cell) || GTK.GTK_VERSION > OS.VERSION(3, 13, 0)) && (columnIndex != 0 || (style & SWT.CHECK) == 0))) { - drawFlags = (int)/*64*/flags; + drawFlags = (int)flags; drawState = SWT.FOREGROUND; long [] ptr = new long [1]; GTK.gtk_tree_model_get (modelHandle, item.handle, Tree.BACKGROUND_COLUMN, ptr, -1); @@ -4119,7 +4119,7 @@ void updateScrollBarValue (ScrollBar bar) { @Override long windowProc (long handle, long arg0, long user_data) { - switch ((int)/*64*/user_data) { + switch ((int)user_data) { case EXPOSE_EVENT: { /* * If this Tree has any child widgets, propagate the draw signal diff --git a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Widget.java b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Widget.java index 330efeeef3..280f4b1ebf 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Widget.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Widget.java @@ -1435,7 +1435,7 @@ boolean sendKeyEvent (int type, long event) { long [] eventString = new long [1]; GDK.gdk_event_get_string(event, eventString); string = eventString[0]; - length = (int)/*64*/OS.g_utf16_strlen (string, -1); + length = (int)OS.g_utf16_strlen (string, -1); } else { GdkEventKey gdkEvent = new GdkEventKey (); OS.memmove(gdkEvent, event, GdkEventKey.sizeof); @@ -1724,7 +1724,7 @@ boolean setKeyState (Event javaEvent, long event) { long [] eventString = new long [1]; GDK.gdk_event_get_string(event, eventString); string = eventString[0]; - length = (int)/*64*/OS.g_utf16_strlen (string, -1); + length = (int)OS.g_utf16_strlen (string, -1); int [] eventGroup = new int [1]; GDK.gdk_event_get_key_group(event, eventGroup); group = eventGroup[0]; @@ -2096,7 +2096,7 @@ boolean translateTraversal (int event) { long enterMotionScrollProc (long handle, double x, double y, long user_data) { long event = GTK.gtk_get_current_event(); long result = 0; - switch ((int)/*64*/user_data) { + switch ((int)user_data) { case ENTER: result = gtk_enter_notify_event(handle, event); break; @@ -2117,7 +2117,7 @@ long enterMotionScrollProc (long handle, double x, double y, long user_data) { long focusProc (long handle, long user_data) { long event = GTK.gtk_get_current_event(); long result = 0; - switch ((int)/*64*/user_data) { + switch ((int)user_data) { case FOCUS_IN: result = gtk_focus_in_event(handle, event); break; @@ -2132,7 +2132,7 @@ long focusProc (long handle, long user_data) { long keyPressReleaseProc (long handle, int keyval, int keycode, int state, long user_data) { long event = GTK.gtk_get_current_event(); long result = 0; - switch ((int)/*64*/user_data) { + switch ((int)user_data) { case KEY_PRESSED: result = gtk_key_press_event(handle, event); break; @@ -2147,7 +2147,7 @@ long keyPressReleaseProc (long handle, int keyval, int keycode, int state, long long getsurePressReleaseProc (long gesture, int n_press, double x, double y, long user_data) { long event = GTK.gtk_get_current_event(); long result = 0; - switch ((int)/*64*/user_data) { + switch ((int)user_data) { case GESTURE_PRESSED: result = gtk_gesture_press_event(gesture, n_press, x, y, event); break; @@ -2162,7 +2162,7 @@ long getsurePressReleaseProc (long gesture, int n_press, double x, double y, lon long leaveProc (long handle, long user_data) { long event = GTK.gtk_get_current_event(); long result = 0; - switch ((int)/*64*/user_data) { + switch ((int)user_data) { case LEAVE: result = gtk_leave_notify_event(handle, event); break; @@ -2176,7 +2176,7 @@ long notifyStateProc (long gdk_handle, long handle) { } long windowProc (long handle, long user_data) { - switch ((int)/*64*/user_data) { + switch ((int)user_data) { case ACTIVATE: return gtk_activate (handle); case CHANGED: return gtk_changed (handle); case CLICKED: return gtk_clicked (handle); @@ -2205,7 +2205,7 @@ long windowProc (long handle, long user_data) { } long windowProc (long handle, long arg0, long user_data) { - switch ((int)/*64*/user_data) { + switch ((int)user_data) { case EXPOSE_EVENT_INVERSE: { if (GTK.GTK_IS_CONTAINER (handle)) { return gtk_draw (handle, arg0); @@ -2255,7 +2255,7 @@ long windowProc (long handle, long arg0, long user_data) { } long windowProc (long handle, long arg0, long arg1, long user_data) { - switch ((int)/*64*/user_data) { + switch ((int)user_data) { case DELETE_RANGE: return gtk_delete_range (handle, arg0, arg1); case DELETE_TEXT: return gtk_delete_text (handle, arg0, arg1); case ICON_RELEASE: return gtk_icon_release (handle, arg0, arg1); @@ -2272,7 +2272,7 @@ long windowProc (long handle, long arg0, long arg1, long user_data) { } long windowProc (long handle, long arg0, long arg1, long arg2, long user_data) { - switch ((int)/*64*/user_data) { + switch ((int)user_data) { case CHANGE_VALUE: return gtk_change_value (handle, arg0, arg1, arg2); case EXPAND_COLLAPSE_CURSOR_ROW: return gtk_expand_collapse_cursor_row (handle, arg0, arg1, arg2); case INSERT_TEXT: return gtk_insert_text (handle, arg0, arg1, arg2); @@ -2282,7 +2282,7 @@ long windowProc (long handle, long arg0, long arg1, long arg2, long user_data) { } long windowProc (long handle, long arg0, long arg1, long arg2, long arg3, long user_data) { - switch ((int)/*64*/user_data) { + switch ((int)user_data) { case POPPED_UP: return gtk_menu_popped_up (handle, arg0, arg1, arg2, arg3); default: return 0; } |