279884 - implement Mac portion of gesture support, and add stubs for all other platforms.

19 files changed, 1476 insertions, 1341 deletions

diff --git a/bundles/org.eclipse.swt/.settings/.api_filters b/bundles/org.eclipse.swt/.settings/.api_filters
index 978df4827d..8912af17ba 100644
--- a/bundles/org.eclipse.swt/.settings/.api_filters
+++ b/bundles/org.eclipse.swt/.settings/.api_filters
@@ -1,1326 +1,729 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <component id="org.eclipse.swt" version="2">
-<resource path="Eclipse SWT Accessibility/common/org/eclipse/swt/accessibility/AccessibleActionListener.java" type="org.eclipse.swt.accessibility.AccessibleActionListener">
-<filter id="576720909">
-<message_arguments>
-<message_argument value="SWTEventListener"/>
-<message_argument value="AccessibleActionListener"/>
-</message_arguments>
-</filter>
-</resource>
-<resource path="Eclipse SWT Accessibility/common/org/eclipse/swt/accessibility/AccessibleAttributeListener.java" type="org.eclipse.swt.accessibility.AccessibleAttributeListener">
-<filter id="576720909">
-<message_arguments>
-<message_argument value="SWTEventListener"/>
-<message_argument value="AccessibleAttributeListener"/>
-</message_arguments>
-</filter>
-</resource>
-<resource path="Eclipse SWT Accessibility/common/org/eclipse/swt/accessibility/AccessibleControlListener.java" type="org.eclipse.swt.accessibility.AccessibleControlListener">
-<filter id="576720909">
-<message_arguments>
-<message_argument value="SWTEventListener"/>
-<message_argument value="AccessibleControlListener"/>
-</message_arguments>
-</filter>
-</resource>
-<resource path="Eclipse SWT Accessibility/common/org/eclipse/swt/accessibility/AccessibleEditableTextListener.java" type="org.eclipse.swt.accessibility.AccessibleEditableTextListener">
-<filter id="576720909">
-<message_arguments>
-<message_argument value="SWTEventListener"/>
-<message_argument value="AccessibleEditableTextListener"/>
-</message_arguments>
-</filter>
-</resource>
-<resource path="Eclipse SWT Accessibility/common/org/eclipse/swt/accessibility/AccessibleHyperlinkListener.java" type="org.eclipse.swt.accessibility.AccessibleHyperlinkListener">
-<filter id="576720909">
-<message_arguments>
-<message_argument value="SWTEventListener"/>
-<message_argument value="AccessibleHyperlinkListener"/>
-</message_arguments>
-</filter>
-</resource>
-<resource path="Eclipse SWT Accessibility/common/org/eclipse/swt/accessibility/AccessibleListener.java" type="org.eclipse.swt.accessibility.AccessibleListener">
-<filter id="576720909">
-<message_arguments>
-<message_argument value="SWTEventListener"/>
-<message_argument value="AccessibleListener"/>
-</message_arguments>
-</filter>
-</resource>
-<resource path="Eclipse SWT Accessibility/common/org/eclipse/swt/accessibility/AccessibleTableCellListener.java" type="org.eclipse.swt.accessibility.AccessibleTableCellListener">
-<filter id="576720909">
-<message_arguments>
-<message_argument value="SWTEventListener"/>
-<message_argument value="AccessibleTableCellListener"/>
-</message_arguments>
-</filter>
-</resource>
-<resource path="Eclipse SWT Accessibility/common/org/eclipse/swt/accessibility/AccessibleTableListener.java" type="org.eclipse.swt.accessibility.AccessibleTableListener">
-<filter id="576720909">
-<message_arguments>
-<message_argument value="SWTEventListener"/>
-<message_argument value="AccessibleTableListener"/>
-</message_arguments>
-</filter>
-</resource>
-<resource path="Eclipse SWT Accessibility/common/org/eclipse/swt/accessibility/AccessibleTextExtendedListener.java" type="org.eclipse.swt.accessibility.AccessibleTextExtendedListener">
-<filter id="576720909">
-<message_arguments>
-<message_argument value="SWTEventListener"/>
-<message_argument value="AccessibleTextExtendedListener"/>
-</message_arguments>
-</filter>
-</resource>
-<resource path="Eclipse SWT Accessibility/common/org/eclipse/swt/accessibility/AccessibleTextListener.java" type="org.eclipse.swt.accessibility.AccessibleTextListener">
-<filter id="576720909">
-<message_arguments>
-<message_argument value="SWTEventListener"/>
-<message_argument value="AccessibleTextListener"/>
-</message_arguments>
-</filter>
-</resource>
-<resource path="Eclipse SWT Accessibility/common/org/eclipse/swt/accessibility/AccessibleValueListener.java" type="org.eclipse.swt.accessibility.AccessibleValueListener">
-<filter id="576720909">
-<message_arguments>
-<message_argument value="SWTEventListener"/>
-<message_argument value="AccessibleValueListener"/>
-</message_arguments>
-</filter>
-</resource>
-<resource path="Eclipse SWT Accessibility/win32/org/eclipse/swt/accessibility/Accessible.java" type="org.eclipse.swt.accessibility.Accessible">
-<filter id="338944126">
-<message_arguments>
-<message_argument value="org.eclipse.swt.accessibility.Accessible"/>
-<message_argument value="internal_WM_GETOBJECT(int, int)"/>
-</message_arguments>
-</filter>
-<filter id="338944126">
-<message_arguments>
-<message_argument value="org.eclipse.swt.accessibility.Accessible"/>
-<message_argument value="internal_dispose_Accessible()"/>
-</message_arguments>
-</filter>
-<filter id="338944126">
-<message_arguments>
-<message_argument value="org.eclipse.swt.accessibility.Accessible"/>
-<message_argument value="internal_new_Accessible(Control)"/>
-</message_arguments>
-</filter>
-</resource>
-<resource path="Eclipse SWT Browser/common/org/eclipse/swt/browser/AuthenticationListener.java" type="org.eclipse.swt.browser.AuthenticationListener">
-<filter id="576720909">
-<message_arguments>
-<message_argument value="SWTEventListener"/>
-<message_argument value="AuthenticationListener"/>
-</message_arguments>
-</filter>
-</resource>
-<resource path="Eclipse SWT Browser/common/org/eclipse/swt/browser/Browser.java" type="org.eclipse.swt.browser.Browser">
-<filter id="336744520">
-<message_arguments>
-<message_argument value="org.eclipse.swt.browser.Browser"/>
-</message_arguments>
-</filter>
-</resource>
-<resource path="Eclipse SWT Browser/common/org/eclipse/swt/browser/CloseWindowListener.java" type="org.eclipse.swt.browser.CloseWindowListener">
-<filter id="576720909">
-<message_arguments>
-<message_argument value="SWTEventListener"/>
-<message_argument value="CloseWindowListener"/>
-</message_arguments>
-</filter>
-</resource>
-<resource path="Eclipse SWT Browser/common/org/eclipse/swt/browser/LocationListener.java" type="org.eclipse.swt.browser.LocationListener">
-<filter id="576720909">
-<message_arguments>
-<message_argument value="SWTEventListener"/>
-<message_argument value="LocationListener"/>
-</message_arguments>
-</filter>
-</resource>
-<resource path="Eclipse SWT Browser/common/org/eclipse/swt/browser/OpenWindowListener.java" type="org.eclipse.swt.browser.OpenWindowListener">
-<filter id="576720909">
-<message_arguments>
-<message_argument value="SWTEventListener"/>
-<message_argument value="OpenWindowListener"/>
-</message_arguments>
-</filter>
-</resource>
-<resource path="Eclipse SWT Browser/common/org/eclipse/swt/browser/ProgressListener.java" type="org.eclipse.swt.browser.ProgressListener">
-<filter id="576720909">
-<message_arguments>
-<message_argument value="SWTEventListener"/>
-<message_argument value="ProgressListener"/>
-</message_arguments>
-</filter>
-</resource>
-<resource path="Eclipse SWT Browser/common/org/eclipse/swt/browser/StatusTextListener.java" type="org.eclipse.swt.browser.StatusTextListener">
-<filter id="576720909">
-<message_arguments>
-<message_argument value="SWTEventListener"/>
-<message_argument value="StatusTextListener"/>
-</message_arguments>
-</filter>
-</resource>
-<resource path="Eclipse SWT Browser/common/org/eclipse/swt/browser/TitleListener.java" type="org.eclipse.swt.browser.TitleListener">
-<filter id="576720909">
-<message_arguments>
-<message_argument value="SWTEventListener"/>
-<message_argument value="TitleListener"/>
-</message_arguments>
-</filter>
-</resource>
-<resource path="Eclipse SWT Browser/common/org/eclipse/swt/browser/VisibilityWindowListener.java" type="org.eclipse.swt.browser.VisibilityWindowListener">
-<filter id="576720909">
-<message_arguments>
-<message_argument value="SWTEventListener"/>
-<message_argument value="VisibilityWindowListener"/>
-</message_arguments>
-</filter>
-</resource>
-<resource path="Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/BidiSegmentListener.java" type="org.eclipse.swt.custom.BidiSegmentListener">
-<filter id="576720909">
-<message_arguments>
-<message_argument value="SWTEventListener"/>
-<message_argument value="BidiSegmentListener"/>
-</message_arguments>
-</filter>
-</resource>
-<resource path="Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/CBanner.java" type="org.eclipse.swt.custom.CBanner">
-<filter id="336744520">
-<message_arguments>
-<message_argument value="org.eclipse.swt.custom.CBanner"/>
-</message_arguments>
-</filter>
-</resource>
-<resource path="Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/CLabel.java" type="org.eclipse.swt.custom.CLabel">
-<filter id="336744520">
-<message_arguments>
-<message_argument value="org.eclipse.swt.custom.CLabel"/>
-</message_arguments>
-</filter>
-</resource>
-<resource path="Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/CTabFolder.java" type="org.eclipse.swt.custom.CTabFolder">
-<filter id="336744520">
-<message_arguments>
-<message_argument value="org.eclipse.swt.custom.CTabFolder"/>
-</message_arguments>
-</filter>
-</resource>
-<resource path="Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/CTabFolder2Listener.java" type="org.eclipse.swt.custom.CTabFolder2Listener">
-<filter id="576720909">
-<message_arguments>
-<message_argument value="SWTEventListener"/>
-<message_argument value="CTabFolder2Listener"/>
-</message_arguments>
-</filter>
-</resource>
-<resource path="Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/CTabFolderListener.java" type="org.eclipse.swt.custom.CTabFolderListener">
-<filter id="576720909">
-<message_arguments>
-<message_argument value="SWTEventListener"/>
-<message_argument value="CTabFolderListener"/>
-</message_arguments>
-</filter>
-</resource>
-<resource path="Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/CTabItem.java" type="org.eclipse.swt.custom.CTabItem">
-<filter id="336744520">
-<message_arguments>
-<message_argument value="org.eclipse.swt.custom.CTabItem"/>
-</message_arguments>
-</filter>
-</resource>
-<resource path="Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/CaretListener.java" type="org.eclipse.swt.custom.CaretListener">
-<filter id="576720909">
-<message_arguments>
-<message_argument value="SWTEventListener"/>
-<message_argument value="CaretListener"/>
-</message_arguments>
-</filter>
-</resource>
-<resource path="Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/ExtendedModifyListener.java" type="org.eclipse.swt.custom.ExtendedModifyListener">
-<filter id="576720909">
-<message_arguments>
-<message_argument value="SWTEventListener"/>
-<message_argument value="ExtendedModifyListener"/>
-</message_arguments>
-</filter>
-</resource>
-<resource path="Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/LineBackgroundListener.java" type="org.eclipse.swt.custom.LineBackgroundListener">
-<filter id="576720909">
-<message_arguments>
-<message_argument value="SWTEventListener"/>
-<message_argument value="LineBackgroundListener"/>
-</message_arguments>
-</filter>
-</resource>
-<resource path="Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/LineStyleListener.java" type="org.eclipse.swt.custom.LineStyleListener">
-<filter id="576720909">
-<message_arguments>
-<message_argument value="SWTEventListener"/>
-<message_argument value="LineStyleListener"/>
-</message_arguments>
-</filter>
-</resource>
-<resource path="Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/MovementListener.java" type="org.eclipse.swt.custom.MovementListener">
-<filter id="576720909">
-<message_arguments>
-<message_argument value="SWTEventListener"/>
-<message_argument value="MovementListener"/>
-</message_arguments>
-</filter>
-</resource>
-<resource path="Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/PaintObjectListener.java" type="org.eclipse.swt.custom.PaintObjectListener">
-<filter id="576720909">
-<message_arguments>
-<message_argument value="SWTEventListener"/>
-<message_argument value="PaintObjectListener"/>
-</message_arguments>
-</filter>
-</resource>
-<resource path="Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/StyleRange.java" type="org.eclipse.swt.custom.StyleRange">
-<filter id="576725006">
-<message_arguments>
-<message_argument value="CloneableCompatibility"/>
-<message_argument value="StyleRange"/>
-</message_arguments>
-</filter>
-</resource>
-<resource path="Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/StyledText.java" type="org.eclipse.swt.custom.StyledText">
-<filter id="336744520">
-<message_arguments>
-<message_argument value="org.eclipse.swt.custom.StyledText"/>
-</message_arguments>
-</filter>
-</resource>
-<resource path="Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/TextChangeListener.java" type="org.eclipse.swt.custom.TextChangeListener">
-<filter id="576720909">
-<message_arguments>
-<message_argument value="SWTEventListener"/>
-<message_argument value="TextChangeListener"/>
-</message_arguments>
-</filter>
-</resource>
-<resource path="Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/VerifyKeyListener.java" type="org.eclipse.swt.custom.VerifyKeyListener">
-<filter id="576720909">
-<message_arguments>
-<message_argument value="SWTEventListener"/>
-<message_argument value="VerifyKeyListener"/>
-</message_arguments>
-</filter>
-</resource>
-<resource path="Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/ViewForm.java" type="org.eclipse.swt.custom.ViewForm">
-<filter id="336744520">
-<message_arguments>
-<message_argument value="org.eclipse.swt.custom.ViewForm"/>
-</message_arguments>
-</filter>
-</resource>
-<resource path="Eclipse SWT Drag and Drop/common/org/eclipse/swt/dnd/DragSourceListener.java" type="org.eclipse.swt.dnd.DragSourceListener">
-<filter id="576720909">
-<message_arguments>
-<message_argument value="SWTEventListener"/>
-<message_argument value="DragSourceListener"/>
-</message_arguments>
-</filter>
-</resource>
-<resource path="Eclipse SWT Drag and Drop/common/org/eclipse/swt/dnd/DropTargetListener.java" type="org.eclipse.swt.dnd.DropTargetListener">
-<filter id="576720909">
-<message_arguments>
-<message_argument value="SWTEventListener"/>
-<message_argument value="DropTargetListener"/>
-</message_arguments>
-</filter>
-</resource>
-<resource path="Eclipse SWT Drag and Drop/win32/org/eclipse/swt/dnd/Clipboard.java" type="org.eclipse.swt.dnd.Clipboard">
-<filter id="336744520">
-<message_arguments>
-<message_argument value="org.eclipse.swt.dnd.Clipboard"/>
-</message_arguments>
-</filter>
-</resource>
-<resource path="Eclipse SWT Drag and Drop/win32/org/eclipse/swt/dnd/DragSource.java" type="org.eclipse.swt.dnd.DragSource">
-<filter id="336744520">
-<message_arguments>
-<message_argument value="org.eclipse.swt.dnd.DragSource"/>
-</message_arguments>
-</filter>
-</resource>
-<resource path="Eclipse SWT Drag and Drop/win32/org/eclipse/swt/dnd/DropTarget.java" type="org.eclipse.swt.dnd.DropTarget">
-<filter id="336744520">
-<message_arguments>
-<message_argument value="org.eclipse.swt.dnd.DropTarget"/>
-</message_arguments>
-</filter>
-</resource>
-<resource path="Eclipse SWT Drag and Drop/win32/org/eclipse/swt/dnd/TransferData.java" type="org.eclipse.swt.dnd.TransferData">
-<filter id="338940029">
-<message_arguments>
-<message_argument value="org.eclipse.swt.dnd.TransferData"/>
-<message_argument value="formatetc"/>
-</message_arguments>
-</filter>
-<filter id="338940029">
-<message_arguments>
-<message_argument value="org.eclipse.swt.dnd.TransferData"/>
-<message_argument value="pIDataObject"/>
-</message_arguments>
-</filter>
-<filter id="338940029">
-<message_arguments>
-<message_argument value="org.eclipse.swt.dnd.TransferData"/>
-<message_argument value="result"/>
-</message_arguments>
-</filter>
-<filter id="338940029">
-<message_arguments>
-<message_argument value="org.eclipse.swt.dnd.TransferData"/>
-<message_argument value="stgmedium"/>
-</message_arguments>
-</filter>
-<filter id="338940029">
-<message_arguments>
-<message_argument value="org.eclipse.swt.dnd.TransferData"/>
-<message_argument value="type"/>
-</message_arguments>
-</filter>
-</resource>
-<resource path="Eclipse SWT OLE Win32/win32/org/eclipse/swt/ole/win32/OleClientSite.java" type="org.eclipse.swt.ole.win32.OleClientSite">
-<filter id="338948223">
-<message_arguments>
-<message_argument value="org.eclipse.swt.ole.win32.OleClientSite"/>
-<message_argument value="OleClientSite(Composite, int, String, File)"/>
-</message_arguments>
-</filter>
-</resource>
-<resource path="Eclipse SWT OLE Win32/win32/org/eclipse/swt/ole/win32/OleControlSite.java" type="org.eclipse.swt.ole.win32.OleControlSite">
-<filter id="338948223">
-<message_arguments>
-<message_argument value="org.eclipse.swt.ole.win32.OleControlSite"/>
-<message_argument value="OleControlSite(Composite, int, String, File)"/>
-</message_arguments>
-</filter>
-<filter id="1227882500">
-<message_arguments>
-<message_argument value="OnUIDeactivate(int)"/>
-</message_arguments>
-</filter>
-</resource>
-<resource path="Eclipse SWT OLE Win32/win32/org/eclipse/swt/ole/win32/Variant.java" type="org.eclipse.swt.ole.win32.Variant">
-<filter id="338944126">
-<message_arguments>
-<message_argument value="org.eclipse.swt.ole.win32.Variant"/>
-<message_argument value="win32_copy(int, Variant)"/>
-</message_arguments>
-</filter>
-<filter id="338944126">
-<message_arguments>
-<message_argument value="org.eclipse.swt.ole.win32.Variant"/>
-<message_argument value="win32_new(int)"/>
-</message_arguments>
-</filter>
-<filter id="389242988">
-<message_arguments>
-<message_argument value="org.eclipse.swt.ole.win32.Variant"/>
-<message_argument value="sizeof"/>
-<message_argument value="16"/>
-</message_arguments>
-</filter>
-</resource>
-<resource path="Eclipse SWT Printing/win32/org/eclipse/swt/printing/PrintDialog.java" type="org.eclipse.swt.printing.PrintDialog">
-<filter id="336744520">
-<message_arguments>
-<message_argument value="org.eclipse.swt.printing.PrintDialog"/>
-</message_arguments>
-</filter>
-</resource>
-<resource path="Eclipse SWT Printing/win32/org/eclipse/swt/printing/Printer.java" type="org.eclipse.swt.printing.Printer">
-<filter id="338940029">
-<message_arguments>
-<message_argument value="org.eclipse.swt.printing.Printer"/>
-<message_argument value="handle"/>
-</message_arguments>
-</filter>
-<filter id="338944126">
-<message_arguments>
-<message_argument value="org.eclipse.swt.printing.Printer"/>
-<message_argument value="internal_dispose_GC(int, GCData)"/>
-</message_arguments>
-</filter>
-<filter id="338944126">
-<message_arguments>
-<message_argument value="org.eclipse.swt.printing.Printer"/>
-<message_argument value="internal_new_GC(GCData)"/>
-</message_arguments>
-</filter>
-</resource>
-<resource path="Eclipse SWT/common/org/eclipse/swt/events/ArmListener.java" type="org.eclipse.swt.events.ArmListener">
-<filter id="576720909">
-<message_arguments>
-<message_argument value="SWTEventListener"/>
-<message_argument value="ArmListener"/>
-</message_arguments>
-</filter>
-</resource>
-<resource path="Eclipse SWT/common/org/eclipse/swt/events/ControlListener.java" type="org.eclipse.swt.events.ControlListener">
-<filter id="576720909">
-<message_arguments>
-<message_argument value="SWTEventListener"/>
-<message_argument value="ControlListener"/>
-</message_arguments>
-</filter>
-</resource>
-<resource path="Eclipse SWT/common/org/eclipse/swt/events/DisposeListener.java" type="org.eclipse.swt.events.DisposeListener">
-<filter id="576720909">
-<message_arguments>
-<message_argument value="SWTEventListener"/>
-<message_argument value="DisposeListener"/>
-</message_arguments>
-</filter>
-</resource>
-<resource path="Eclipse SWT/common/org/eclipse/swt/events/DragDetectListener.java" type="org.eclipse.swt.events.DragDetectListener">
-<filter id="576720909">
-<message_arguments>
-<message_argument value="SWTEventListener"/>
-<message_argument value="DragDetectListener"/>
-</message_arguments>
-</filter>
-</resource>
-<resource path="Eclipse SWT/common/org/eclipse/swt/events/ExpandListener.java" type="org.eclipse.swt.events.ExpandListener">
-<filter id="576720909">
-<message_arguments>
-<message_argument value="SWTEventListener"/>
-<message_argument value="ExpandListener"/>
-</message_arguments>
-</filter>
-</resource>
-<resource path="Eclipse SWT/common/org/eclipse/swt/events/FocusListener.java" type="org.eclipse.swt.events.FocusListener">
-<filter id="576720909">
-<message_arguments>
-<message_argument value="SWTEventListener"/>
-<message_argument value="FocusListener"/>
-</message_arguments>
-</filter>
-</resource>
-<resource path="Eclipse SWT/common/org/eclipse/swt/events/HelpListener.java" type="org.eclipse.swt.events.HelpListener">
-<filter id="576720909">
-<message_arguments>
-<message_argument value="SWTEventListener"/>
-<message_argument value="HelpListener"/>
-</message_arguments>
-</filter>
-</resource>
-<resource path="Eclipse SWT/common/org/eclipse/swt/events/KeyListener.java" type="org.eclipse.swt.events.KeyListener">
-<filter id="576720909">
-<message_arguments>
-<message_argument value="SWTEventListener"/>
-<message_argument value="KeyListener"/>
-</message_arguments>
-</filter>
-</resource>
-<resource path="Eclipse SWT/common/org/eclipse/swt/events/MenuDetectListener.java" type="org.eclipse.swt.events.MenuDetectListener">
-<filter id="576720909">
-<message_arguments>
-<message_argument value="SWTEventListener"/>
-<message_argument value="MenuDetectListener"/>
-</message_arguments>
-</filter>
-</resource>
-<resource path="Eclipse SWT/common/org/eclipse/swt/events/MenuListener.java" type="org.eclipse.swt.events.MenuListener">
-<filter id="576720909">
-<message_arguments>
-<message_argument value="SWTEventListener"/>
-<message_argument value="MenuListener"/>
-</message_arguments>
-</filter>
-</resource>
-<resource path="Eclipse SWT/common/org/eclipse/swt/events/ModifyListener.java" type="org.eclipse.swt.events.ModifyListener">
-<filter id="576720909">
-<message_arguments>
-<message_argument value="SWTEventListener"/>
-<message_argument value="ModifyListener"/>
-</message_arguments>
-</filter>
-</resource>
-<resource path="Eclipse SWT/common/org/eclipse/swt/events/MouseListener.java" type="org.eclipse.swt.events.MouseListener">
-<filter id="576720909">
-<message_arguments>
-<message_argument value="SWTEventListener"/>
-<message_argument value="MouseListener"/>
-</message_arguments>
-</filter>
-</resource>
-<resource path="Eclipse SWT/common/org/eclipse/swt/events/MouseMoveListener.java" type="org.eclipse.swt.events.MouseMoveListener">
-<filter id="576720909">
-<message_arguments>
-<message_argument value="SWTEventListener"/>
-<message_argument value="MouseMoveListener"/>
-</message_arguments>
-</filter>
-</resource>
-<resource path="Eclipse SWT/common/org/eclipse/swt/events/MouseTrackListener.java" type="org.eclipse.swt.events.MouseTrackListener">
-<filter id="576720909">
-<message_arguments>
-<message_argument value="SWTEventListener"/>
-<message_argument value="MouseTrackListener"/>
-</message_arguments>
-</filter>
-</resource>
-<resource path="Eclipse SWT/common/org/eclipse/swt/events/MouseWheelListener.java" type="org.eclipse.swt.events.MouseWheelListener">
-<filter id="576720909">
-<message_arguments>
-<message_argument value="SWTEventListener"/>
-<message_argument value="MouseWheelListener"/>
-</message_arguments>
-</filter>
-</resource>
-<resource path="Eclipse SWT/common/org/eclipse/swt/events/PaintListener.java" type="org.eclipse.swt.events.PaintListener">
-<filter id="576720909">
-<message_arguments>
-<message_argument value="SWTEventListener"/>
-<message_argument value="PaintListener"/>
-</message_arguments>
-</filter>
-</resource>
-<resource path="Eclipse SWT/common/org/eclipse/swt/events/SelectionListener.java" type="org.eclipse.swt.events.SelectionListener">
-<filter id="576720909">
-<message_arguments>
-<message_argument value="SWTEventListener"/>
-<message_argument value="SelectionListener"/>
-</message_arguments>
-</filter>
-</resource>
-<resource path="Eclipse SWT/common/org/eclipse/swt/events/ShellListener.java" type="org.eclipse.swt.events.ShellListener">
-<filter id="576720909">
-<message_arguments>
-<message_argument value="SWTEventListener"/>
-<message_argument value="ShellListener"/>
-</message_arguments>
-</filter>
-</resource>
-<resource path="Eclipse SWT/common/org/eclipse/swt/events/TraverseListener.java" type="org.eclipse.swt.events.TraverseListener">
-<filter id="576720909">
-<message_arguments>
-<message_argument value="SWTEventListener"/>
-<message_argument value="TraverseListener"/>
-</message_arguments>
-</filter>
-</resource>
-<resource path="Eclipse SWT/common/org/eclipse/swt/events/TreeListener.java" type="org.eclipse.swt.events.TreeListener">
-<filter id="576720909">
-<message_arguments>
-<message_argument value="SWTEventListener"/>
-<message_argument value="TreeListener"/>
-</message_arguments>
-</filter>
-</resource>
-<resource path="Eclipse SWT/common/org/eclipse/swt/events/VerifyListener.java" type="org.eclipse.swt.events.VerifyListener">
-<filter id="576720909">
-<message_arguments>
-<message_argument value="SWTEventListener"/>
-<message_argument value="VerifyListener"/>
-</message_arguments>
-</filter>
-</resource>
-<resource path="Eclipse SWT/common/org/eclipse/swt/graphics/Drawable.java" type="org.eclipse.swt.graphics.Drawable">
-<filter id="406052990">
-<message_arguments>
-<message_argument value="org.eclipse.swt.graphics.Drawable"/>
-<message_argument value="internal_dispose_GC(int, GCData)"/>
-</message_arguments>
-</filter>
-<filter id="406052990">
-<message_arguments>
-<message_argument value="org.eclipse.swt.graphics.Drawable"/>
-<message_argument value="internal_new_GC(GCData)"/>
-</message_arguments>
-</filter>
-</resource>
-<resource path="Eclipse SWT/common/org/eclipse/swt/graphics/ImageData.java" type="org.eclipse.swt.graphics.ImageData">
-<filter id="338944126">
-<message_arguments>
-<message_argument value="org.eclipse.swt.graphics.ImageData"/>
-<message_argument value="internal_new(int, int, int, PaletteData, int, byte[], int, byte[], byte[], int, int, int, int, int, int, int)"/>
-</message_arguments>
-</filter>
-<filter id="576725006">
-<message_arguments>
-<message_argument value="CloneableCompatibility"/>
-<message_argument value="ImageData"/>
-</message_arguments>
-</filter>
-</resource>
-<resource path="Eclipse SWT/common/org/eclipse/swt/graphics/ImageLoaderListener.java" type="org.eclipse.swt.graphics.ImageLoaderListener">
-<filter id="576720909">
-<message_arguments>
-<message_argument value="SWTEventListener"/>
-<message_argument value="ImageLoaderListener"/>
-</message_arguments>
-</filter>
-</resource>
-<resource path="Eclipse SWT/common/org/eclipse/swt/graphics/Point.java" type="org.eclipse.swt.graphics.Point">
-<filter id="576725006">
-<message_arguments>
-<message_argument value="SerializableCompatibility"/>
-<message_argument value="Point"/>
-</message_arguments>
-</filter>
-</resource>
-<resource path="Eclipse SWT/common/org/eclipse/swt/graphics/RGB.java" type="org.eclipse.swt.graphics.RGB">
-<filter id="576725006">
-<message_arguments>
-<message_argument value="SerializableCompatibility"/>
-<message_argument value="RGB"/>
-</message_arguments>
-</filter>
-</resource>
-<resource path="Eclipse SWT/common/org/eclipse/swt/graphics/Rectangle.java" type="org.eclipse.swt.graphics.Rectangle">
-<filter id="576725006">
-<message_arguments>
-<message_argument value="SerializableCompatibility"/>
-<message_argument value="Rectangle"/>
-</message_arguments>
-</filter>
-</resource>
-<resource path="Eclipse SWT/common/org/eclipse/swt/widgets/Tray.java" type="org.eclipse.swt.widgets.Tray">
-<filter id="336744520">
-<message_arguments>
-<message_argument value="org.eclipse.swt.widgets.Tray"/>
-</message_arguments>
-</filter>
-</resource>
-<resource path="Eclipse SWT/common/org/eclipse/swt/widgets/TypedListener.java" type="org.eclipse.swt.widgets.TypedListener">
-<filter id="338944126">
-<message_arguments>
-<message_argument value="org.eclipse.swt.widgets.TypedListener"/>
-<message_argument value="getEventListener()"/>
-</message_arguments>
-</filter>
-<filter id="338944126">
-<message_arguments>
-<message_argument value="org.eclipse.swt.widgets.TypedListener"/>
-<message_argument value="handleEvent(Event)"/>
-</message_arguments>
-</filter>
-<filter id="338948223">
-<message_arguments>
-<message_argument value="org.eclipse.swt.widgets.TypedListener"/>
-<message_argument value="TypedListener(SWTEventListener)"/>
-</message_arguments>
-</filter>
-</resource>
-<resource path="Eclipse SWT/win32/org/eclipse/swt/graphics/Color.java" type="org.eclipse.swt.graphics.Color">
-<filter id="338940029">
-<message_arguments>
-<message_argument value="org.eclipse.swt.graphics.Color"/>
-<message_argument value="handle"/>
-</message_arguments>
-</filter>
-<filter id="338944126">
-<message_arguments>
-<message_argument value="org.eclipse.swt.graphics.Color"/>
-<message_argument value="win32_new(Device, int)"/>
-</message_arguments>
-</filter>
-</resource>
-<resource path="Eclipse SWT/win32/org/eclipse/swt/graphics/Cursor.java" type="org.eclipse.swt.graphics.Cursor">
-<filter id="338940029">
-<message_arguments>
-<message_argument value="org.eclipse.swt.graphics.Cursor"/>
-<message_argument value="handle"/>
-</message_arguments>
-</filter>
-<filter id="338944126">
-<message_arguments>
-<message_argument value="org.eclipse.swt.graphics.Cursor"/>
-<message_argument value="win32_new(Device, int)"/>
-</message_arguments>
-</filter>
-</resource>
-<resource path="Eclipse SWT/win32/org/eclipse/swt/graphics/Device.java" type="org.eclipse.swt.graphics.Device">
-<filter id="338940029">
-<message_arguments>
-<message_argument value="org.eclipse.swt.graphics.Device"/>
-<message_argument value="hPalette"/>
-</message_arguments>
-</filter>
-<filter id="338944126">
-<message_arguments>
-<message_argument value="org.eclipse.swt.graphics.Device"/>
-<message_argument value="internal_dispose_GC(int, GCData)"/>
-</message_arguments>
-</filter>
-<filter id="338944126">
-<message_arguments>
-<message_argument value="org.eclipse.swt.graphics.Device"/>
-<message_argument value="internal_new_GC(GCData)"/>
-</message_arguments>
-</filter>
-</resource>
-<resource path="Eclipse SWT/win32/org/eclipse/swt/graphics/Font.java" type="org.eclipse.swt.graphics.Font">
-<filter id="338940029">
-<message_arguments>
-<message_argument value="org.eclipse.swt.graphics.Font"/>
-<message_argument value="handle"/>
-</message_arguments>
-</filter>
-<filter id="338944126">
-<message_arguments>
-<message_argument value="org.eclipse.swt.graphics.Font"/>
-<message_argument value="win32_new(Device, int)"/>
-</message_arguments>
-</filter>
-</resource>
-<resource path="Eclipse SWT/win32/org/eclipse/swt/graphics/FontData.java" type="org.eclipse.swt.graphics.FontData">
-<filter id="338940029">
-<message_arguments>
-<message_argument value="org.eclipse.swt.graphics.FontData"/>
-<message_argument value="data"/>
-</message_arguments>
-</filter>
-<filter id="338940029">
-<message_arguments>
-<message_argument value="org.eclipse.swt.graphics.FontData"/>
-<message_argument value="height"/>
-</message_arguments>
-</filter>
-<filter id="338944126">
-<message_arguments>
-<message_argument value="org.eclipse.swt.graphics.FontData"/>
-<message_argument value="win32_new(LOGFONT, float)"/>
-</message_arguments>
-</filter>
-</resource>
-<resource path="Eclipse SWT/win32/org/eclipse/swt/graphics/FontMetrics.java" type="org.eclipse.swt.graphics.FontMetrics">
-<filter id="338940029">
-<message_arguments>
-<message_argument value="org.eclipse.swt.graphics.FontMetrics"/>
-<message_argument value="handle"/>
-</message_arguments>
-</filter>
-<filter id="338944126">
-<message_arguments>
-<message_argument value="org.eclipse.swt.graphics.FontMetrics"/>
-<message_argument value="win32_new(TEXTMETRIC)"/>
-</message_arguments>
-</filter>
-</resource>
-<resource path="Eclipse SWT/win32/org/eclipse/swt/graphics/GC.java" type="org.eclipse.swt.graphics.GC">
-<filter id="338940029">
-<message_arguments>
-<message_argument value="org.eclipse.swt.graphics.GC"/>
-<message_argument value="handle"/>
-</message_arguments>
-</filter>
-<filter id="338944126">
-<message_arguments>
-<message_argument value="org.eclipse.swt.graphics.GC"/>
-<message_argument value="getGCData()"/>
-</message_arguments>
-</filter>
-<filter id="338944126">
-<message_arguments>
-<message_argument value="org.eclipse.swt.graphics.GC"/>
-<message_argument value="win32_new(Drawable, GCData)"/>
-</message_arguments>
-</filter>
-<filter id="338944126">
-<message_arguments>
-<message_argument value="org.eclipse.swt.graphics.GC"/>
-<message_argument value="win32_new(int, GCData)"/>
-</message_arguments>
-</filter>
-</resource>
-<resource path="Eclipse SWT/win32/org/eclipse/swt/graphics/GCData.java" type="org.eclipse.swt.graphics.GCData">
-<filter id="336744520">
-<message_arguments>
-<message_argument value="org.eclipse.swt.graphics.GCData"/>
-</message_arguments>
-</filter>
-<filter id="338755678">
-<message_arguments>
-<message_argument value="org.eclipse.swt.graphics.GCData"/>
-<message_argument value="hFont"/>
-</message_arguments>
-</filter>
-<filter id="1143996420">
-<message_arguments>
-<message_argument value="hGDIFont"/>
-</message_arguments>
-</filter>
-<filter id="1143996420">
-<message_arguments>
-<message_argument value="org.eclipse.swt.graphics.GCData"/>
-</message_arguments>
-</filter>
-</resource>
-<resource path="Eclipse SWT/win32/org/eclipse/swt/graphics/Image.java" type="org.eclipse.swt.graphics.Image">
-<filter id="338940029">
-<message_arguments>
-<message_argument value="org.eclipse.swt.graphics.Image"/>
-<message_argument value="handle"/>
-</message_arguments>
-</filter>
-<filter id="338940029">
-<message_arguments>
-<message_argument value="org.eclipse.swt.graphics.Image"/>
-<message_argument value="type"/>
-</message_arguments>
-</filter>
-<filter id="338944126">
-<message_arguments>
-<message_argument value="org.eclipse.swt.graphics.Image"/>
-<message_argument value="internal_dispose_GC(int, GCData)"/>
-</message_arguments>
-</filter>
-<filter id="338944126">
-<message_arguments>
-<message_argument value="org.eclipse.swt.graphics.Image"/>
-<message_argument value="internal_new_GC(GCData)"/>
-</message_arguments>
-</filter>
-<filter id="338944126">
-<message_arguments>
-<message_argument value="org.eclipse.swt.graphics.Image"/>
-<message_argument value="win32_new(Device, int, int)"/>
-</message_arguments>
-</filter>
-</resource>
-<resource path="Eclipse SWT/win32/org/eclipse/swt/graphics/Path.java" type="org.eclipse.swt.graphics.Path">
-<filter id="338940029">
-<message_arguments>
-<message_argument value="org.eclipse.swt.graphics.Path"/>
-<message_argument value="handle"/>
-</message_arguments>
-</filter>
-</resource>
-<resource path="Eclipse SWT/win32/org/eclipse/swt/graphics/Pattern.java" type="org.eclipse.swt.graphics.Pattern">
-<filter id="338940029">
-<message_arguments>
-<message_argument value="org.eclipse.swt.graphics.Pattern"/>
-<message_argument value="handle"/>
-</message_arguments>
-</filter>
-</resource>
-<resource path="Eclipse SWT/win32/org/eclipse/swt/graphics/Region.java" type="org.eclipse.swt.graphics.Region">
-<filter id="338940029">
-<message_arguments>
-<message_argument value="org.eclipse.swt.graphics.Region"/>
-<message_argument value="handle"/>
-</message_arguments>
-</filter>
-<filter id="338944126">
-<message_arguments>
-<message_argument value="org.eclipse.swt.graphics.Region"/>
-<message_argument value="win32_new(Device, int)"/>
-</message_arguments>
-</filter>
-</resource>
-<resource path="Eclipse SWT/win32/org/eclipse/swt/graphics/Transform.java" type="org.eclipse.swt.graphics.Transform">
-<filter id="338940029">
-<message_arguments>
-<message_argument value="org.eclipse.swt.graphics.Transform"/>
-<message_argument value="handle"/>
-</message_arguments>
-</filter>
-</resource>
-<resource path="Eclipse SWT/win32/org/eclipse/swt/widgets/Button.java" type="org.eclipse.swt.widgets.Button">
-<filter id="336744520">
-<message_arguments>
-<message_argument value="org.eclipse.swt.widgets.Button"/>
-</message_arguments>
-</filter>
-</resource>
-<resource path="Eclipse SWT/win32/org/eclipse/swt/widgets/Caret.java" type="org.eclipse.swt.widgets.Caret">
-<filter id="336744520">
-<message_arguments>
-<message_argument value="org.eclipse.swt.widgets.Caret"/>
-</message_arguments>
-</filter>
-</resource>
-<resource path="Eclipse SWT/win32/org/eclipse/swt/widgets/ColorDialog.java" type="org.eclipse.swt.widgets.ColorDialog">
-<filter id="336744520">
-<message_arguments>
-<message_argument value="org.eclipse.swt.widgets.ColorDialog"/>
-</message_arguments>
-</filter>
-</resource>
-<resource path="Eclipse SWT/win32/org/eclipse/swt/widgets/Combo.java" type="org.eclipse.swt.widgets.Combo">
-<filter id="336744520">
-<message_arguments>
-<message_argument value="org.eclipse.swt.widgets.Combo"/>
-</message_arguments>
-</filter>
-</resource>
-<resource path="Eclipse SWT/win32/org/eclipse/swt/widgets/Control.java" type="org.eclipse.swt.widgets.Control">
-<filter id="336744520">
-<message_arguments>
-<message_argument value="org.eclipse.swt.widgets.Control"/>
-</message_arguments>
-</filter>
-<filter id="338940029">
-<message_arguments>
-<message_argument value="org.eclipse.swt.widgets.Control"/>
-<message_argument value="handle"/>
-</message_arguments>
-</filter>
-<filter id="338944126">
-<message_arguments>
-<message_argument value="org.eclipse.swt.widgets.Control"/>
-<message_argument value="internal_dispose_GC(int, GCData)"/>
-</message_arguments>
-</filter>
-<filter id="338944126">
-<message_arguments>
-<message_argument value="org.eclipse.swt.widgets.Control"/>
-<message_argument value="internal_new_GC(GCData)"/>
-</message_arguments>
-</filter>
-</resource>
-<resource path="Eclipse SWT/win32/org/eclipse/swt/widgets/CoolBar.java" type="org.eclipse.swt.widgets.CoolBar">
-<filter id="336744520">
-<message_arguments>
-<message_argument value="org.eclipse.swt.widgets.CoolBar"/>
-</message_arguments>
-</filter>
-</resource>
-<resource path="Eclipse SWT/win32/org/eclipse/swt/widgets/CoolItem.java" type="org.eclipse.swt.widgets.CoolItem">
-<filter id="336744520">
-<message_arguments>
-<message_argument value="org.eclipse.swt.widgets.CoolItem"/>
-</message_arguments>
-</filter>
-</resource>
-<resource path="Eclipse SWT/win32/org/eclipse/swt/widgets/DateTime.java" type="org.eclipse.swt.widgets.DateTime">
-<filter id="336744520">
-<message_arguments>
-<message_argument value="org.eclipse.swt.widgets.DateTime"/>
-</message_arguments>
-</filter>
-</resource>
-<resource path="Eclipse SWT/win32/org/eclipse/swt/widgets/Decorations.java" type="org.eclipse.swt.widgets.Decorations">
-<filter id="336744520">
-<message_arguments>
-<message_argument value="org.eclipse.swt.widgets.Decorations"/>
-</message_arguments>
-</filter>
-</resource>
-<resource path="Eclipse SWT/win32/org/eclipse/swt/widgets/DirectoryDialog.java" type="org.eclipse.swt.widgets.DirectoryDialog">
-<filter id="336744520">
-<message_arguments>
-<message_argument value="org.eclipse.swt.widgets.DirectoryDialog"/>
-</message_arguments>
-</filter>
-</resource>
-<resource path="Eclipse SWT/win32/org/eclipse/swt/widgets/Display.java" type="org.eclipse.swt.widgets.Display">
-<filter id="336744520">
-<message_arguments>
-<message_argument value="org.eclipse.swt.widgets.Display"/>
-</message_arguments>
-</filter>
-<filter id="338940029">
-<message_arguments>
-<message_argument value="org.eclipse.swt.widgets.Display"/>
-<message_argument value="msg"/>
-</message_arguments>
-</filter>
-<filter id="338944126">
-<message_arguments>
-<message_argument value="org.eclipse.swt.widgets.Display"/>
-<message_argument value="findWidget(int)"/>
-</message_arguments>
-</filter>
-<filter id="338944126">
-<message_arguments>
-<message_argument value="org.eclipse.swt.widgets.Display"/>
-<message_argument value="findWidget(int, int)"/>
-</message_arguments>
-</filter>
-<filter id="338944126">
-<message_arguments>
-<message_argument value="org.eclipse.swt.widgets.Display"/>
-<message_argument value="internal_dispose_GC(int, GCData)"/>
-</message_arguments>
-</filter>
-<filter id="338944126">
-<message_arguments>
-<message_argument value="org.eclipse.swt.widgets.Display"/>
-<message_argument value="internal_new_GC(GCData)"/>
-</message_arguments>
-</filter>
-</resource>
-<resource path="Eclipse SWT/win32/org/eclipse/swt/widgets/ExpandBar.java" type="org.eclipse.swt.widgets.ExpandBar">
-<filter id="336744520">
-<message_arguments>
-<message_argument value="org.eclipse.swt.widgets.ExpandBar"/>
-</message_arguments>
-</filter>
-</resource>
-<resource path="Eclipse SWT/win32/org/eclipse/swt/widgets/ExpandItem.java" type="org.eclipse.swt.widgets.ExpandItem">
-<filter id="336744520">
-<message_arguments>
-<message_argument value="org.eclipse.swt.widgets.ExpandItem"/>
-</message_arguments>
-</filter>
-</resource>
-<resource path="Eclipse SWT/win32/org/eclipse/swt/widgets/FileDialog.java" type="org.eclipse.swt.widgets.FileDialog">
-<filter id="336744520">
-<message_arguments>
-<message_argument value="org.eclipse.swt.widgets.FileDialog"/>
-</message_arguments>
-</filter>
-</resource>
-<resource path="Eclipse SWT/win32/org/eclipse/swt/widgets/FontDialog.java" type="org.eclipse.swt.widgets.FontDialog">
-<filter id="336744520">
-<message_arguments>
-<message_argument value="org.eclipse.swt.widgets.FontDialog"/>
-</message_arguments>
-</filter>
-</resource>
-<resource path="Eclipse SWT/win32/org/eclipse/swt/widgets/Group.java" type="org.eclipse.swt.widgets.Group">
-<filter id="336744520">
-<message_arguments>
-<message_argument value="org.eclipse.swt.widgets.Group"/>
-</message_arguments>
-</filter>
-</resource>
-<resource path="Eclipse SWT/win32/org/eclipse/swt/widgets/IME.java" type="org.eclipse.swt.widgets.IME">
-<filter id="336744520">
-<message_arguments>
-<message_argument value="org.eclipse.swt.widgets.IME"/>
-</message_arguments>
-</filter>
-</resource>
-<resource path="Eclipse SWT/win32/org/eclipse/swt/widgets/Label.java" type="org.eclipse.swt.widgets.Label">
-<filter id="336744520">
-<message_arguments>
-<message_argument value="org.eclipse.swt.widgets.Label"/>
-</message_arguments>
-</filter>
-</resource>
-<resource path="Eclipse SWT/win32/org/eclipse/swt/widgets/Link.java" type="org.eclipse.swt.widgets.Link">
-<filter id="336744520">
-<message_arguments>
-<message_argument value="org.eclipse.swt.widgets.Link"/>
-</message_arguments>
-</filter>
-</resource>
-<resource path="Eclipse SWT/win32/org/eclipse/swt/widgets/List.java" type="org.eclipse.swt.widgets.List">
-<filter id="336744520">
-<message_arguments>
-<message_argument value="org.eclipse.swt.widgets.List"/>
-</message_arguments>
-</filter>
-</resource>
-<resource path="Eclipse SWT/win32/org/eclipse/swt/widgets/Menu.java" type="org.eclipse.swt.widgets.Menu">
-<filter id="336744520">
-<message_arguments>
-<message_argument value="org.eclipse.swt.widgets.Menu"/>
-</message_arguments>
-</filter>
-<filter id="338940029">
-<message_arguments>
-<message_argument value="org.eclipse.swt.widgets.Menu"/>
-<message_argument value="handle"/>
-</message_arguments>
-</filter>
-</resource>
-<resource path="Eclipse SWT/win32/org/eclipse/swt/widgets/MenuItem.java" type="org.eclipse.swt.widgets.MenuItem">
-<filter id="336744520">
-<message_arguments>
-<message_argument value="org.eclipse.swt.widgets.MenuItem"/>
-</message_arguments>
-</filter>
-</resource>
-<resource path="Eclipse SWT/win32/org/eclipse/swt/widgets/MessageBox.java" type="org.eclipse.swt.widgets.MessageBox">
-<filter id="336744520">
-<message_arguments>
-<message_argument value="org.eclipse.swt.widgets.MessageBox"/>
-</message_arguments>
-</filter>
-</resource>
-<resource path="Eclipse SWT/win32/org/eclipse/swt/widgets/ProgressBar.java" type="org.eclipse.swt.widgets.ProgressBar">
-<filter id="336744520">
-<message_arguments>
-<message_argument value="org.eclipse.swt.widgets.ProgressBar"/>
-</message_arguments>
-</filter>
-</resource>
-<resource path="Eclipse SWT/win32/org/eclipse/swt/widgets/Sash.java" type="org.eclipse.swt.widgets.Sash">
-<filter id="336744520">
-<message_arguments>
-<message_argument value="org.eclipse.swt.widgets.Sash"/>
-</message_arguments>
-</filter>
-</resource>
-<resource path="Eclipse SWT/win32/org/eclipse/swt/widgets/Scale.java" type="org.eclipse.swt.widgets.Scale">
-<filter id="336744520">
-<message_arguments>
-<message_argument value="org.eclipse.swt.widgets.Scale"/>
-</message_arguments>
-</filter>
-</resource>
-<resource path="Eclipse SWT/win32/org/eclipse/swt/widgets/ScrollBar.java" type="org.eclipse.swt.widgets.ScrollBar">
-<filter id="336744520">
-<message_arguments>
-<message_argument value="org.eclipse.swt.widgets.ScrollBar"/>
-</message_arguments>
-</filter>
-</resource>
-<resource path="Eclipse SWT/win32/org/eclipse/swt/widgets/Scrollable.java" type="org.eclipse.swt.widgets.Scrollable">
-<filter id="336744520">
-<message_arguments>
-<message_argument value="org.eclipse.swt.widgets.Scrollable"/>
-</message_arguments>
-</filter>
-</resource>
-<resource path="Eclipse SWT/win32/org/eclipse/swt/widgets/Shell.java" type="org.eclipse.swt.widgets.Shell">
-<filter id="338944126">
-<message_arguments>
-<message_argument value="org.eclipse.swt.widgets.Shell"/>
-<message_argument value="internal_new(Display, int)"/>
-</message_arguments>
-</filter>
-<filter id="338944126">
-<message_arguments>
-<message_argument value="org.eclipse.swt.widgets.Shell"/>
-<message_argument value="win32_new(Display, int)"/>
-</message_arguments>
-</filter>
-</resource>
-<resource path="Eclipse SWT/win32/org/eclipse/swt/widgets/Slider.java" type="org.eclipse.swt.widgets.Slider">
-<filter id="336744520">
-<message_arguments>
-<message_argument value="org.eclipse.swt.widgets.Slider"/>
-</message_arguments>
-</filter>
-</resource>
-<resource path="Eclipse SWT/win32/org/eclipse/swt/widgets/Spinner.java" type="org.eclipse.swt.widgets.Spinner">
-<filter id="336744520">
-<message_arguments>
-<message_argument value="org.eclipse.swt.widgets.Spinner"/>
-</message_arguments>
-</filter>
-</resource>
-<resource path="Eclipse SWT/win32/org/eclipse/swt/widgets/TabFolder.java" type="org.eclipse.swt.widgets.TabFolder">
-<filter id="336744520">
-<message_arguments>
-<message_argument value="org.eclipse.swt.widgets.TabFolder"/>
-</message_arguments>
-</filter>
-</resource>
-<resource path="Eclipse SWT/win32/org/eclipse/swt/widgets/TabItem.java" type="org.eclipse.swt.widgets.TabItem">
-<filter id="336744520">
-<message_arguments>
-<message_argument value="org.eclipse.swt.widgets.TabItem"/>
-</message_arguments>
-</filter>
-</resource>
-<resource path="Eclipse SWT/win32/org/eclipse/swt/widgets/Table.java" type="org.eclipse.swt.widgets.Table">
-<filter id="336744520">
-<message_arguments>
-<message_argument value="org.eclipse.swt.widgets.Table"/>
-</message_arguments>
-</filter>
-</resource>
-<resource path="Eclipse SWT/win32/org/eclipse/swt/widgets/TableColumn.java" type="org.eclipse.swt.widgets.TableColumn">
-<filter id="336744520">
-<message_arguments>
-<message_argument value="org.eclipse.swt.widgets.TableColumn"/>
-</message_arguments>
-</filter>
-</resource>
-<resource path="Eclipse SWT/win32/org/eclipse/swt/widgets/TableItem.java" type="org.eclipse.swt.widgets.TableItem">
-<filter id="336744520">
-<message_arguments>
-<message_argument value="org.eclipse.swt.widgets.TableItem"/>
-</message_arguments>
-</filter>
-</resource>
-<resource path="Eclipse SWT/win32/org/eclipse/swt/widgets/Text.java" type="org.eclipse.swt.widgets.Text">
-<filter id="336744520">
-<message_arguments>
-<message_argument value="org.eclipse.swt.widgets.Text"/>
-</message_arguments>
-</filter>
-</resource>
-<resource path="Eclipse SWT/win32/org/eclipse/swt/widgets/ToolBar.java" type="org.eclipse.swt.widgets.ToolBar">
-<filter id="336744520">
-<message_arguments>
-<message_argument value="org.eclipse.swt.widgets.ToolBar"/>
-</message_arguments>
-</filter>
-</resource>
-<resource path="Eclipse SWT/win32/org/eclipse/swt/widgets/ToolItem.java" type="org.eclipse.swt.widgets.ToolItem">
-<filter id="336744520">
-<message_arguments>
-<message_argument value="org.eclipse.swt.widgets.ToolItem"/>
-</message_arguments>
-</filter>
-</resource>
-<resource path="Eclipse SWT/win32/org/eclipse/swt/widgets/ToolTip.java" type="org.eclipse.swt.widgets.ToolTip">
-<filter id="336744520">
-<message_arguments>
-<message_argument value="org.eclipse.swt.widgets.ToolTip"/>
-</message_arguments>
-</filter>
-</resource>
-<resource path="Eclipse SWT/win32/org/eclipse/swt/widgets/Tracker.java" type="org.eclipse.swt.widgets.Tracker">
-<filter id="336744520">
-<message_arguments>
-<message_argument value="org.eclipse.swt.widgets.Tracker"/>
-</message_arguments>
-</filter>
-</resource>
-<resource path="Eclipse SWT/win32/org/eclipse/swt/widgets/TrayItem.java" type="org.eclipse.swt.widgets.TrayItem">
-<filter id="336744520">
-<message_arguments>
-<message_argument value="org.eclipse.swt.widgets.TrayItem"/>
-</message_arguments>
-</filter>
-</resource>
-<resource path="Eclipse SWT/win32/org/eclipse/swt/widgets/Tree.java" type="org.eclipse.swt.widgets.Tree">
-<filter id="336744520">
-<message_arguments>
-<message_argument value="org.eclipse.swt.widgets.Tree"/>
-</message_arguments>
-</filter>
-</resource>
-<resource path="Eclipse SWT/win32/org/eclipse/swt/widgets/TreeColumn.java" type="org.eclipse.swt.widgets.TreeColumn">
-<filter id="336744520">
-<message_arguments>
-<message_argument value="org.eclipse.swt.widgets.TreeColumn"/>
-</message_arguments>
-</filter>
-</resource>
-<resource path="Eclipse SWT/win32/org/eclipse/swt/widgets/TreeItem.java" type="org.eclipse.swt.widgets.TreeItem">
-<filter id="336744520">
-<message_arguments>
-<message_argument value="org.eclipse.swt.widgets.TreeItem"/>
-</message_arguments>
-</filter>
-<filter id="338940029">
-<message_arguments>
-<message_argument value="org.eclipse.swt.widgets.TreeItem"/>
-<message_argument value="handle"/>
-</message_arguments>
-</filter>
-</resource>
-<resource path="Eclipse SWT/win32/org/eclipse/swt/widgets/Widget.java" type="org.eclipse.swt.widgets.Widget">
-<filter id="338944126">
-<message_arguments>
-<message_argument value="org.eclipse.swt.widgets.Widget"/>
-<message_argument value="removeListener(int, SWTEventListener)"/>
-</message_arguments>
-</filter>
-</resource>
-<resource path="META-INF/MANIFEST.MF">
-<filter id="923795461">
-<message_arguments>
-<message_argument value="3.6.0.qualifier"/>
-<message_argument value="3.5.2.v3557f"/>
-</message_arguments>
-</filter>
-</resource>
+    <resource path="Eclipse SWT Accessibility/cocoa/org/eclipse/swt/accessibility/Accessible.java" type="org.eclipse.swt.accessibility.Accessible">
+        <filter id="643842064">
+            <message_arguments>
+                <message_argument value="NSArray"/>
+                <message_argument value="Accessible"/>
+                <message_argument value="internal_accessibilityActionNames(int)"/>
+            </message_arguments>
+        </filter>
+        <filter id="643842064">
+            <message_arguments>
+                <message_argument value="NSArray"/>
+                <message_argument value="Accessible"/>
+                <message_argument value="internal_accessibilityAttributeNames(int)"/>
+            </message_arguments>
+        </filter>
+        <filter id="643842064">
+            <message_arguments>
+                <message_argument value="NSArray"/>
+                <message_argument value="Accessible"/>
+                <message_argument value="internal_accessibilityParameterizedAttributeNames(int)"/>
+            </message_arguments>
+        </filter>
+        <filter id="643842064">
+            <message_arguments>
+                <message_argument value="id"/>
+                <message_argument value="Accessible"/>
+                <message_argument value="internal_accessibilityActionDescription(NSString, int)"/>
+            </message_arguments>
+        </filter>
+        <filter id="643842064">
+            <message_arguments>
+                <message_argument value="id"/>
+                <message_argument value="Accessible"/>
+                <message_argument value="internal_accessibilityAttributeValue(NSString, int)"/>
+            </message_arguments>
+        </filter>
+        <filter id="643842064">
+            <message_arguments>
+                <message_argument value="id"/>
+                <message_argument value="Accessible"/>
+                <message_argument value="internal_accessibilityAttributeValue_forParameter(NSString, id, int)"/>
+            </message_arguments>
+        </filter>
+        <filter id="643842064">
+            <message_arguments>
+                <message_argument value="id"/>
+                <message_argument value="Accessible"/>
+                <message_argument value="internal_accessibilityFocusedUIElement(int)"/>
+            </message_arguments>
+        </filter>
+        <filter id="643842064">
+            <message_arguments>
+                <message_argument value="id"/>
+                <message_argument value="Accessible"/>
+                <message_argument value="internal_accessibilityHitTest(NSPoint, int)"/>
+            </message_arguments>
+        </filter>
+        <filter id="643846161">
+            <message_arguments>
+                <message_argument value="NSPoint"/>
+                <message_argument value="Accessible"/>
+                <message_argument value="internal_accessibilityHitTest(NSPoint, int)"/>
+            </message_arguments>
+        </filter>
+        <filter id="643846161">
+            <message_arguments>
+                <message_argument value="NSString"/>
+                <message_argument value="Accessible"/>
+                <message_argument value="internal_accessibilityActionDescription(NSString, int)"/>
+            </message_arguments>
+        </filter>
+        <filter id="643846161">
+            <message_arguments>
+                <message_argument value="NSString"/>
+                <message_argument value="Accessible"/>
+                <message_argument value="internal_accessibilityAttributeValue(NSString, int)"/>
+            </message_arguments>
+        </filter>
+        <filter id="643846161">
+            <message_arguments>
+                <message_argument value="NSString"/>
+                <message_argument value="Accessible"/>
+                <message_argument value="internal_accessibilityAttributeValue_forParameter(NSString, id, int)"/>
+            </message_arguments>
+        </filter>
+        <filter id="643846161">
+            <message_arguments>
+                <message_argument value="NSString"/>
+                <message_argument value="Accessible"/>
+                <message_argument value="internal_accessibilityIsAttributeSettable(NSString, int)"/>
+            </message_arguments>
+        </filter>
+        <filter id="643846161">
+            <message_arguments>
+                <message_argument value="NSString"/>
+                <message_argument value="Accessible"/>
+                <message_argument value="internal_accessibilityPerformAction(NSString, int)"/>
+            </message_arguments>
+        </filter>
+        <filter id="643846161">
+            <message_arguments>
+                <message_argument value="NSString"/>
+                <message_argument value="Accessible"/>
+                <message_argument value="internal_accessibilitySetValue_forAttribute(id, NSString, int)"/>
+            </message_arguments>
+        </filter>
+        <filter id="643846161">
+            <message_arguments>
+                <message_argument value="id"/>
+                <message_argument value="Accessible"/>
+                <message_argument value="internal_accessibilityAttributeValue_forParameter(NSString, id, int)"/>
+            </message_arguments>
+        </filter>
+        <filter id="643846161">
+            <message_arguments>
+                <message_argument value="id"/>
+                <message_argument value="Accessible"/>
+                <message_argument value="internal_accessibilitySetValue_forAttribute(id, NSString, int)"/>
+            </message_arguments>
+        </filter>
+    </resource>
+    <resource path="Eclipse SWT Accessibility/common/org/eclipse/swt/accessibility/AccessibleActionListener.java" type="org.eclipse.swt.accessibility.AccessibleActionListener">
+        <filter id="576720909">
+            <message_arguments>
+                <message_argument value="SWTEventListener"/>
+                <message_argument value="AccessibleActionListener"/>
+            </message_arguments>
+        </filter>
+    </resource>
+    <resource path="Eclipse SWT Accessibility/common/org/eclipse/swt/accessibility/AccessibleAttributeListener.java" type="org.eclipse.swt.accessibility.AccessibleAttributeListener">
+        <filter id="576720909">
+            <message_arguments>
+                <message_argument value="SWTEventListener"/>
+                <message_argument value="AccessibleAttributeListener"/>
+            </message_arguments>
+        </filter>
+    </resource>
+    <resource path="Eclipse SWT Accessibility/common/org/eclipse/swt/accessibility/AccessibleControlListener.java" type="org.eclipse.swt.accessibility.AccessibleControlListener">
+        <filter id="576720909">
+            <message_arguments>
+                <message_argument value="SWTEventListener"/>
+                <message_argument value="AccessibleControlListener"/>
+            </message_arguments>
+        </filter>
+    </resource>
+    <resource path="Eclipse SWT Accessibility/common/org/eclipse/swt/accessibility/AccessibleEditableTextListener.java" type="org.eclipse.swt.accessibility.AccessibleEditableTextListener">
+        <filter id="576720909">
+            <message_arguments>
+                <message_argument value="SWTEventListener"/>
+                <message_argument value="AccessibleEditableTextListener"/>
+            </message_arguments>
+        </filter>
+    </resource>
+    <resource path="Eclipse SWT Accessibility/common/org/eclipse/swt/accessibility/AccessibleHyperlinkListener.java" type="org.eclipse.swt.accessibility.AccessibleHyperlinkListener">
+        <filter id="576720909">
+            <message_arguments>
+                <message_argument value="SWTEventListener"/>
+                <message_argument value="AccessibleHyperlinkListener"/>
+            </message_arguments>
+        </filter>
+    </resource>
+    <resource path="Eclipse SWT Accessibility/common/org/eclipse/swt/accessibility/AccessibleListener.java" type="org.eclipse.swt.accessibility.AccessibleListener">
+        <filter id="576720909">
+            <message_arguments>
+                <message_argument value="SWTEventListener"/>
+                <message_argument value="AccessibleListener"/>
+            </message_arguments>
+        </filter>
+    </resource>
+    <resource path="Eclipse SWT Accessibility/common/org/eclipse/swt/accessibility/AccessibleTableCellListener.java" type="org.eclipse.swt.accessibility.AccessibleTableCellListener">
+        <filter id="576720909">
+            <message_arguments>
+                <message_argument value="SWTEventListener"/>
+                <message_argument value="AccessibleTableCellListener"/>
+            </message_arguments>
+        </filter>
+    </resource>
+    <resource path="Eclipse SWT Accessibility/common/org/eclipse/swt/accessibility/AccessibleTableListener.java" type="org.eclipse.swt.accessibility.AccessibleTableListener">
+        <filter id="576720909">
+            <message_arguments>
+                <message_argument value="SWTEventListener"/>
+                <message_argument value="AccessibleTableListener"/>
+            </message_arguments>
+        </filter>
+    </resource>
+    <resource path="Eclipse SWT Accessibility/common/org/eclipse/swt/accessibility/AccessibleTextListener.java" type="org.eclipse.swt.accessibility.AccessibleTextListener">
+        <filter id="576720909">
+            <message_arguments>
+                <message_argument value="SWTEventListener"/>
+                <message_argument value="AccessibleTextListener"/>
+            </message_arguments>
+        </filter>
+    </resource>
+    <resource path="Eclipse SWT Accessibility/common/org/eclipse/swt/accessibility/AccessibleValueListener.java" type="org.eclipse.swt.accessibility.AccessibleValueListener">
+        <filter id="576720909">
+            <message_arguments>
+                <message_argument value="SWTEventListener"/>
+                <message_argument value="AccessibleValueListener"/>
+            </message_arguments>
+        </filter>
+    </resource>
+    <resource path="Eclipse SWT Browser/common/org/eclipse/swt/browser/AuthenticationListener.java" type="org.eclipse.swt.browser.AuthenticationListener">
+        <filter id="576720909">
+            <message_arguments>
+                <message_argument value="SWTEventListener"/>
+                <message_argument value="AuthenticationListener"/>
+            </message_arguments>
+        </filter>
+    </resource>
+    <resource path="Eclipse SWT Browser/common/org/eclipse/swt/browser/CloseWindowListener.java" type="org.eclipse.swt.browser.CloseWindowListener">
+        <filter id="576720909">
+            <message_arguments>
+                <message_argument value="SWTEventListener"/>
+                <message_argument value="CloseWindowListener"/>
+            </message_arguments>
+        </filter>
+    </resource>
+    <resource path="Eclipse SWT Browser/common/org/eclipse/swt/browser/LocationListener.java" type="org.eclipse.swt.browser.LocationListener">
+        <filter id="576720909">
+            <message_arguments>
+                <message_argument value="SWTEventListener"/>
+                <message_argument value="LocationListener"/>
+            </message_arguments>
+        </filter>
+    </resource>
+    <resource path="Eclipse SWT Browser/common/org/eclipse/swt/browser/OpenWindowListener.java" type="org.eclipse.swt.browser.OpenWindowListener">
+        <filter id="576720909">
+            <message_arguments>
+                <message_argument value="SWTEventListener"/>
+                <message_argument value="OpenWindowListener"/>
+            </message_arguments>
+        </filter>
+    </resource>
+    <resource path="Eclipse SWT Browser/common/org/eclipse/swt/browser/ProgressListener.java" type="org.eclipse.swt.browser.ProgressListener">
+        <filter id="576720909">
+            <message_arguments>
+                <message_argument value="SWTEventListener"/>
+                <message_argument value="ProgressListener"/>
+            </message_arguments>
+        </filter>
+    </resource>
+    <resource path="Eclipse SWT Browser/common/org/eclipse/swt/browser/StatusTextListener.java" type="org.eclipse.swt.browser.StatusTextListener">
+        <filter id="576720909">
+            <message_arguments>
+                <message_argument value="SWTEventListener"/>
+                <message_argument value="StatusTextListener"/>
+            </message_arguments>
+        </filter>
+    </resource>
+    <resource path="Eclipse SWT Browser/common/org/eclipse/swt/browser/TitleListener.java" type="org.eclipse.swt.browser.TitleListener">
+        <filter id="576720909">
+            <message_arguments>
+                <message_argument value="SWTEventListener"/>
+                <message_argument value="TitleListener"/>
+            </message_arguments>
+        </filter>
+    </resource>
+    <resource path="Eclipse SWT Browser/common/org/eclipse/swt/browser/VisibilityWindowListener.java" type="org.eclipse.swt.browser.VisibilityWindowListener">
+        <filter id="576720909">
+            <message_arguments>
+                <message_argument value="SWTEventListener"/>
+                <message_argument value="VisibilityWindowListener"/>
+            </message_arguments>
+        </filter>
+    </resource>
+    <resource path="Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/BidiSegmentListener.java" type="org.eclipse.swt.custom.BidiSegmentListener">
+        <filter id="576720909">
+            <message_arguments>
+                <message_argument value="SWTEventListener"/>
+                <message_argument value="BidiSegmentListener"/>
+            </message_arguments>
+        </filter>
+    </resource>
+    <resource path="Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/CTabFolder2Listener.java" type="org.eclipse.swt.custom.CTabFolder2Listener">
+        <filter id="576720909">
+            <message_arguments>
+                <message_argument value="SWTEventListener"/>
+                <message_argument value="CTabFolder2Listener"/>
+            </message_arguments>
+        </filter>
+    </resource>
+    <resource path="Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/CTabFolderListener.java" type="org.eclipse.swt.custom.CTabFolderListener">
+        <filter id="576720909">
+            <message_arguments>
+                <message_argument value="SWTEventListener"/>
+                <message_argument value="CTabFolderListener"/>
+            </message_arguments>
+        </filter>
+    </resource>
+    <resource path="Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/CaretListener.java" type="org.eclipse.swt.custom.CaretListener">
+        <filter id="576720909">
+            <message_arguments>
+                <message_argument value="SWTEventListener"/>
+                <message_argument value="CaretListener"/>
+            </message_arguments>
+        </filter>
+    </resource>
+    <resource path="Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/ExtendedModifyListener.java" type="org.eclipse.swt.custom.ExtendedModifyListener">
+        <filter id="576720909">
+            <message_arguments>
+                <message_argument value="SWTEventListener"/>
+                <message_argument value="ExtendedModifyListener"/>
+            </message_arguments>
+        </filter>
+    </resource>
+    <resource path="Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/LineBackgroundListener.java" type="org.eclipse.swt.custom.LineBackgroundListener">
+        <filter id="576720909">
+            <message_arguments>
+                <message_argument value="SWTEventListener"/>
+                <message_argument value="LineBackgroundListener"/>
+            </message_arguments>
+        </filter>
+    </resource>
+    <resource path="Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/LineStyleListener.java" type="org.eclipse.swt.custom.LineStyleListener">
+        <filter id="576720909">
+            <message_arguments>
+                <message_argument value="SWTEventListener"/>
+                <message_argument value="LineStyleListener"/>
+            </message_arguments>
+        </filter>
+    </resource>
+    <resource path="Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/MovementListener.java" type="org.eclipse.swt.custom.MovementListener">
+        <filter id="576720909">
+            <message_arguments>
+                <message_argument value="SWTEventListener"/>
+                <message_argument value="MovementListener"/>
+            </message_arguments>
+        </filter>
+    </resource>
+    <resource path="Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/PaintObjectListener.java" type="org.eclipse.swt.custom.PaintObjectListener">
+        <filter id="576720909">
+            <message_arguments>
+                <message_argument value="SWTEventListener"/>
+                <message_argument value="PaintObjectListener"/>
+            </message_arguments>
+        </filter>
+    </resource>
+    <resource path="Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/StyleRange.java" type="org.eclipse.swt.custom.StyleRange">
+        <filter id="576725006">
+            <message_arguments>
+                <message_argument value="CloneableCompatibility"/>
+                <message_argument value="StyleRange"/>
+            </message_arguments>
+        </filter>
+    </resource>
+    <resource path="Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/TextChangeListener.java" type="org.eclipse.swt.custom.TextChangeListener">
+        <filter id="576720909">
+            <message_arguments>
+                <message_argument value="SWTEventListener"/>
+                <message_argument value="TextChangeListener"/>
+            </message_arguments>
+        </filter>
+    </resource>
+    <resource path="Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/VerifyKeyListener.java" type="org.eclipse.swt.custom.VerifyKeyListener">
+        <filter id="576720909">
+            <message_arguments>
+                <message_argument value="SWTEventListener"/>
+                <message_argument value="VerifyKeyListener"/>
+            </message_arguments>
+        </filter>
+    </resource>
+    <resource path="Eclipse SWT Drag and Drop/common/org/eclipse/swt/dnd/DragSourceListener.java" type="org.eclipse.swt.dnd.DragSourceListener">
+        <filter id="576720909">
+            <message_arguments>
+                <message_argument value="SWTEventListener"/>
+                <message_argument value="DragSourceListener"/>
+            </message_arguments>
+        </filter>
+    </resource>
+    <resource path="Eclipse SWT Drag and Drop/common/org/eclipse/swt/dnd/DropTargetListener.java" type="org.eclipse.swt.dnd.DropTargetListener">
+        <filter id="576720909">
+            <message_arguments>
+                <message_argument value="SWTEventListener"/>
+                <message_argument value="DropTargetListener"/>
+            </message_arguments>
+        </filter>
+    </resource>
+    <resource path="Eclipse SWT/cocoa/org/eclipse/swt/graphics/GCData.java" type="org.eclipse.swt.graphics.GCData">
+        <filter id="627060751">
+            <message_arguments>
+                <message_argument value="NSAffineTransform"/>
+                <message_argument value="GCData"/>
+                <message_argument value="inverseTransform"/>
+            </message_arguments>
+        </filter>
+        <filter id="627060751">
+            <message_arguments>
+                <message_argument value="NSAffineTransform"/>
+                <message_argument value="GCData"/>
+                <message_argument value="transform"/>
+            </message_arguments>
+        </filter>
+        <filter id="627060751">
+            <message_arguments>
+                <message_argument value="NSBezierPath"/>
+                <message_argument value="GCData"/>
+                <message_argument value="clipPath"/>
+            </message_arguments>
+        </filter>
+        <filter id="627060751">
+            <message_arguments>
+                <message_argument value="NSBezierPath"/>
+                <message_argument value="GCData"/>
+                <message_argument value="path"/>
+            </message_arguments>
+        </filter>
+        <filter id="627060751">
+            <message_arguments>
+                <message_argument value="NSBezierPath"/>
+                <message_argument value="GCData"/>
+                <message_argument value="visiblePath"/>
+            </message_arguments>
+        </filter>
+        <filter id="627060751">
+            <message_arguments>
+                <message_argument value="NSColor"/>
+                <message_argument value="GCData"/>
+                <message_argument value="bg"/>
+            </message_arguments>
+        </filter>
+        <filter id="627060751">
+            <message_arguments>
+                <message_argument value="NSColor"/>
+                <message_argument value="GCData"/>
+                <message_argument value="fg"/>
+            </message_arguments>
+        </filter>
+        <filter id="627060751">
+            <message_arguments>
+                <message_argument value="NSGraphicsContext"/>
+                <message_argument value="GCData"/>
+                <message_argument value="flippedContext"/>
+            </message_arguments>
+        </filter>
+        <filter id="627060751">
+            <message_arguments>
+                <message_argument value="NSLayoutManager"/>
+                <message_argument value="GCData"/>
+                <message_argument value="layoutManager"/>
+            </message_arguments>
+        </filter>
+        <filter id="627060751">
+            <message_arguments>
+                <message_argument value="NSRect"/>
+                <message_argument value="GCData"/>
+                <message_argument value="paintRect"/>
+            </message_arguments>
+        </filter>
+        <filter id="627060751">
+            <message_arguments>
+                <message_argument value="NSSize"/>
+                <message_argument value="GCData"/>
+                <message_argument value="size"/>
+            </message_arguments>
+        </filter>
+        <filter id="627060751">
+            <message_arguments>
+                <message_argument value="NSTextContainer"/>
+                <message_argument value="GCData"/>
+                <message_argument value="textContainer"/>
+            </message_arguments>
+        </filter>
+        <filter id="627060751">
+            <message_arguments>
+                <message_argument value="NSTextStorage"/>
+                <message_argument value="GCData"/>
+                <message_argument value="textStorage"/>
+            </message_arguments>
+        </filter>
+        <filter id="627060751">
+            <message_arguments>
+                <message_argument value="NSView"/>
+                <message_argument value="GCData"/>
+                <message_argument value="view"/>
+            </message_arguments>
+        </filter>
+    </resource>
+    <resource path="Eclipse SWT/cocoa/org/eclipse/swt/widgets/Widget.java" type="org.eclipse.swt.widgets.Widget">
+        <filter id="643846161">
+            <message_arguments>
+                <message_argument value="SWTEventListener"/>
+                <message_argument value="Widget"/>
+                <message_argument value="removeListener(int, SWTEventListener)"/>
+            </message_arguments>
+        </filter>
+    </resource>
+    <resource path="Eclipse SWT/common/org/eclipse/swt/events/ArmListener.java" type="org.eclipse.swt.events.ArmListener">
+        <filter id="576720909">
+            <message_arguments>
+                <message_argument value="SWTEventListener"/>
+                <message_argument value="ArmListener"/>
+            </message_arguments>
+        </filter>
+    </resource>
+    <resource path="Eclipse SWT/common/org/eclipse/swt/events/ControlListener.java" type="org.eclipse.swt.events.ControlListener">
+        <filter id="576720909">
+            <message_arguments>
+                <message_argument value="SWTEventListener"/>
+                <message_argument value="ControlListener"/>
+            </message_arguments>
+        </filter>
+    </resource>
+    <resource path="Eclipse SWT/common/org/eclipse/swt/events/DisposeListener.java" type="org.eclipse.swt.events.DisposeListener">
+        <filter id="576720909">
+            <message_arguments>
+                <message_argument value="SWTEventListener"/>
+                <message_argument value="DisposeListener"/>
+            </message_arguments>
+        </filter>
+    </resource>
+    <resource path="Eclipse SWT/common/org/eclipse/swt/events/DragDetectListener.java" type="org.eclipse.swt.events.DragDetectListener">
+        <filter id="576720909">
+            <message_arguments>
+                <message_argument value="SWTEventListener"/>
+                <message_argument value="DragDetectListener"/>
+            </message_arguments>
+        </filter>
+    </resource>
+    <resource path="Eclipse SWT/common/org/eclipse/swt/events/ExpandListener.java" type="org.eclipse.swt.events.ExpandListener">
+        <filter id="576720909">
+            <message_arguments>
+                <message_argument value="SWTEventListener"/>
+                <message_argument value="ExpandListener"/>
+            </message_arguments>
+        </filter>
+    </resource>
+    <resource path="Eclipse SWT/common/org/eclipse/swt/events/FocusListener.java" type="org.eclipse.swt.events.FocusListener">
+        <filter id="576720909">
+            <message_arguments>
+                <message_argument value="SWTEventListener"/>
+                <message_argument value="FocusListener"/>
+            </message_arguments>
+        </filter>
+    </resource>
+    <resource path="Eclipse SWT/common/org/eclipse/swt/events/GestureListener.java" type="org.eclipse.swt.events.GestureListener">
+        <filter id="576720909">
+            <message_arguments>
+                <message_argument value="SWTEventListener"/>
+                <message_argument value="GestureListener"/>
+            </message_arguments>
+        </filter>
+    </resource>
+    <resource path="Eclipse SWT/common/org/eclipse/swt/events/HelpListener.java" type="org.eclipse.swt.events.HelpListener">
+        <filter id="576720909">
+            <message_arguments>
+                <message_argument value="SWTEventListener"/>
+                <message_argument value="HelpListener"/>
+            </message_arguments>
+        </filter>
+    </resource>
+    <resource path="Eclipse SWT/common/org/eclipse/swt/events/KeyListener.java" type="org.eclipse.swt.events.KeyListener">
+        <filter id="576720909">
+            <message_arguments>
+                <message_argument value="SWTEventListener"/>
+                <message_argument value="KeyListener"/>
+            </message_arguments>
+        </filter>
+    </resource>
+    <resource path="Eclipse SWT/common/org/eclipse/swt/events/MenuDetectListener.java" type="org.eclipse.swt.events.MenuDetectListener">
+        <filter id="576720909">
+            <message_arguments>
+                <message_argument value="SWTEventListener"/>
+                <message_argument value="MenuDetectListener"/>
+            </message_arguments>
+        </filter>
+    </resource>
+    <resource path="Eclipse SWT/common/org/eclipse/swt/events/MenuListener.java" type="org.eclipse.swt.events.MenuListener">
+        <filter id="576720909">
+            <message_arguments>
+                <message_argument value="SWTEventListener"/>
+                <message_argument value="MenuListener"/>
+            </message_arguments>
+        </filter>
+    </resource>
+    <resource path="Eclipse SWT/common/org/eclipse/swt/events/ModifyListener.java" type="org.eclipse.swt.events.ModifyListener">
+        <filter id="576720909">
+            <message_arguments>
+                <message_argument value="SWTEventListener"/>
+                <message_argument value="ModifyListener"/>
+            </message_arguments>
+        </filter>
+    </resource>
+    <resource path="Eclipse SWT/common/org/eclipse/swt/events/MouseListener.java" type="org.eclipse.swt.events.MouseListener">
+        <filter id="576720909">
+            <message_arguments>
+                <message_argument value="SWTEventListener"/>
+                <message_argument value="MouseListener"/>
+            </message_arguments>
+        </filter>
+    </resource>
+    <resource path="Eclipse SWT/common/org/eclipse/swt/events/MouseMoveListener.java" type="org.eclipse.swt.events.MouseMoveListener">
+        <filter id="576720909">
+            <message_arguments>
+                <message_argument value="SWTEventListener"/>
+                <message_argument value="MouseMoveListener"/>
+            </message_arguments>
+        </filter>
+    </resource>
+    <resource path="Eclipse SWT/common/org/eclipse/swt/events/MouseTrackListener.java" type="org.eclipse.swt.events.MouseTrackListener">
+        <filter id="576720909">
+            <message_arguments>
+                <message_argument value="SWTEventListener"/>
+                <message_argument value="MouseTrackListener"/>
+            </message_arguments>
+        </filter>
+    </resource>
+    <resource path="Eclipse SWT/common/org/eclipse/swt/events/MouseWheelListener.java" type="org.eclipse.swt.events.MouseWheelListener">
+        <filter id="576720909">
+            <message_arguments>
+                <message_argument value="SWTEventListener"/>
+                <message_argument value="MouseWheelListener"/>
+            </message_arguments>
+        </filter>
+    </resource>
+    <resource path="Eclipse SWT/common/org/eclipse/swt/events/PaintListener.java" type="org.eclipse.swt.events.PaintListener">
+        <filter id="576720909">
+            <message_arguments>
+                <message_argument value="SWTEventListener"/>
+                <message_argument value="PaintListener"/>
+            </message_arguments>
+        </filter>
+    </resource>
+    <resource path="Eclipse SWT/common/org/eclipse/swt/events/SelectionListener.java" type="org.eclipse.swt.events.SelectionListener">
+        <filter id="576720909">
+            <message_arguments>
+                <message_argument value="SWTEventListener"/>
+                <message_argument value="SelectionListener"/>
+            </message_arguments>
+        </filter>
+    </resource>
+    <resource path="Eclipse SWT/common/org/eclipse/swt/events/ShellListener.java" type="org.eclipse.swt.events.ShellListener">
+        <filter id="576720909">
+            <message_arguments>
+                <message_argument value="SWTEventListener"/>
+                <message_argument value="ShellListener"/>
+            </message_arguments>
+        </filter>
+    </resource>
+    <resource path="Eclipse SWT/common/org/eclipse/swt/events/TouchListener.java" type="org.eclipse.swt.events.TouchListener">
+        <filter id="576720909">
+            <message_arguments>
+                <message_argument value="SWTEventListener"/>
+                <message_argument value="TouchListener"/>
+            </message_arguments>
+        </filter>
+    </resource>
+    <resource path="Eclipse SWT/common/org/eclipse/swt/events/TraverseListener.java" type="org.eclipse.swt.events.TraverseListener">
+        <filter id="576720909">
+            <message_arguments>
+                <message_argument value="SWTEventListener"/>
+                <message_argument value="TraverseListener"/>
+            </message_arguments>
+        </filter>
+    </resource>
+    <resource path="Eclipse SWT/common/org/eclipse/swt/events/TreeListener.java" type="org.eclipse.swt.events.TreeListener">
+        <filter id="576720909">
+            <message_arguments>
+                <message_argument value="SWTEventListener"/>
+                <message_argument value="TreeListener"/>
+            </message_arguments>
+        </filter>
+    </resource>
+    <resource path="Eclipse SWT/common/org/eclipse/swt/events/VerifyListener.java" type="org.eclipse.swt.events.VerifyListener">
+        <filter id="576720909">
+            <message_arguments>
+                <message_argument value="SWTEventListener"/>
+                <message_argument value="VerifyListener"/>
+            </message_arguments>
+        </filter>
+    </resource>
+    <resource path="Eclipse SWT/common/org/eclipse/swt/graphics/ImageData.java" type="org.eclipse.swt.graphics.ImageData">
+        <filter id="576725006">
+            <message_arguments>
+                <message_argument value="CloneableCompatibility"/>
+                <message_argument value="ImageData"/>
+            </message_arguments>
+        </filter>
+    </resource>
+    <resource path="Eclipse SWT/common/org/eclipse/swt/graphics/ImageLoaderListener.java" type="org.eclipse.swt.graphics.ImageLoaderListener">
+        <filter id="576720909">
+            <message_arguments>
+                <message_argument value="SWTEventListener"/>
+                <message_argument value="ImageLoaderListener"/>
+            </message_arguments>
+        </filter>
+    </resource>
+    <resource path="Eclipse SWT/common/org/eclipse/swt/graphics/Point.java" type="org.eclipse.swt.graphics.Point">
+        <filter id="576725006">
+            <message_arguments>
+                <message_argument value="SerializableCompatibility"/>
+                <message_argument value="Point"/>
+            </message_arguments>
+        </filter>
+    </resource>
+    <resource path="Eclipse SWT/common/org/eclipse/swt/graphics/RGB.java" type="org.eclipse.swt.graphics.RGB">
+        <filter id="576725006">
+            <message_arguments>
+                <message_argument value="SerializableCompatibility"/>
+                <message_argument value="RGB"/>
+            </message_arguments>
+        </filter>
+    </resource>
+    <resource path="Eclipse SWT/common/org/eclipse/swt/graphics/Rectangle.java" type="org.eclipse.swt.graphics.Rectangle">
+        <filter id="576725006">
+            <message_arguments>
+                <message_argument value="SerializableCompatibility"/>
+                <message_argument value="Rectangle"/>
+            </message_arguments>
+        </filter>
+    </resource>
+    <resource path="Eclipse SWT/common/org/eclipse/swt/widgets/TypedListener.java" type="org.eclipse.swt.widgets.TypedListener">
+        <filter id="627060751">
+            <message_arguments>
+                <message_argument value="SWTEventListener"/>
+                <message_argument value="TypedListener"/>
+                <message_argument value="eventListener"/>
+            </message_arguments>
+        </filter>
+        <filter id="643842064">
+            <message_arguments>
+                <message_argument value="SWTEventListener"/>
+                <message_argument value="TypedListener"/>
+                <message_argument value="getEventListener()"/>
+            </message_arguments>
+        </filter>
+    </resource>
 </component>
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/AppKitFull.bridgesupport.extras b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/AppKitFull.bridgesupport.extras
index bc7e0cdc68..612400a52d 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/AppKitFull.bridgesupport.extras
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/AppKitFull.bridgesupport.extras
@@ -1258,6 +1258,9 @@
 		<method selector="locationInWindow" swt_gen="true">
 			<retval swt_gen="true"></retval>
 		</method>
+		<method selector="magnification" swt_gen="true">
+			<retval swt_gen="true"></retval>
+		</method>
 		<method selector="modifierFlags" swt_gen="true">
 			<retval swt_gen="true"></retval>
 		</method>
@@ -1276,9 +1279,17 @@
 			<arg swt_gen="true"></arg>
 			<retval swt_gen="true"></retval>
 		</method>
+		<method selector="rotation" swt_gen="true">
+			<retval swt_gen="true"></retval>
+		</method>
 		<method selector="timestamp" swt_gen="true">
 			<retval swt_gen="true"></retval>
 		</method>
+		<method selector="touchesMatchingPhase:inView:" swt_gen="true">
+			<arg swt_gen="true"></arg>
+			<arg swt_gen="true"></arg>
+			<retval swt_gen="true"></retval>
+		</method>
 		<method selector="type" swt_gen="true">
 			<retval swt_gen="true"></retval>
 		</method>
@@ -2510,6 +2521,10 @@
 		<method selector="becomeFirstResponder" swt_gen="true">
 			<retval swt_gen="true"></retval>
 		</method>
+		<method selector="beginGestureWithEvent:" swt_gen="true">
+			<arg swt_gen="true"></arg>
+			<retval swt_gen="true"></retval>
+		</method>
 		<method selector="cancelOperation:" swt_gen="true">
 			<arg swt_gen="true"></arg>
 			<retval swt_gen="true"></retval>
@@ -2522,6 +2537,10 @@
 			<arg swt_gen="true"></arg>
 			<retval swt_gen="true"></retval>
 		</method>
+		<method selector="endGestureWithEvent:" swt_gen="true">
+			<arg swt_gen="true"></arg>
+			<retval swt_gen="true"></retval>
+		</method>
 		<method selector="flagsChanged:" swt_gen="true">
 			<arg swt_gen="true"></arg>
 			<retval swt_gen="true"></retval>
@@ -2546,6 +2565,10 @@
 			<arg swt_gen="true"></arg>
 			<retval swt_gen="true"></retval>
 		</method>
+		<method selector="magnifyWithEvent:" swt_gen="true">
+			<arg swt_gen="true"></arg>
+			<retval swt_gen="true"></retval>
+		</method>
 		<method selector="mouseDown:" swt_gen="true" swt_gen_super_msgSend="true">
 			<arg swt_gen="true"></arg>
 			<retval swt_gen="true"></retval>
@@ -2625,10 +2648,34 @@
 			<arg swt_gen="true"></arg>
 			<retval swt_gen="true"></retval>
 		</method>
+		<method selector="rotateWithEvent:" swt_gen="true">
+			<arg swt_gen="true"></arg>
+			<retval swt_gen="true"></retval>
+		</method>
 		<method selector="scrollWheel:" swt_gen="true">
 			<arg swt_gen="true"></arg>
 			<retval swt_gen="true"></retval>
 		</method>
+		<method selector="swipeWithEvent:" swt_gen="true">
+			<arg swt_gen="true"></arg>
+			<retval swt_gen="true"></retval>
+		</method>
+		<method selector="touchesBeganWithEvent:" swt_gen="true">
+			<arg swt_gen="true"></arg>
+			<retval swt_gen="true"></retval>
+		</method>
+		<method selector="touchesCancelledWithEvent:" swt_gen="true">
+			<arg swt_gen="true"></arg>
+			<retval swt_gen="true"></retval>
+		</method>
+		<method selector="touchesEndedWithEvent:" swt_gen="true">
+			<arg swt_gen="true"></arg>
+			<retval swt_gen="true"></retval>
+		</method>
+		<method selector="touchesMovedWithEvent:" swt_gen="true">
+			<arg swt_gen="true"></arg>
+			<retval swt_gen="true"></retval>
+		</method>
 		<method selector="validRequestorForSendType:returnType:" swt_gen="true">
 			<arg swt_gen="true"></arg>
 			<arg swt_gen="true"></arg>
@@ -3707,6 +3754,23 @@
 	</class>
 	<class name="NSToolbarItemGroup" swt_superclass="NSToolbarItem">
 	</class>
+	<class name="NSTouch" swt_gen="true">
+		<method selector="device" swt_gen="true">
+			<retval swt_gen="true"></retval>
+		</method>
+		<method selector="deviceSize" swt_gen="true">
+			<retval swt_gen="true"></retval>
+		</method>
+		<method selector="isResting" swt_gen="true">
+			<retval swt_gen="true"></retval>
+		</method>
+		<method selector="normalizedPosition" swt_gen="true">
+			<retval swt_gen="true"></retval>
+		</method>
+		<method selector="phase" swt_gen="true">
+			<retval swt_gen="true"></retval>
+		</method>
+	</class>
 	<class name="NSTrackingArea" swt_gen="mixed">
 		<method selector="initWithRect:options:owner:userInfo:" swt_gen="true">
 			<arg swt_gen="true"></arg>
@@ -3931,6 +3995,10 @@
 			<arg swt_gen="true"></arg>
 			<retval swt_gen="true"></retval>
 		</method>
+		<method selector="setAcceptsTouchEvents:" swt_gen="true">
+			<arg swt_gen="true"></arg>
+			<retval swt_gen="true"></retval>
+		</method>
 		<method selector="setAutoresizesSubviews:" swt_gen="true">
 			<arg swt_gen="true"></arg>
 			<retval swt_gen="true"></retval>
@@ -3975,6 +4043,10 @@
 			<arg swt_gen="true"></arg>
 			<retval swt_gen="true"></retval>
 		</method>
+		<method selector="setWantsRestingTouches:" swt_gen="true">
+			<arg swt_gen="true"></arg>
+			<retval swt_gen="true"></retval>
+		</method>
 		<method selector="shouldDelayWindowOrderingForEvent:" swt_gen="true">
 			<arg swt_gen="true"></arg>
 			<retval swt_gen="true"></retval>
@@ -4614,6 +4686,12 @@
 	<enum name="NSDragOperationNone" swt_gen="true"></enum>
 	<enum name="NSEnterCharacter" swt_gen="true"></enum>
 	<enum name="NSEvenOddWindingRule" swt_gen="true"></enum>
+	<enum name="NSEventTypeBeginGesture" swt_gen="true"></enum>
+	<enum name="NSEventTypeEndGesture" swt_gen="true"></enum>
+	<enum name="NSEventTypeGesture" swt_gen="true"></enum>
+	<enum name="NSEventTypeMagnify" swt_gen="true"></enum>
+	<enum name="NSEventTypeRotate" swt_gen="true"></enum>
+	<enum name="NSEventTypeSwipe" swt_gen="true"></enum>
 	<enum name="NSFileHandlingPanelOKButton" swt_gen="true"></enum>
 	<enum name="NSFlagsChanged" swt_gen="true"></enum>
 	<enum name="NSFocusRingTypeNone" swt_gen="true"></enum>
@@ -4733,6 +4811,14 @@
 	<enum name="NSTextFieldDatePickerStyle" swt_gen="true"></enum>
 	<enum name="NSTitledWindowMask" swt_gen="true"></enum>
 	<enum name="NSToolbarDisplayModeIconOnly" swt_gen="true"></enum>
+	<enum name="NSTouchEventSubtype" swt_gen="true"></enum>
+	<enum name="NSTouchPhaseAny" swt_gen="true"></enum>
+	<enum name="NSTouchPhaseBegan" swt_gen="true"></enum>
+	<enum name="NSTouchPhaseCancelled" swt_gen="true"></enum>
+	<enum name="NSTouchPhaseEnded" swt_gen="true"></enum>
+	<enum name="NSTouchPhaseMoved" swt_gen="true"></enum>
+	<enum name="NSTouchPhaseStationary" swt_gen="true"></enum>
+	<enum name="NSTouchPhaseTouching" swt_gen="true"></enum>
 	<enum name="NSUnderlineStyleDouble" swt_gen="true"></enum>
 	<enum name="NSUnderlineStyleNone" swt_gen="true"></enum>
 	<enum name="NSUnderlineStyleSingle" swt_gen="true"></enum>
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/FoundationFull.bridgesupport.extras b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/FoundationFull.bridgesupport.extras
index e9ff1404b4..40abd86d57 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/FoundationFull.bridgesupport.extras
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/FoundationFull.bridgesupport.extras
@@ -767,6 +767,9 @@
 	<class name="NSScriptClassDescription" swt_superclass="NSClassDescription">
 	</class>
 	<class name="NSSet" swt_gen="mixed">
+		<method selector="allObjects" swt_gen="true">
+			<retval swt_gen="true"></retval>
+		</method>
 		<method selector="count" swt_gen="true">
 			<retval swt_gen="true"></retval>
 		</method>
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSEvent.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSEvent.java
index 60310a78b5..e052654998 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSEvent.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSEvent.java
@@ -69,6 +69,10 @@ public NSPoint locationInWindow() {
 	return result;
 }
 
+public float /*double*/ magnification() {
+	return (float)OS.objc_msgSend_fpret(this.id, OS.sel_magnification);
+}
+
 public int /*long*/ modifierFlags() {
 	return OS.objc_msgSend(this.id, OS.sel_modifierFlags);
 }
@@ -84,10 +88,19 @@ public static NSEvent otherEventWithType(int /*long*/ type, NSPoint location, in
 	return result != 0 ? new NSEvent(result) : null;
 }
 
+public float rotation() {
+	return (float)OS.objc_msgSend_fpret(this.id, OS.sel_rotation);
+}
+
 public double timestamp() {
 	return OS.objc_msgSend_fpret(this.id, OS.sel_timestamp);
 }
 
+public NSSet touchesMatchingPhase(int /*long*/ phase, NSView view) {
+	int /*long*/ result = OS.objc_msgSend(this.id, OS.sel_touchesMatchingPhase_inView_, phase, view != null ? view.id : 0);
+	return result != 0 ? new NSSet(result) : null;
+}
+
 public int /*long*/ type() {
 	return OS.objc_msgSend(this.id, OS.sel_type);
 }
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSResponder.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSResponder.java
index bd48607141..94575b595b 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSResponder.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSResponder.java
@@ -32,6 +32,10 @@ public boolean becomeFirstResponder() {
 	return OS.objc_msgSend_bool(this.id, OS.sel_becomeFirstResponder);
 }
 
+public void beginGestureWithEvent(NSEvent event) {
+	OS.objc_msgSend(this.id, OS.sel_beginGestureWithEvent_, event != null ? event.id : 0);
+}
+
 public void cancelOperation(id sender) {
 	OS.objc_msgSend(this.id, OS.sel_cancelOperation_, sender != null ? sender.id : 0);
 }
@@ -44,6 +48,10 @@ public void doCommandBySelector(int /*long*/ aSelector) {
 	OS.objc_msgSend(this.id, OS.sel_doCommandBySelector_, aSelector);
 }
 
+public void endGestureWithEvent(NSEvent event) {
+	OS.objc_msgSend(this.id, OS.sel_endGestureWithEvent_, event != null ? event.id : 0);
+}
+
 public void flagsChanged(NSEvent theEvent) {
 	OS.objc_msgSend(this.id, OS.sel_flagsChanged_, theEvent != null ? theEvent.id : 0);
 }
@@ -68,6 +76,10 @@ public void keyUp(NSEvent theEvent) {
 	OS.objc_msgSend(this.id, OS.sel_keyUp_, theEvent != null ? theEvent.id : 0);
 }
 
+public void magnifyWithEvent(NSEvent event) {
+	OS.objc_msgSend(this.id, OS.sel_magnifyWithEvent_, event != null ? event.id : 0);
+}
+
 public void mouseDown(NSEvent theEvent) {
 	OS.objc_msgSend(this.id, OS.sel_mouseDown_, theEvent != null ? theEvent.id : 0);
 }
@@ -148,10 +160,34 @@ public void rightMouseUp(NSEvent theEvent) {
 	OS.objc_msgSend(this.id, OS.sel_rightMouseUp_, theEvent != null ? theEvent.id : 0);
 }
 
+public void rotateWithEvent(NSEvent event) {
+	OS.objc_msgSend(this.id, OS.sel_rotateWithEvent_, event != null ? event.id : 0);
+}
+
 public void scrollWheel(NSEvent theEvent) {
 	OS.objc_msgSend(this.id, OS.sel_scrollWheel_, theEvent != null ? theEvent.id : 0);
 }
 
+public void swipeWithEvent(NSEvent event) {
+	OS.objc_msgSend(this.id, OS.sel_swipeWithEvent_, event != null ? event.id : 0);
+}
+
+public void touchesBeganWithEvent(NSEvent event) {
+	OS.objc_msgSend(this.id, OS.sel_touchesBeganWithEvent_, event != null ? event.id : 0);
+}
+
+public void touchesCancelledWithEvent(NSEvent event) {
+	OS.objc_msgSend(this.id, OS.sel_touchesCancelledWithEvent_, event != null ? event.id : 0);
+}
+
+public void touchesEndedWithEvent(NSEvent event) {
+	OS.objc_msgSend(this.id, OS.sel_touchesEndedWithEvent_, event != null ? event.id : 0);
+}
+
+public void touchesMovedWithEvent(NSEvent event) {
+	OS.objc_msgSend(this.id, OS.sel_touchesMovedWithEvent_, event != null ? event.id : 0);
+}
+
 public id validRequestorForSendType(NSString sendType, NSString returnType) {
 	int /*long*/ result = OS.objc_msgSend(this.id, OS.sel_validRequestorForSendType_returnType_, sendType != null ? sendType.id : 0, returnType != null ? returnType.id : 0);
 	return result != 0 ? new id(result) : null;
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSSet.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSSet.java
index ed6afccfe8..998b521d88 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSSet.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSSet.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2000, 2009 IBM Corporation and others.
+ * Copyright (c) 2000, 2010 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -24,6 +24,11 @@ public NSSet(id id) {
 	super(id);
 }
 
+public NSArray allObjects() {
+	int /*long*/ result = OS.objc_msgSend(this.id, OS.sel_allObjects);
+	return result != 0 ? new NSArray(result) : null;
+}
+
 public int /*long*/ count() {
 	return OS.objc_msgSend(this.id, OS.sel_count);
 }
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSTouch.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSTouch.java
new file mode 100644
index 0000000000..891805f75c
--- /dev/null
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSTouch.java
@@ -0,0 +1,52 @@
+/*******************************************************************************
+ * Copyright (c) 2000, 2010 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.swt.internal.cocoa;
+
+public class NSTouch extends NSObject {
+
+public NSTouch() {
+	super();
+}
+
+public NSTouch(int /*long*/ id) {
+	super(id);
+}
+
+public NSTouch(id id) {
+	super(id);
+}
+
+public id device() {
+	int /*long*/ result = OS.objc_msgSend(this.id, OS.sel_device);
+	return result != 0 ? new id(result) : null;
+}
+
+public NSSize deviceSize() {
+	NSSize result = new NSSize();
+	OS.objc_msgSend_stret(result, this.id, OS.sel_deviceSize);
+	return result;
+}
+
+public boolean isResting() {
+	return OS.objc_msgSend_bool(this.id, OS.sel_isResting);
+}
+
+public NSPoint normalizedPosition() {
+	NSPoint result = new NSPoint();
+	OS.objc_msgSend_stret(result, this.id, OS.sel_normalizedPosition);
+	return result;
+}
+
+public int /*long*/ phase() {
+	return OS.objc_msgSend(this.id, OS.sel_phase);
+}
+
+}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSView.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSView.java
index 7292c4c9cc..6d900bbdf3 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSView.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSView.java
@@ -239,6 +239,10 @@ public boolean scrollRectToVisible(NSRect aRect) {
 	return OS.objc_msgSend_bool(this.id, OS.sel_scrollRectToVisible_, aRect);
 }
 
+public void setAcceptsTouchEvents(boolean flag) {
+	OS.objc_msgSend(this.id, OS.sel_setAcceptsTouchEvents_, flag);
+}
+
 public void setAutoresizesSubviews(boolean flag) {
 	OS.objc_msgSend(this.id, OS.sel_setAutoresizesSubviews_, flag);
 }
@@ -283,6 +287,10 @@ public void setToolTip(NSString string) {
 	OS.objc_msgSend(this.id, OS.sel_setToolTip_, string != null ? string.id : 0);
 }
 
+public void setWantsRestingTouches(boolean flag) {
+	OS.objc_msgSend(this.id, OS.sel_setWantsRestingTouches_, flag);
+}
+
 public boolean shouldDelayWindowOrderingForEvent(NSEvent theEvent) {
 	return OS.objc_msgSend_bool(this.id, OS.sel_shouldDelayWindowOrderingForEvent_, theEvent != null ? theEvent.id : 0);
 }
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/OS.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/OS.java
index c6fe06a07f..def4d9b737 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/OS.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/OS.java
@@ -67,7 +67,7 @@ public class OS extends C {
 	public static final int kPMDuplexNoTumble = 0x0002;
 	public static final int kPMDuplexTumble = 0x0003;
 
-
+	public static final int /*long*/ sel_identity = sel_registerName("identity");
 	public static final int /*long*/ sel_sendSearchSelection = sel_registerName("sendSearchSelection");
 	public static final int /*long*/ sel_sendCancelSelection = sel_registerName("sendCancelSelection");
 	public static final int /*long*/ sel_sendSelection = sel_registerName("sendSelection");
@@ -787,6 +787,7 @@ public static final int /*long*/ class_NSTimeZone = objc_getClass("NSTimeZone");
 public static final int /*long*/ class_NSTimer = objc_getClass("NSTimer");
 public static final int /*long*/ class_NSToolbar = objc_getClass("NSToolbar");
 public static final int /*long*/ class_NSToolbarItem = objc_getClass("NSToolbarItem");
+public static final int /*long*/ class_NSTouch = objc_getClass("NSTouch");
 public static final int /*long*/ class_NSTrackingArea = objc_getClass("NSTrackingArea");
 public static final int /*long*/ class_NSTypesetter = objc_getClass("NSTypesetter");
 public static final int /*long*/ class_NSURL = objc_getClass("NSURL");
@@ -904,6 +905,7 @@ public static final int /*long*/ sel_addToolTipRect_owner_userData_ = sel_regist
 public static final int /*long*/ sel_addTypes_owner_ = sel_registerName("addTypes:owner:");
 public static final int /*long*/ sel_alignment = sel_registerName("alignment");
 public static final int /*long*/ sel_allKeys = sel_registerName("allKeys");
+public static final int /*long*/ sel_allObjects = sel_registerName("allObjects");
 public static final int /*long*/ sel_alloc = sel_registerName("alloc");
 public static final int /*long*/ sel_allowsColumnReordering = sel_registerName("allowsColumnReordering");
 public static final int /*long*/ sel_allowsFloats = sel_registerName("allowsFloats");
@@ -958,6 +960,7 @@ public static final int /*long*/ sel_becomeFirstResponder = sel_registerName("be
 public static final int /*long*/ sel_becomeKeyWindow = sel_registerName("becomeKeyWindow");
 public static final int /*long*/ sel_beginDocument = sel_registerName("beginDocument");
 public static final int /*long*/ sel_beginEditing = sel_registerName("beginEditing");
+public static final int /*long*/ sel_beginGestureWithEvent_ = sel_registerName("beginGestureWithEvent:");
 public static final int /*long*/ sel_beginPageInRect_atPlacement_ = sel_registerName("beginPageInRect:atPlacement:");
 public static final int /*long*/ sel_beginSheet_modalForWindow_modalDelegate_didEndSelector_contextInfo_ = sel_registerName("beginSheet:modalForWindow:modalDelegate:didEndSelector:contextInfo:");
 public static final int /*long*/ sel_beginSheetForWindow_modalDelegate_didEndSelector_contextInfo_trust_message_ = sel_registerName("beginSheetForWindow:modalDelegate:didEndSelector:contextInfo:trust:message:");
@@ -1137,7 +1140,9 @@ public static final int /*long*/ sel_deselectItemAtIndex_ = sel_registerName("de
 public static final int /*long*/ sel_deselectRow_ = sel_registerName("deselectRow:");
 public static final int /*long*/ sel_destroyContext = sel_registerName("destroyContext");
 public static final int /*long*/ sel_detail = sel_registerName("detail");
+public static final int /*long*/ sel_device = sel_registerName("device");
 public static final int /*long*/ sel_deviceDescription = sel_registerName("deviceDescription");
+public static final int /*long*/ sel_deviceSize = sel_registerName("deviceSize");
 public static final int /*long*/ sel_dictionary = sel_registerName("dictionary");
 public static final int /*long*/ sel_dictionaryWithCapacity_ = sel_registerName("dictionaryWithCapacity:");
 public static final int /*long*/ sel_dictionaryWithObject_forKey_ = sel_registerName("dictionaryWithObject:forKey:");
@@ -1202,6 +1207,7 @@ public static final int /*long*/ sel_enableFreedObjectCheck_ = sel_registerName(
 public static final int /*long*/ sel_endDocument = sel_registerName("endDocument");
 public static final int /*long*/ sel_endEditing = sel_registerName("endEditing");
 public static final int /*long*/ sel_endEditingFor_ = sel_registerName("endEditingFor:");
+public static final int /*long*/ sel_endGestureWithEvent_ = sel_registerName("endGestureWithEvent:");
 public static final int /*long*/ sel_endPage = sel_registerName("endPage");
 public static final int /*long*/ sel_endSheet_returnCode_ = sel_registerName("endSheet:returnCode:");
 public static final int /*long*/ sel_enterExitEventWithType_location_modifierFlags_timestamp_windowNumber_context_eventNumber_trackingNumber_userData_ = sel_registerName("enterExitEventWithType:location:modifierFlags:timestamp:windowNumber:context:eventNumber:trackingNumber:userData:");
@@ -1374,6 +1380,7 @@ public static final int /*long*/ sel_isMainWindow = sel_registerName("isMainWind
 public static final int /*long*/ sel_isMiniaturized = sel_registerName("isMiniaturized");
 public static final int /*long*/ sel_isOpaque = sel_registerName("isOpaque");
 public static final int /*long*/ sel_isPlanar = sel_registerName("isPlanar");
+public static final int /*long*/ sel_isResting = sel_registerName("isResting");
 public static final int /*long*/ sel_isRowSelected_ = sel_registerName("isRowSelected:");
 public static final int /*long*/ sel_isRunning = sel_registerName("isRunning");
 public static final int /*long*/ sel_isSessionOnly = sel_registerName("isSessionOnly");
@@ -1413,6 +1420,8 @@ public static final int /*long*/ sel_locationForGlyphAtIndex_ = sel_registerName
 public static final int /*long*/ sel_locationInWindow = sel_registerName("locationInWindow");
 public static final int /*long*/ sel_lockFocus = sel_registerName("lockFocus");
 public static final int /*long*/ sel_lowercaseString = sel_registerName("lowercaseString");
+public static final int /*long*/ sel_magnification = sel_registerName("magnification");
+public static final int /*long*/ sel_magnifyWithEvent_ = sel_registerName("magnifyWithEvent:");
 public static final int /*long*/ sel_mainBundle = sel_registerName("mainBundle");
 public static final int /*long*/ sel_mainFrame = sel_registerName("mainFrame");
 public static final int /*long*/ sel_mainMenu = sel_registerName("mainMenu");
@@ -1469,6 +1478,7 @@ public static final int /*long*/ sel_nextObject = sel_registerName("nextObject")
 public static final int /*long*/ sel_nextState = sel_registerName("nextState");
 public static final int /*long*/ sel_nextWordFromIndex_forward_ = sel_registerName("nextWordFromIndex:forward:");
 public static final int /*long*/ sel_noResponderFor_ = sel_registerName("noResponderFor:");
+public static final int /*long*/ sel_normalizedPosition = sel_registerName("normalizedPosition");
 public static final int /*long*/ sel_noteNumberOfRowsChanged = sel_registerName("noteNumberOfRowsChanged");
 public static final int /*long*/ sel_numberOfColumns = sel_registerName("numberOfColumns");
 public static final int /*long*/ sel_numberOfComponents = sel_registerName("numberOfComponents");
@@ -1548,6 +1558,7 @@ public static final int /*long*/ sel_performDragOperation_ = sel_registerName("p
 public static final int /*long*/ sel_performKeyEquivalent_ = sel_registerName("performKeyEquivalent:");
 public static final int /*long*/ sel_performSelector_withObject_afterDelay_inModes_ = sel_registerName("performSelector:withObject:afterDelay:inModes:");
 public static final int /*long*/ sel_performSelectorOnMainThread_withObject_waitUntilDone_ = sel_registerName("performSelectorOnMainThread:withObject:waitUntilDone:");
+public static final int /*long*/ sel_phase = sel_registerName("phase");
 public static final int /*long*/ sel_pixelsHigh = sel_registerName("pixelsHigh");
 public static final int /*long*/ sel_pixelsWide = sel_registerName("pixelsWide");
 public static final int /*long*/ sel_pointSize = sel_registerName("pointSize");
@@ -1636,6 +1647,8 @@ public static final int /*long*/ sel_rightMouseDown_ = sel_registerName("rightMo
 public static final int /*long*/ sel_rightMouseDragged_ = sel_registerName("rightMouseDragged:");
 public static final int /*long*/ sel_rightMouseUp_ = sel_registerName("rightMouseUp:");
 public static final int /*long*/ sel_rotateByDegrees_ = sel_registerName("rotateByDegrees:");
+public static final int /*long*/ sel_rotateWithEvent_ = sel_registerName("rotateWithEvent:");
+public static final int /*long*/ sel_rotation = sel_registerName("rotation");
 public static final int /*long*/ sel_rowAtPoint_ = sel_registerName("rowAtPoint:");
 public static final int /*long*/ sel_rowForItem_ = sel_registerName("rowForItem:");
 public static final int /*long*/ sel_rowHeight = sel_registerName("rowHeight");
@@ -1692,6 +1705,7 @@ public static final int /*long*/ sel_sender = sel_registerName("sender");
 public static final int /*long*/ sel_separatorItem = sel_registerName("separatorItem");
 public static final int /*long*/ sel_set = sel_registerName("set");
 public static final int /*long*/ sel_setAcceptsMouseMovedEvents_ = sel_registerName("setAcceptsMouseMovedEvents:");
+public static final int /*long*/ sel_setAcceptsTouchEvents_ = sel_registerName("setAcceptsTouchEvents:");
 public static final int /*long*/ sel_setAccessoryView_ = sel_registerName("setAccessoryView:");
 public static final int /*long*/ sel_setAction_ = sel_registerName("setAction:");
 public static final int /*long*/ sel_setAlertStyle_ = sel_registerName("setAlertStyle:");
@@ -1946,6 +1960,7 @@ public static final int /*long*/ sel_setValueWraps_ = sel_registerName("setValue
 public static final int /*long*/ sel_setVerticalScroller_ = sel_registerName("setVerticalScroller:");
 public static final int /*long*/ sel_setView_ = sel_registerName("setView:");
 public static final int /*long*/ sel_setVisible_ = sel_registerName("setVisible:");
+public static final int /*long*/ sel_setWantsRestingTouches_ = sel_registerName("setWantsRestingTouches:");
 public static final int /*long*/ sel_setWidth_ = sel_registerName("setWidth:");
 public static final int /*long*/ sel_setWidth_forSegment_ = sel_registerName("setWidth:forSegment:");
 public static final int /*long*/ sel_setWidthTracksTextView_ = sel_registerName("setWidthTracksTextView:");
@@ -2001,6 +2016,7 @@ public static final int /*long*/ sel_submenu = sel_registerName("submenu");
 public static final int /*long*/ sel_subviews = sel_registerName("subviews");
 public static final int /*long*/ sel_superclass = sel_registerName("superclass");
 public static final int /*long*/ sel_superview = sel_registerName("superview");
+public static final int /*long*/ sel_swipeWithEvent_ = sel_registerName("swipeWithEvent:");
 public static final int /*long*/ sel_systemFontOfSize_ = sel_registerName("systemFontOfSize:");
 public static final int /*long*/ sel_systemFontSize = sel_registerName("systemFontSize");
 public static final int /*long*/ sel_systemFontSizeForControlSize_ = sel_registerName("systemFontSizeForControlSize:");
@@ -2058,6 +2074,11 @@ public static final int /*long*/ sel_toolbarDefaultItemIdentifiers_ = sel_regist
 public static final int /*long*/ sel_toolbarDidRemoveItem_ = sel_registerName("toolbarDidRemoveItem:");
 public static final int /*long*/ sel_toolbarSelectableItemIdentifiers_ = sel_registerName("toolbarSelectableItemIdentifiers:");
 public static final int /*long*/ sel_toolbarWillAddItem_ = sel_registerName("toolbarWillAddItem:");
+public static final int /*long*/ sel_touchesBeganWithEvent_ = sel_registerName("touchesBeganWithEvent:");
+public static final int /*long*/ sel_touchesCancelledWithEvent_ = sel_registerName("touchesCancelledWithEvent:");
+public static final int /*long*/ sel_touchesEndedWithEvent_ = sel_registerName("touchesEndedWithEvent:");
+public static final int /*long*/ sel_touchesMatchingPhase_inView_ = sel_registerName("touchesMatchingPhase:inView:");
+public static final int /*long*/ sel_touchesMovedWithEvent_ = sel_registerName("touchesMovedWithEvent:");
 public static final int /*long*/ sel_trackingAreas = sel_registerName("trackingAreas");
 public static final int /*long*/ sel_traitsOfFont_ = sel_registerName("traitsOfFont:");
 public static final int /*long*/ sel_transform = sel_registerName("transform");
@@ -2216,6 +2237,12 @@ public static final int NSDragOperationMove = 16;
 public static final int NSDragOperationNone = 0;
 public static final int NSEnterCharacter = 3;
 public static final int NSEvenOddWindingRule = 1;
+public static final int NSEventTypeBeginGesture = 19;
+public static final int NSEventTypeEndGesture = 20;
+public static final int NSEventTypeGesture = 29;
+public static final int NSEventTypeMagnify = 30;
+public static final int NSEventTypeRotate = 18;
+public static final int NSEventTypeSwipe = 31;
 public static final int NSFileHandlingPanelOKButton = 1;
 public static final int NSFlagsChanged = 12;
 public static final int NSFocusRingTypeNone = 1;
@@ -2335,6 +2362,14 @@ public static final int NSTextFieldAndStepperDatePickerStyle = 0;
 public static final int NSTextFieldDatePickerStyle = 2;
 public static final int NSTitledWindowMask = 1;
 public static final int NSToolbarDisplayModeIconOnly = 2;
+public static final int NSTouchEventSubtype = 3;
+public static final int NSTouchPhaseAny = -1;
+public static final int NSTouchPhaseBegan = 1;
+public static final int NSTouchPhaseCancelled = 16;
+public static final int NSTouchPhaseEnded = 8;
+public static final int NSTouchPhaseMoved = 2;
+public static final int NSTouchPhaseStationary = 4;
+public static final int NSTouchPhaseTouching = 7;
 public static final int NSUnderlineStyleDouble = 9;
 public static final int NSUnderlineStyleNone = 0;
 public static final int NSUnderlineStyleSingle = 1;
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/carbon/org/eclipse/swt/widgets/Control.java b/bundles/org.eclipse.swt/Eclipse SWT/carbon/org/eclipse/swt/widgets/Control.java
index cdbc2f5d54..0d64d425c7 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/carbon/org/eclipse/swt/widgets/Control.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/carbon/org/eclipse/swt/widgets/Control.java
@@ -213,6 +213,30 @@ public void addFocusListener(FocusListener listener) {
 }
 
 /**
+ * Removes the listener from the collection of listeners who will
+ * be notified when gesture events are generated for the control.
+ *
+ * @param listener the listener which should no longer be notified
+ *
+ * @exception IllegalArgumentException <ul>
+ *    <li>ERROR_NULL_ARGUMENT - if the listener is null</li>
+ * </ul>
+ * @exception SWTException <ul>
+ *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
+ *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
+ * </ul>
+ *
+ * @see GestureListener
+ * @see #addGestureListener
+ */
+public void addGestureListener (GestureListener listener) {
+	checkWidget();
+	if (listener == null) error (SWT.ERROR_NULL_ARGUMENT);
+	TypedListener typedListener = new TypedListener (listener);
+	addListener (SWT.Gesture, typedListener);
+}
+
+/**
  * Adds the listener to the collection of listeners who will
  * be notified when help events are generated for the control,
  * by sending it one of the messages defined in the
@@ -2680,6 +2704,31 @@ public void removeFocusListener(FocusListener listener) {
 
 /**
  * Removes the listener from the collection of listeners who will
+ * be notified when a gesture is performed on the control
+ *
+ * @param listener the listener which should no longer be notified
+ *
+ * @exception IllegalArgumentException <ul>
+ *    <li>ERROR_NULL_ARGUMENT - if the listener is null</li>
+ * </ul>
+ * @exception SWTException <ul>
+ *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
+ *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
+ * </ul>
+ *
+ * @see GestureListener
+ * @see #addGestureListener
+ * @since 3.7
+ */
+public void removeGestureListener (GestureListener listener) {
+	checkWidget();
+	if (listener == null) error (SWT.ERROR_NULL_ARGUMENT);
+	if (eventTable == null) return;
+	eventTable.unhook(SWT.Gesture, listener);
+}
+
+/**
+ * Removes the listener from the collection of listeners who will
  * be notified when the help events are generated for the control.
  *
  * @param listener the listener which should no longer be notified
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Composite.java b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Composite.java
index 3d9df043ce..a7ff638e64 100755
--- a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Composite.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Composite.java
@@ -941,6 +941,9 @@ void scrollWheel (int /*long*/ id, int /*long*/ sel, int /*long*/ theEvent) {
 			NSEvent nsEvent = new NSEvent(theEvent);
 			boolean handled = false;
 			float /*double*/ delta = nsEvent.deltaY();
+			if (display.gestureStarted) {
+				if (!sendGestureEvent(nsEvent, SWT.GESTURE_PAN, true)) handled = true;						
+			}
 			if (delta != 0) {
 				boolean doit = true;
 				if (hooks (SWT.MouseWheel) || filters (SWT.MouseWheel)) {
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Control.java b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Control.java
index 94b0ad1141..e72bdd255b 100755
--- a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Control.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Control.java
@@ -385,6 +385,30 @@ public void addFocusListener(FocusListener listener) {
 }
 
 /**
+ * Removes the listener from the collection of listeners who will
+ * be notified when gesture events are generated for the control.
+ *
+ * @param listener the listener which should no longer be notified
+ *
+ * @exception IllegalArgumentException <ul>
+ *    <li>ERROR_NULL_ARGUMENT - if the listener is null</li>
+ * </ul>
+ * @exception SWTException <ul>
+ *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
+ *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
+ * </ul>
+ *
+ * @see GestureListener
+ * @see #addGestureListener
+ */
+public void addGestureListener (GestureListener listener) {
+	checkWidget();
+	if (listener == null) error (SWT.ERROR_NULL_ARGUMENT);
+	TypedListener typedListener = new TypedListener (listener);
+	addListener (SWT.Gesture, typedListener);
+}
+
+/**
  * Adds the listener to the collection of listeners who will
  * be notified when help events are generated for the control,
  * by sending it one of the messages defined in the
@@ -658,6 +682,16 @@ boolean becomeFirstResponder (int /*long*/ id, int /*long*/ sel) {
 	return super.becomeFirstResponder (id, sel);
 }
 
+void beginGestureWithEvent (int /*long*/ id, int /*long*/ sel, int /*long*/ event) {
+	if (!gestureEvent(id, sel, event, SWT.GESTURE_BEGIN)) return;
+	super.beginGestureWithEvent(id, sel, event);
+}
+
+void endGestureWithEvent (int /*long*/ id, int /*long*/ sel, int /*long*/ event) {
+	if (!gestureEvent(id, sel, event, SWT.GESTURE_END)) return;
+	super.endGestureWithEvent(id, sel, event);
+}
+
 void calculateVisibleRegion (NSView view, int /*long*/ visibleRgn, boolean clipChildren) {
 	int /*long*/ tempRgn = OS.NewRgn ();
 	if (!view.isHiddenOrHasHiddenAncestor() && isDrawing()) {
@@ -1351,6 +1385,17 @@ boolean forceFocus (NSView focusView) {
 	return view.window ().makeFirstResponder (focusView);
 }
 
+boolean gestureEvent(int /*long*/ id, int /*long*/ sel, int /*long*/ event, int detail) {
+	// For cross-platform compatibility, touch events and gestures are mutually exclusive.
+	// Don't send a gesture if touch events are enabled for this control.
+//	if (touchEnabled) return true;
+	if (!display.sendEvent) return true;
+	display.sendEvent = false;
+	if (!isEventView (id)) return true;
+	NSEvent nsEvent = new NSEvent(event);
+	return sendGestureEvent (nsEvent, detail, true);	
+}
+
 /**
  * Returns the accessible object for the receiver.
  * If this is the first time this object is requested,
@@ -2193,6 +2238,11 @@ void keyUp (int /*long*/ id, int /*long*/ sel, int /*long*/ theEvent) {
 	super.keyUp (id, sel, theEvent);
 }
 
+void magnifyWithEvent(int /*long*/ id, int /*long*/ sel, int /*long*/ event) {
+	if (!gestureEvent(id, sel, event, SWT.GESTURE_MAGNIFY)) return;
+	super.magnifyWithEvent(id, sel, event);	
+}
+
 void markLayout (boolean changed, boolean all) {
 	/* Do nothing */
 }
@@ -2229,8 +2279,13 @@ Decorations menuShell () {
 void scrollWheel (int /*long*/ id, int /*long*/ sel, int /*long*/ theEvent) {
 	boolean handled = false;
 	if (id == view.id) {
+		NSEvent nsEvent = new NSEvent(theEvent);
+		if (display.gestureStarted && hooks(SWT.Gesture)) {
+			if (!sendGestureEvent(nsEvent, SWT.GESTURE_PAN, true)) {
+				handled = true;						
+			}
+		}
 		if (hooks (SWT.MouseWheel) || filters (SWT.MouseWheel)) {
-			NSEvent nsEvent = new NSEvent(theEvent);
 			if (nsEvent.deltaY() != 0) {
 				if (!sendMouseEvent(nsEvent, SWT.MouseWheel, true)) {
 					handled = true;
@@ -2238,7 +2293,6 @@ void scrollWheel (int /*long*/ id, int /*long*/ sel, int /*long*/ theEvent) {
 			}
 		}
 		if (hooks (SWT.MouseHorizontalWheel) || filters (SWT.MouseHorizontalWheel)) {
-			NSEvent nsEvent = new NSEvent(theEvent);
 			if (nsEvent.deltaX() != 0) {
 				if (!sendMouseEvent(nsEvent, SWT.MouseHorizontalWheel, true)) {
 					handled = true;
@@ -2728,6 +2782,31 @@ public void removeFocusListener(FocusListener listener) {
 
 /**
  * Removes the listener from the collection of listeners who will
+ * be notified when a gesture is performed on the control
+ *
+ * @param listener the listener which should no longer be notified
+ *
+ * @exception IllegalArgumentException <ul>
+ *    <li>ERROR_NULL_ARGUMENT - if the listener is null</li>
+ * </ul>
+ * @exception SWTException <ul>
+ *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
+ *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
+ * </ul>
+ *
+ * @see GestureListener
+ * @see #addGestureListener
+ * @since 3.7
+ */
+public void removeGestureListener (GestureListener listener) {
+	checkWidget();
+	if (listener == null) error (SWT.ERROR_NULL_ARGUMENT);
+	if (eventTable == null) return;
+	eventTable.unhook(SWT.Gesture, listener);
+}
+
+/**
+ * Removes the listener from the collection of listeners who will
  * be notified when the help events are generated for the control.
  *
  * @param listener the listener which should no longer be notified
@@ -2994,6 +3073,11 @@ void resized () {
 	sendEvent (SWT.Resize);
 }
 
+void rotateWithEvent(int /*long*/ id, int /*long*/ sel, int /*long*/ event) {
+	if (!gestureEvent(id, sel, event, SWT.GESTURE_ROTATE)) return;
+	super.rotateWithEvent(id, sel, event);	
+}
+
 boolean sendDragEvent (int button, int stateMask, int x, int y) {
 	Event event = new Event ();
 	event.button = button;
@@ -3035,6 +3119,56 @@ void sendFocusEvent (int type) {
 	}
 }
 
+boolean sendGestureEvent (NSEvent nsEvent, int detail, boolean send) {
+	Event event = new Event ();
+	NSPoint windowPoint;
+	NSView view = eventView ();
+	windowPoint = nsEvent.locationInWindow();
+	NSPoint point = view.convertPoint_fromView_(windowPoint, null);
+	if (!view.isFlipped ()) {
+		point.y = view.bounds().height - point.y;
+	}
+	event.x = (int) point.x;
+	event.y = (int) point.y;
+	setInputState (event, nsEvent, SWT.Gesture);
+	event.detail = detail;
+
+	if (detail == SWT.GESTURE_BEGIN) {
+		display.gestureStarted = true;
+		display.rotation = 0.0;
+		display.magnification = 1.0;
+	} else if (detail == SWT.GESTURE_END) {
+		display.gestureStarted = false;
+	}
+	
+	switch (detail) {	
+	case SWT.GESTURE_SWIPE:
+		event.xDirection = (int) -nsEvent.deltaX();
+		event.yDirection = (int) -nsEvent.deltaY();
+		break;
+	case SWT.GESTURE_ROTATE: {	
+		display.rotation += nsEvent.rotation();
+		event.rotation = display.rotation;
+		break;
+	}
+	case SWT.GESTURE_MAGNIFY:
+		display.magnification += nsEvent.magnification();
+		event.magnification = display.magnification;
+		break;
+	case SWT.GESTURE_PAN:
+		// Panning increment is expressed in terms of the direction of movement,
+		// not in terms of scrolling increment.
+		event.xDirection = (int) -nsEvent.deltaX();
+		event.yDirection = (int) -nsEvent.deltaY();
+		break;
+	}
+
+	event.doit = true;
+	sendEvent (SWT.Gesture, event);
+	if (isDisposed ()) return false;
+	return event.doit;
+}
+
 boolean sendMouseEvent (NSEvent nsEvent, int type, boolean send) {
 	Shell shell = null;
 	Event event = new Event ();
@@ -3944,6 +4078,11 @@ void sort (int [] items) {
 	}
 }
 
+void swipeWithEvent(int /*long*/ id, int /*long*/ sel, int /*long*/ event) {
+	if (!gestureEvent(id, sel, event, SWT.GESTURE_SWIPE)) return;
+	super.swipeWithEvent(id, sel, event);
+}
+
 NSSize textExtent (String string) {
 	NSAttributedString attribStr = createString(string, null, null, 0, false, true, false);
 	NSSize size = attribStr.size();
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Display.java b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Display.java
index a803944620..43874f46f0 100755
--- a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Display.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Display.java
@@ -104,6 +104,11 @@ public class Display extends Device {
 	boolean disposing;
 	int sendEventCount;
 
+	/* gesture event state */
+	double rotation;
+	double magnification;
+	boolean gestureStarted;
+
 	/* Key event management */
 	int [] deadKeyState = new int[1];
 	int currentKeyboardUCHRdata;
@@ -2130,6 +2135,16 @@ void addEventMethods (int /*long*/ cls, int /*long*/ proc2, int /*long*/ proc3,
 		OS.class_addMethod(cls, OS.sel_acceptsFirstMouse_, proc3, "@:@");
 		OS.class_addMethod(cls, OS.sel_changeColor_, proc3, "@:@");
 		OS.class_addMethod(cls, OS.sel_cancelOperation_, proc3, "@:@");
+		OS.class_addMethod(cls, OS.sel_touchesBeganWithEvent_, proc3, "@:@");
+		OS.class_addMethod(cls, OS.sel_touchesMovedWithEvent_, proc3, "@:@");
+		OS.class_addMethod(cls, OS.sel_touchesEndedWithEvent_, proc3, "@:@");
+		OS.class_addMethod(cls, OS.sel_touchesCancelledWithEvent_, proc3, "@:@");
+		OS.class_addMethod(cls, OS.sel_beginGestureWithEvent_, proc3, "@:@");
+		OS.class_addMethod(cls, OS.sel_endGestureWithEvent_, proc3, "@:@");
+		OS.class_addMethod(cls, OS.sel_swipeWithEvent_, proc3, "@:@");
+		OS.class_addMethod(cls, OS.sel_rotateWithEvent_, proc3, "@:@");
+		OS.class_addMethod(cls, OS.sel_magnifyWithEvent_, proc3, "@:@");
+		
 	}
 	if (proc2 != 0) {
 		OS.class_addMethod(cls, OS.sel_resignFirstResponder, proc2, "@:");
@@ -4774,6 +4789,7 @@ void applicationSendEvent (int /*long*/ id, int /*long*/ sel, int /*long*/ event
 		case OS.NSKeyDown:
 		case OS.NSKeyUp:
 		case OS.NSScrollWheel:
+		// TODO:  Add touch detection here...
 			if (window != null) {
 				Shell shell = (Shell) getWidget (window.id);
 				if (shell != null) {
@@ -5436,6 +5452,24 @@ static int /*long*/ windowProc(int /*long*/ id, int /*long*/ sel, int /*long*/ a
 		widget.windowDidMiniturize(id, sel, arg0);
 	} else if (sel == OS.sel_windowDidDeminiaturize_) {
 		widget.windowDidDeminiturize(id, sel, arg0);
+	} else if (sel == OS.sel_touchesBeganWithEvent_) {
+		widget.touchesBeganWithEvent(id, sel, arg0);
+	} else if (sel == OS.sel_touchesMovedWithEvent_) {
+		widget.touchesMovedWithEvent(id, sel, arg0);
+	} else if (sel == OS.sel_touchesEndedWithEvent_) {
+		widget.touchesEndedWithEvent(id, sel, arg0);
+	} else if (sel == OS.sel_touchesCancelledWithEvent_) {
+		widget.touchesCancelledWithEvent(id, sel, arg0);
+	} else if (sel == OS.sel_beginGestureWithEvent_) {
+		widget.beginGestureWithEvent(id, sel, arg0);
+	} else if (sel == OS.sel_endGestureWithEvent_) {
+		widget.endGestureWithEvent(id, sel, arg0);
+	} else if (sel == OS.sel_swipeWithEvent_) {
+		widget.swipeWithEvent(id, sel, arg0);
+	} else if (sel == OS.sel_magnifyWithEvent_) {
+		widget.magnifyWithEvent(id, sel, arg0);
+	} else if (sel == OS.sel_rotateWithEvent_) {
+		widget.rotateWithEvent(id, sel, arg0);
 	} else if (sel == OS.sel_toolbarAllowedItemIdentifiers_) {
 		return widget.toolbarAllowedItemIdentifiers(id, sel, arg0);
 	} else if (sel == OS.sel_toolbarDefaultItemIdentifiers_) {
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Widget.java b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Widget.java
index adfa2052a6..32fdb97187 100755
--- a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Widget.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Widget.java
@@ -1666,6 +1666,7 @@ boolean setInputState (Event event, NSEvent nsEvent, int type) {
 		case OS.NSScrollWheel:
 		case OS.NSKeyDown:
 		case OS.NSKeyUp:
+		case OS.NSEventTypeGesture:
 			int state = OS.GetCurrentButtonState ();
 			if ((state & 0x1) != 0) event.stateMask |= SWT.BUTTON1;
 			if ((state & 0x2) != 0) event.stateMask |= SWT.BUTTON3;
@@ -1698,6 +1699,7 @@ boolean setInputState (Event event, NSEvent nsEvent, int type) {
 			if (event.keyCode == SWT.COMMAND) event.stateMask &= ~SWT.COMMAND;
 			break;
 		case SWT.KeyUp:
+		case SWT.Gesture:
 			if (event.keyCode == SWT.ALT) event.stateMask |= SWT.ALT;
 			if (event.keyCode == SWT.SHIFT) event.stateMask |= SWT.SHIFT;
 			if (event.keyCode == SWT.CONTROL) event.stateMask |= SWT.CONTROL;
@@ -1987,6 +1989,42 @@ public String toString () {
 	return getName () + " {" + string + "}";
 }
 
+void touchesBeganWithEvent (int /*long*/ id, int /*long*/ sel, int /*long*/ event) {
+	callSuper(id, sel, event);	
+}
+
+void touchesCancelledWithEvent (int /*long*/ id, int /*long*/ sel, int /*long*/ event) {
+	callSuper(id, sel, event);	
+}
+
+void touchesEndedWithEvent (int /*long*/ id, int /*long*/ sel, int /*long*/ event) {
+	callSuper(id, sel, event);	
+}
+
+void touchesMovedWithEvent (int /*long*/ id, int /*long*/ sel, int /*long*/ event) {
+	callSuper(id, sel, event);	
+}
+
+void beginGestureWithEvent (int /*long*/ id, int /*long*/ sel, int /*long*/ event) {
+	callSuper(id, sel, event);	
+}
+
+void endGestureWithEvent (int /*long*/ id, int /*long*/ sel, int /*long*/ event) {
+	callSuper(id, sel, event);	
+}
+
+void magnifyWithEvent (int /*long*/ id, int /*long*/ sel, int /*long*/ event) {
+	callSuper(id, sel, event);	
+}
+
+void rotateWithEvent(int /*long*/ id, int /*long*/ sel, int /*long*/ event) {
+	callSuper(id, sel, event);	
+}
+
+void swipeWithEvent(int /*long*/ id, int /*long*/ sel, int /*long*/ event) {
+	callSuper(id, sel, event);	
+}
+
 void resetCursorRects (int /*long*/ id, int /*long*/ sel) {
 	callSuper (id, sel);
 }
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 3bf7099068..49c2aeb309 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
@@ -1389,6 +1389,30 @@ public void addFocusListener(FocusListener listener) {
 }
 
 /**
+ * Removes the listener from the collection of listeners who will
+ * be notified when gesture events are generated for the control.
+ *
+ * @param listener the listener which should no longer be notified
+ *
+ * @exception IllegalArgumentException <ul>
+ *    <li>ERROR_NULL_ARGUMENT - if the listener is null</li>
+ * </ul>
+ * @exception SWTException <ul>
+ *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
+ *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
+ * </ul>
+ *
+ * @see GestureListener
+ * @see #addGestureListener
+ */
+public void addGestureListener (GestureListener listener) {
+	checkWidget();
+	if (listener == null) error (SWT.ERROR_NULL_ARGUMENT);
+	TypedListener typedListener = new TypedListener (listener);
+	addListener (SWT.Gesture, typedListener);
+}
+
+/**
  * Adds the listener to the collection of listeners who will
  * be notified when help events are generated for the control,
  * by sending it one of the messages defined in the
@@ -1722,6 +1746,30 @@ public void removeFocusListener(FocusListener listener) {
 }
 /**
  * Removes the listener from the collection of listeners who will
+ * be notified when a gesture is performed on the control
+ *
+ * @param listener the listener which should no longer be notified
+ *
+ * @exception IllegalArgumentException <ul>
+ *    <li>ERROR_NULL_ARGUMENT - if the listener is null</li>
+ * </ul>
+ * @exception SWTException <ul>
+ *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
+ *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
+ * </ul>
+ *
+ * @see GestureListener
+ * @see #addGestureListener
+ * @since 3.7
+ */
+public void removeGestureListener (GestureListener listener) {
+	checkWidget();
+	if (listener == null) error (SWT.ERROR_NULL_ARGUMENT);
+	if (eventTable == null) return;
+	eventTable.unhook(SWT.Gesture, listener);
+}
+/**
+ * Removes the listener from the collection of listeners who will
  * be notified when the help events are generated for the control.
  *
  * @param listener the listener which should no longer be notified
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/widgets/Control.java b/bundles/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/widgets/Control.java
index 7a704b3ac0..4c6bd9e656 100755
--- a/bundles/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/widgets/Control.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/widgets/Control.java
@@ -171,6 +171,29 @@ public void addFocusListener(FocusListener listener) {
 	addListener(SWT.FocusOut,typedListener);
 }
 /**
+ * Removes the listener from the collection of listeners who will
+ * be notified when gesture events are generated for the control.
+ *
+ * @param listener the listener which should no longer be notified
+ *
+ * @exception IllegalArgumentException <ul>
+ *    <li>ERROR_NULL_ARGUMENT - if the listener is null</li>
+ * </ul>
+ * @exception SWTException <ul>
+ *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
+ *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
+ * </ul>
+ *
+ * @see GestureListener
+ * @see #addGestureListener
+ */
+public void addGestureListener (GestureListener listener) {
+	checkWidget();
+	if (listener == null) error (SWT.ERROR_NULL_ARGUMENT);
+	TypedListener typedListener = new TypedListener (listener);
+	addListener (SWT.Gesture, typedListener);
+}
+/**
  * Adds the listener to the collection of listeners who will
  * be notified when help events are generated for the control,
  * by sending it one of the messages defined in the
@@ -1927,6 +1950,30 @@ public void removeFocusListener(FocusListener listener) {
 }
 /**
  * Removes the listener from the collection of listeners who will
+ * be notified when a gesture is performed on the control
+ *
+ * @param listener the listener which should no longer be notified
+ *
+ * @exception IllegalArgumentException <ul>
+ *    <li>ERROR_NULL_ARGUMENT - if the listener is null</li>
+ * </ul>
+ * @exception SWTException <ul>
+ *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
+ *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
+ * </ul>
+ *
+ * @see GestureListener
+ * @see #addGestureListener
+ * @since 3.7
+ */
+public void removeGestureListener (GestureListener listener) {
+	checkWidget();
+	if (listener == null) error (SWT.ERROR_NULL_ARGUMENT);
+	if (eventTable == null) return;
+	eventTable.unhook(SWT.Gesture, listener);
+}
+/**
+ * Removes the listener from the collection of listeners who will
  * be notified when the help events are generated for the control.
  *
  * @param listener the listener which should no longer be notified
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/photon/org/eclipse/swt/widgets/Control.java b/bundles/org.eclipse.swt/Eclipse SWT/photon/org/eclipse/swt/widgets/Control.java
index 2dffaa1725..d6fb41588e 100755
--- a/bundles/org.eclipse.swt/Eclipse SWT/photon/org/eclipse/swt/widgets/Control.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/photon/org/eclipse/swt/widgets/Control.java
@@ -176,6 +176,30 @@ public void addFocusListener (FocusListener listener) {
 }
 
 /**
+ * Removes the listener from the collection of listeners who will
+ * be notified when gesture events are generated for the control.
+ *
+ * @param listener the listener which should no longer be notified
+ *
+ * @exception IllegalArgumentException <ul>
+ *    <li>ERROR_NULL_ARGUMENT - if the listener is null</li>
+ * </ul>
+ * @exception SWTException <ul>
+ *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
+ *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
+ * </ul>
+ *
+ * @see GestureListener
+ * @see #addGestureListener
+ */
+public void addGestureListener (GestureListener listener) {
+	checkWidget();
+	if (listener == null) error (SWT.ERROR_NULL_ARGUMENT);
+	TypedListener typedListener = new TypedListener (listener);
+	addListener (SWT.Gesture, typedListener);
+}
+
+/**
  * Adds the listener to the collection of listeners who will
  * be notified when help events are generated for the control,
  * by sending it one of the messages defined in the
@@ -2072,6 +2096,31 @@ public void removeFocusListener(FocusListener listener) {
 
 /**
  * Removes the listener from the collection of listeners who will
+ * be notified when a gesture is performed on the control
+ *
+ * @param listener the listener which should no longer be notified
+ *
+ * @exception IllegalArgumentException <ul>
+ *    <li>ERROR_NULL_ARGUMENT - if the listener is null</li>
+ * </ul>
+ * @exception SWTException <ul>
+ *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
+ *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
+ * </ul>
+ *
+ * @see GestureListener
+ * @see #addGestureListener
+ * @since 3.7
+ */
+public void removeGestureListener (GestureListener listener) {
+	checkWidget();
+	if (listener == null) error (SWT.ERROR_NULL_ARGUMENT);
+	if (eventTable == null) return;
+	eventTable.unhook(SWT.Gesture, listener);
+}
+
+/**
+ * Removes the listener from the collection of listeners who will
  * be notified when the help events are generated for the control.
  *
  * @param listener the listener which should no longer be notified
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/qt/org/eclipse/swt/widgets/Control.java b/bundles/org.eclipse.swt/Eclipse SWT/qt/org/eclipse/swt/widgets/Control.java
index ffff864e5b..f12369e6fe 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/qt/org/eclipse/swt/widgets/Control.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/qt/org/eclipse/swt/widgets/Control.java
@@ -56,19 +56,7 @@ import org.eclipse.swt.SWT;
 import org.eclipse.swt.SWTException;
 import org.eclipse.swt.accessibility.Accessible;
 import org.eclipse.swt.dnd.DND;
-import org.eclipse.swt.events.ControlListener;
-import org.eclipse.swt.events.DragDetectListener;
-import org.eclipse.swt.events.FocusListener;
-import org.eclipse.swt.events.HelpListener;
-import org.eclipse.swt.events.KeyListener;
-import org.eclipse.swt.events.MenuDetectListener;
-import org.eclipse.swt.events.MouseEvent;
-import org.eclipse.swt.events.MouseListener;
-import org.eclipse.swt.events.MouseMoveListener;
-import org.eclipse.swt.events.MouseTrackListener;
-import org.eclipse.swt.events.MouseWheelListener;
-import org.eclipse.swt.events.PaintListener;
-import org.eclipse.swt.events.TraverseListener;
+import org.eclipse.swt.events.*;
 import org.eclipse.swt.graphics.Color;
 import org.eclipse.swt.graphics.Cursor;
 import org.eclipse.swt.graphics.Drawable;
@@ -82,6 +70,7 @@ import org.eclipse.swt.graphics.Region;
 import org.eclipse.swt.internal.qt.DragNDropListener;
 import org.eclipse.swt.internal.qt.KeyUtil;
 import org.eclipse.swt.internal.qt.QtSWTConverter;
+import org.eclipse.swt.widgets.*;
 
 /**
  * Control is the abstract superclass of all windowed user interface classes.
@@ -445,6 +434,30 @@ public abstract class Control extends Widget implements Drawable {
 	}
 
 	/**
+	 * Removes the listener from the collection of listeners who will
+	 * be notified when gesture events are generated for the control.
+	 *
+	 * @param listener the listener which should no longer be notified
+	 *
+	 * @exception IllegalArgumentException <ul>
+	 *    <li>ERROR_NULL_ARGUMENT - if the listener is null</li>
+	 * </ul>
+	 * @exception SWTException <ul>
+	 *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
+	 *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
+	 * </ul>
+	 *
+	 * @see GestureListener
+	 * @see #addGestureListener
+	 */
+	public void addGestureListener (GestureListener listener) {
+		checkWidget();
+		if (listener == null) error (SWT.ERROR_NULL_ARGUMENT);
+		TypedListener typedListener = new TypedListener (listener);
+		addListener (SWT.Gesture, typedListener);
+	}
+
+	/**
 	 * Adds the listener to the collection of listeners who will be notified
 	 * when help events are generated for the control, by sending it one of the
 	 * messages defined in the <code>HelpListener</code> interface.
@@ -2336,6 +2349,31 @@ public abstract class Control extends Widget implements Drawable {
 	}
 
 	/**
+	 * Removes the listener from the collection of listeners who will
+	 * be notified when a gesture is performed on the control
+	 *
+	 * @param listener the listener which should no longer be notified
+	 *
+	 * @exception IllegalArgumentException <ul>
+	 *    <li>ERROR_NULL_ARGUMENT - if the listener is null</li>
+	 * </ul>
+	 * @exception SWTException <ul>
+	 *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
+	 *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
+	 * </ul>
+	 *
+	 * @see GestureListener
+	 * @see #addGestureListener
+	 * @since 3.7
+	 */
+	public void removeGestureListener (GestureListener listener) {
+		checkWidget();
+		if (listener == null) error (SWT.ERROR_NULL_ARGUMENT);
+		if (eventTable == null) return;
+		eventTable.unhook(SWT.Gesture, listener);
+	}
+
+	/**
 	 * Removes the listener from the collection of listeners who will be
 	 * notified when the help events are generated for the control.
 	 * 
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/wpf/org/eclipse/swt/widgets/Control.java b/bundles/org.eclipse.swt/Eclipse SWT/wpf/org/eclipse/swt/widgets/Control.java
index f84cf790ad..716f707329 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/wpf/org/eclipse/swt/widgets/Control.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/wpf/org/eclipse/swt/widgets/Control.java
@@ -183,6 +183,30 @@ public void addFocusListener (FocusListener listener) {
 }
 
 /**
+ * Removes the listener from the collection of listeners who will
+ * be notified when gesture events are generated for the control.
+ *
+ * @param listener the listener which should no longer be notified
+ *
+ * @exception IllegalArgumentException <ul>
+ *    <li>ERROR_NULL_ARGUMENT - if the listener is null</li>
+ * </ul>
+ * @exception SWTException <ul>
+ *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
+ *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
+ * </ul>
+ *
+ * @see GestureListener
+ * @see #addGestureListener
+ */
+public void addGestureListener (GestureListener listener) {
+	checkWidget();
+	if (listener == null) error (SWT.ERROR_NULL_ARGUMENT);
+	TypedListener typedListener = new TypedListener (listener);
+	addListener (SWT.Gesture, typedListener);
+}
+
+/**
  * Adds the listener to the collection of listeners who will
  * be notified when help events are generated for the control,
  * by sending it one of the messages defined in the
@@ -2143,6 +2167,31 @@ public void removeFocusListener(FocusListener listener) {
 
 /**
  * Removes the listener from the collection of listeners who will
+ * be notified when a gesture is performed on the control
+ *
+ * @param listener the listener which should no longer be notified
+ *
+ * @exception IllegalArgumentException <ul>
+ *    <li>ERROR_NULL_ARGUMENT - if the listener is null</li>
+ * </ul>
+ * @exception SWTException <ul>
+ *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
+ *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
+ * </ul>
+ *
+ * @see GestureListener
+ * @see #addGestureListener
+ * @since 3.7
+ */
+public void removeGestureListener (GestureListener listener) {
+	checkWidget();
+	if (listener == null) error (SWT.ERROR_NULL_ARGUMENT);
+	if (eventTable == null) return;
+	eventTable.unhook(SWT.Gesture, listener);
+}
+
+/**
+ * Removes the listener from the collection of listeners who will
  * be notified when the help events are generated for the control.
  *
  * @param listener the listener which should no longer be notified