Attachment 72930 Details for Bug 193318 – SWT Patch v2.1

[patch] SWT Patch v2.1

swt patch v2.1.txt (text/plain), 30.98 KB, created by Nikolay Botev

on 2007-07-03 03:44:36 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Nikolay Botev

Created: 2007-07-03 03:44:36 EDT

Size: 30.98 KB

patch

obsolete

>Index: Eclipse SWT/win32/org/eclipse/swt/widgets/ToolItem.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/ToolItem.java,v
>retrieving revision 1.70
>diff -u -r1.70 ToolItem.java
>--- Eclipse SWT/win32/org/eclipse/swt/widgets/ToolItem.java	26 Jun 2007 19:52:07 -0000	1.70
>+++ Eclipse SWT/win32/org/eclipse/swt/widgets/ToolItem.java	3 Jul 2007 07:31:33 -0000
>@@ -39,6 +39,7 @@
> 	String toolTipText;
> 	Image disabledImage, hotImage;
> 	Image disabledImage2;
>+	Menu menu;
> 	int id;
> 
> /**
>@@ -125,6 +126,34 @@
> 
> /**
> * Adds the listener to the collection of listeners who will
>+ * be notified when the platform-specific drop-down menu trigger
>+ * has occurred, by sending it one of the messages defined in
>+ * the <code>MenuDetectListener</code> interface.
>+ *
>+ * @param listener the listener which should 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 MenuDetectListener
>+ * @see #removeMenuDetectListener
>+ *
>+ * @since 3.3
>+ */
>+public void addMenuDetectListener (MenuDetectListener listener) {
>+	checkWidget ();
>+	if (listener == null) error (SWT.ERROR_NULL_ARGUMENT);
>+	TypedListener typedListener = new TypedListener (listener);
>+	addListener (SWT.MenuDetect, typedListener);
>+}
>+
>+/**
>+ * Adds the listener to the collection of listeners who will
> * be notified when the control is selected by the user, by sending
> * it one of the messages defined in the <code>SelectionListener</code>
> * interface.
>@@ -298,6 +327,24 @@
> }
> 
> /**
>+ * Returns the receiver's drop-down menu if it has one, or null 
>+ * if it does not.
>+ * 
>+ * The drop-down menu is activated when the arrow of an {@link SWT#DROP_DOWN}-styled receiver is pressed.
>+ * 
>+ * 
>+ * @return the receiver's drop-down menu
>+ * @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>
>+ */
>+public Menu getMenu () {
>+	checkWidget();
>+	return menu;
>+}
>+
>+/**
> * Returns the receiver's parent, which must be a <code>ToolBar</code>.
> *
> * @return the receiver's parent
>@@ -394,6 +441,10 @@
> void releaseWidget () {
> 	super.releaseWidget ();
> 	releaseImages ();
>+	if (menu != null && !menu.isDisposed ()) {
>+		menu.dispose ();
>+	}
>+	menu = null;
> 	control = null;
> 	toolTipText = null;
> 	disabledImage = hotImage = null;
>@@ -435,6 +486,33 @@
> 
> /**
> * Removes the listener from the collection of listeners who will
>+ * be notified when the platform-specific drop-down menu trigger has
>+ * occurred.
>+ *
>+ * @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 MenuDetectListener
>+ * @see #addMenuDetectListener
>+ *
>+ * @since 3.3
>+ */
>+public void removeMenuDetectListener (MenuDetectListener listener) {
>+	checkWidget ();
>+	if (listener == null) error (SWT.ERROR_NULL_ARGUMENT);
>+	if (eventTable == null) return;
>+	eventTable.unhook (SWT.MenuDetect, listener);
>+}
>+
>+/**
>+ * Removes the listener from the collection of listeners who will
> * be notified when the control is selected by the user.
> *
> * @param listener the listener which should no longer be notified
>@@ -670,6 +748,37 @@
> 	updateImages (getEnabled () && parent.getEnabled ());
> }
> 
>+/**
>+ * Sets the receiver's drop-down menu to the argument, which may be 
>+ * null indicating that no drop-down menu should be displayed.
>+ * 
>+ * If this property is null a drop-down menu can still be displayed manually by adding a
>+ * {@link SelectionListener} to the receiver and handling{@link SWT#ARROW} events.
>+ * 
>+ * The drop-down menu is activated when the arrow of an {@link SWT#DROP_DOWN}-styled
>+ * receiver or any portion of an {@link SWT#PUSH}-styled receiver is pressed.
>+ * 
>+ * 
>+ * @param menu the drop-down menu to be displayed when the receiver's arrow is pressed
>+ * @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>
>+ */
>+public void setMenu (Menu menu) {
>+	checkWidget();
>+	if (menu != null) {
>+		if (menu.isDisposed()) SWT.error(SWT.ERROR_INVALID_ARGUMENT);
>+		if ((menu.style & SWT.POP_UP) == 0) {
>+			error (SWT.ERROR_MENU_NOT_POP_UP);
>+		}
>+		if (menu.parent != parent.menuShell ()) {
>+			error (SWT.ERROR_INVALID_PARENT);
>+		}
>+	}
>+	this.menu = menu;
>+}
>+
> boolean setRadioSelection (boolean value) {
> 	if ((style & SWT.RADIO) == 0) return false;
> 	if (getSelection () != value) {
>Index: Eclipse SWT/win32/org/eclipse/swt/widgets/ToolBar.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/ToolBar.java,v
>retrieving revision 1.117
>diff -u -r1.117 ToolBar.java
>--- Eclipse SWT/win32/org/eclipse/swt/widgets/ToolBar.java	26 Jun 2007 19:52:06 -0000	1.117
>+++ Eclipse SWT/win32/org/eclipse/swt/widgets/ToolBar.java	3 Jul 2007 07:31:33 -0000
>@@ -44,6 +44,7 @@
> 	ToolItem [] items;
> 	boolean ignoreResize, ignoreMouse;
> 	ImageList imageList, disabledImageList, hotImageList;
>+	boolean showingPushItemMenu;
> 	static final int ToolBarProc;
> 	static final TCHAR ToolBarClass = new TCHAR (0, OS.TOOLBARCLASSNAME, true);
> 	static {
>@@ -1018,6 +1019,9 @@
> }
> 
> LRESULT WM_CAPTURECHANGED (int wParam, int lParam) {
>+	// do not unpress the selected item while its menu is showing
>+	// (if we call the super method, the toolbar window 
>+	if (showingPushItemMenu) return LRESULT.ZERO;
> 	LRESULT result = super.WM_CAPTURECHANGED (wParam, lParam);
> 	if (result != null) return result;
> 	/*
>@@ -1119,6 +1123,22 @@
> 			* application the opportunity to cancel the operation.
> 			*/
> 			return LRESULT.ZERO;
>+		case OS.VK_DOWN:
>+		case OS.VK_UP:
>+			/*
>+			 * Menus of SWT.DROPDOWN items are automatically triggered by Windows on the
>+			 * UP and DOWN keys. Here we mirror this behavior for PUSH items.
>+			 */
>+			int itemIndex = OS.SendMessage (handle, OS.TB_GETHOTITEM, 0, 0);
>+			ToolItem child = getEnabledPushItem (itemIndex);
>+			if (child != null) {
>+				RECT rect = new RECT ();
>+				OS.SendMessage (handle, OS.TB_GETITEMRECT, itemIndex, rect);
>+				if (sendItemMenuDetectEvent (child, rect, 0)) {
>+					showPushItemMenu (child, rect);
>+					return LRESULT.ZERO;
>+				}
>+			}
> 	}
> 	return result;
> }
>@@ -1131,7 +1151,42 @@
> 	return super.WM_KILLFOCUS (wParam, lParam);
> }
> 
>+LRESULT WM_LBUTTONDBLCLK (int wParam, int lParam) {
>+	// Handle menu display for push items
>+	POINT point = new POINT ();
>+	point.x = OS.GET_X_LPARAM (lParam);
>+	point.y = OS.GET_Y_LPARAM (lParam);
>+	int itemIndex = OS.SendMessage (handle, OS.TB_HITTEST, 0, point);
>+	ToolItem child = getEnabledPushItem (itemIndex);
>+	if (child != null) {
>+		RECT rect = new RECT ();
>+		OS.SendMessage (handle, OS.TB_GETITEMRECT, itemIndex, rect);
>+		if (sendItemMenuDetectEvent (child, rect, 0)) {
>+			super.WM_LBUTTONDBLCLK (wParam, lParam);
>+			showPushItemMenu (child, rect);
>+			return LRESULT.ZERO;
>+		}
>+	}
>+	return super.WM_LBUTTONDBLCLK (wParam, lParam);
>+}
>+
> LRESULT WM_LBUTTONDOWN (int wParam, int lParam) {
>+	// Handle menu display for push items
>+	POINT point = new POINT ();
>+	point.x = OS.GET_X_LPARAM (lParam);
>+	point.y = OS.GET_Y_LPARAM (lParam);
>+	int itemIndex = OS.SendMessage (handle, OS.TB_HITTEST, 0, point);
>+	ToolItem child = getEnabledPushItem (itemIndex);
>+	if (child != null) {
>+		RECT rect = new RECT ();
>+		OS.SendMessage (handle, OS.TB_GETITEMRECT, itemIndex, rect);
>+		if (sendItemMenuDetectEvent (child, rect, 0)) {
>+			super.WM_LBUTTONDOWN (wParam, lParam);
>+			showPushItemMenu (child, rect);
>+			return LRESULT.ZERO;
>+		}
>+	}
>+
> 	if (ignoreMouse) return null;
> 	return super.WM_LBUTTONDOWN (wParam, lParam);
> }
>@@ -1299,14 +1354,18 @@
> 			OS.MoveMemory (lpnmtb, lParam, NMTOOLBAR.sizeof);
> 			ToolItem child = items [lpnmtb.iItem];
> 			if (child != null) {
>-				Event event = new Event ();
>-				event.detail = SWT.ARROW;
> 				int index = OS.SendMessage (handle, OS.TB_COMMANDTOINDEX, lpnmtb.iItem, 0);
> 				RECT rect = new RECT ();
> 				OS.SendMessage (handle, OS.TB_GETITEMRECT, index, rect);
>-				event.x = rect.left;
>-				event.y = rect.bottom;
>-				child.postEvent (SWT.Selection, event);
>+				if (sendItemMenuDetectEvent (child, rect, SWT.ARROW)) {
>+					showItemMenu (child, rect);
>+				} else {
>+					Event event = new Event ();
>+					event.detail = SWT.ARROW;
>+					event.x = rect.left;
>+					event.y = rect.bottom;
>+					child.postEvent (SWT.Selection, event);
>+				}
> 			}
> 			break;
> 		case OS.NM_CUSTOMDRAW:
>@@ -1363,4 +1422,69 @@
> 	return super.wmNotifyChild (hdr, wParam, lParam);
> }
> 
>+private ToolItem getEnabledPushItem (int itemIndex) {
>+	// Inspect non-separator item under the cursor
>+	if (itemIndex >= 0) {
>+		// Get item instance
>+		TBBUTTON button = new TBBUTTON ();
>+		OS.SendMessage (handle, OS.TB_GETBUTTON, itemIndex, button);
>+		int buttonId = button.idCommand;
>+		ToolItem child = items[buttonId];
>+		// Only allow menu display for PUSH items
>+		final int toolItemStyleMask = SWT.PUSH | SWT.CHECK | SWT.RADIO
>+					| SWT.SEPARATOR | SWT.DROP_DOWN;
>+		if ((child.style & toolItemStyleMask) == SWT.PUSH) {
>+			// Get item state
>+			int itemState = OS.SendMessage (handle, OS.TB_GETSTATE, buttonId, 0);
>+			// Only attempt to show a menu if the item is enabled
>+			if ((itemState & OS.TBSTATE_ENABLED) != 0) {
>+				return child;
>+			}
>+		}
>+	}
>+	return null;
>+}
>+
>+private void showPushItemMenu (ToolItem child, RECT rect) {
>+	// Press item
>+	int itemState = OS.SendMessage (handle, OS.TB_GETSTATE, child.id, 0);
>+	itemState |= OS.TBSTATE_PRESSED;
>+	OS.SendMessage (handle, OS.TB_SETSTATE, child.id, itemState);
>+	// Show menu
>+	showingPushItemMenu = true;
>+	showItemMenu (child, rect);
>+	showingPushItemMenu = false;
>+	// Unpress item - reload item state since it may have changed
>+	itemState = OS.SendMessage (handle, OS.TB_GETSTATE, child.id, 0);
>+	itemState &= ~OS.TBSTATE_PRESSED;
>+	OS.SendMessage (handle, OS.TB_SETSTATE, child.id, itemState);
>+	// If the menu was cancelled by an LBUTTONDOWN event on the control, discard that event.
>+	// This allows the menu to be closed on a second click.
>+	OS.PeekMessage (new MSG (), handle, OS.WM_LBUTTONDOWN, OS.WM_LBUTTONDOWN, OS.PM_REMOVE);
>+	// Force a redraw of the item. Otherwise, if the user cancels the menu by clicking and holding
>+	// the left mouse button over the (non-client) title bar of a window
>+	// that belongs to this application, the item will only get unpushed after a short delay. 
>+	OS.RedrawWindow (handle, rect, 0, OS.RDW_UPDATENOW);
>+}
>+
>+private boolean sendItemMenuDetectEvent (ToolItem child, RECT rect, int detail) {
>+	Event event = new Event ();
>+	event.detail = detail;
>+	event.x = rect.left;
>+	event.y = rect.bottom;
>+	child.sendEvent (SWT.MenuDetect, event);
>+	Menu menu = child.menu;
>+	return event.doit && menu != null && !menu.isDisposed ();
>+}
>+
>+private void showItemMenu (ToolItem child, RECT rect) {
>+	Menu menu = child.menu;
>+	// Without this call, an lbuttondown event that triggers the menu
>+	// will not be delivered to EventListeners until after the menu has been closed.
>+	display.runDeferredEvents ();
>+	OS.MapWindowPoints (handle, 0, rect, 2);
>+	menu.setLocation (rect.left, rect.bottom);
>+	menu._setVisible (true, rect, OS.TPM_VERTICAL);
>+}
>+
> }
>Index: Eclipse SWT/win32/org/eclipse/swt/widgets/CoolBar.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/CoolBar.java,v
>retrieving revision 1.102
>diff -u -r1.102 CoolBar.java
>--- Eclipse SWT/win32/org/eclipse/swt/widgets/CoolBar.java	26 Jun 2007 19:52:07 -0000	1.102
>+++ Eclipse SWT/win32/org/eclipse/swt/widgets/CoolBar.java	3 Jul 2007 07:31:29 -0000
>@@ -1156,7 +1156,23 @@
> 					event.x = lpnm.left;
> 					event.y = lpnm.bottom;
> 				}
>-				item.postEvent (SWT.Selection, event);
>+
>+				if (sendItemMenuDetectEvent (item, event.x, event.y, SWT.ARROW)) {
>+					// Without this call, an lbuttondown event that triggers the menu
>+					// will not be delivered to EventListeners until after the menu has been closed.
>+					display.runDeferredEvents ();
>+					RECT rect = new RECT ();
>+					rect.top = lpnm.top;
>+					rect.bottom = lpnm.bottom;
>+					rect.left = lpnm.left;
>+					rect.right = lpnm.right;
>+					showItemMenu (item, rect);
>+					// If the menu was cancelled by an LBUTTONDOWN event on the control, discard that event.
>+					// This allows the menu to be closed on a second click.
>+					OS.PeekMessage (new MSG (), handle, OS.WM_LBUTTONDOWN, OS.WM_LBUTTONDOWN, OS.PM_REMOVE);
>+				} else {
>+					item.postEvent (SWT.Selection, event);
>+				}
> 			}
> 			break;
> 		}
>@@ -1184,4 +1200,33 @@
> 	}
> 	return super.wmNotifyChild (hdr, wParam, lParam);
> }
>+
>+private void showItemMenu (CoolItem child, RECT rect) {
>+	Menu menu = child.menu;
>+	OS.MapWindowPoints (handle, 0, rect, 2);
>+	int x, y;
>+	int menuPosition;
>+	if ((style & SWT.VERTICAL) != 0) {
>+		x = rect.right;
>+		y = rect.top;
>+		menuPosition = OS.TPM_HORIZONTAL;
>+	} else {
>+		x = rect.left;
>+		y = rect.bottom;
>+		menuPosition = OS.TPM_VERTICAL;
>+	}
>+	menu.setLocation (x, y);
>+	menu._setVisible (true, rect, menuPosition);
>+}
>+
>+private boolean sendItemMenuDetectEvent (CoolItem child, int x, int y, int detail) {
>+	Event event = new Event ();
>+	event.detail = detail;
>+	event.x = x;
>+	event.y = y;
>+	child.sendEvent (SWT.MenuDetect, event);
>+	Menu menu = child.menu;
>+	return event.doit && menu != null && !menu.isDisposed ();
>+}
>+
> }
>Index: Eclipse SWT/win32/org/eclipse/swt/widgets/Menu.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Menu.java,v
>retrieving revision 1.110
>diff -u -r1.110 Menu.java
>--- Eclipse SWT/win32/org/eclipse/swt/widgets/Menu.java	26 Jun 2007 19:52:07 -0000	1.110
>+++ Eclipse SWT/win32/org/eclipse/swt/widgets/Menu.java	3 Jul 2007 07:31:32 -0000
>@@ -195,7 +195,11 @@
> 	createWidget ();
> }
> 
>-void _setVisible (boolean visible) {
>+public void _setVisible (boolean visible) {
>+	_setVisible(visible, null, 0);
>+}
>+
>+void _setVisible (boolean visible, RECT excludeRect, int extraFlags) {
> 	if ((style & (SWT.BAR | SWT.DROP_DOWN)) != 0) return;
> 	int hwndParent = parent.handle;
> 	if (visible) {
>@@ -206,6 +210,7 @@
> 			flags &= ~OS.TPM_RIGHTALIGN;
> 			if ((style & SWT.LEFT_TO_RIGHT) != 0) flags |= OS.TPM_RIGHTALIGN;
> 		}
>+		flags |= extraFlags;
> 		int nX = x, nY = y;
> 		if (!hasLocation) {
> 			int pos = OS.GetMessagePos ();
>@@ -225,7 +230,18 @@
> 		* the case when TrackPopupMenu() fails and the number of items in
> 		* the menu is zero and issue a fake WM_MENUSELECT.
> 		*/
>-		boolean success = OS.TrackPopupMenu (handle, flags, nX, nY, 0, hwndParent, null);
>+		boolean success;
>+		if (excludeRect == null) {
>+			success = OS.TrackPopupMenu (handle, flags, nX, nY, 0, hwndParent, null);
>+		} else {
>+			TPMPARAMS lptpm = new TPMPARAMS();
>+			lptpm.cbSize = TPMPARAMS.sizeof;
>+			lptpm.left = excludeRect.left;
>+			lptpm.top = excludeRect.top;
>+			lptpm.right = excludeRect.right;
>+			lptpm.bottom = excludeRect.bottom;
>+			success = OS.TrackPopupMenuEx (handle, flags, nX, nY, hwndParent, lptpm);
>+		}
> 		if (!success && GetMenuItemCount (handle) == 0) {
> 			OS.SendMessage (hwndParent, OS.WM_MENUSELECT, OS.MAKEWPARAM (0, 0xFFFF), 0);
> 		}
>Index: Eclipse SWT/win32/org/eclipse/swt/widgets/CoolItem.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/CoolItem.java,v
>retrieving revision 1.53
>diff -u -r1.53 CoolItem.java
>--- Eclipse SWT/win32/org/eclipse/swt/widgets/CoolItem.java	31 May 2007 22:04:15 -0000	1.53
>+++ Eclipse SWT/win32/org/eclipse/swt/widgets/CoolItem.java	3 Jul 2007 07:31:30 -0000
>@@ -34,6 +34,7 @@
> public class CoolItem extends Item {
> 	CoolBar parent;
> 	Control control;
>+	Menu menu;
> 	int id;
> 	boolean ideal, minimum;
> 
>@@ -112,6 +113,34 @@
> }
> 
> /**
>+ * Adds the listener to the collection of listeners who will
>+ * be notified when the platform-specific chevron menu trigger
>+ * has occurred, by sending it one of the messages defined in
>+ * the <code>MenuDetectListener</code> interface.
>+ *
>+ * @param listener the listener which should 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 MenuDetectListener
>+ * @see #removeMenuDetectListener
>+ *
>+ * @since 3.3
>+ */
>+public void addMenuDetectListener (MenuDetectListener listener) {
>+	checkWidget ();
>+	if (listener == null) error (SWT.ERROR_NULL_ARGUMENT);
>+	TypedListener typedListener = new TypedListener (listener);
>+	addListener (SWT.MenuDetect, typedListener);
>+}
>+
>+/**
> * Adds the listener to the collection of listeners that will
> * be notified when the control is selected by the user, by sending it one
> * of the messages defined in the <code>SelectionListener</code>
>@@ -279,6 +308,21 @@
> }
> 
> /**
>+ * Returns the receiver's chevron menu if it has one, or null 
>+ * if it does not.
>+ * 
>+ * @return the receiver's drop-down menu
>+ * @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>
>+ */
>+public Menu getMenu () {
>+	checkWidget();
>+	return menu;
>+}
>+
>+/**
> * Returns the receiver's parent, which must be a <code>CoolBar</code>.
> *
> * @return the receiver's parent
>@@ -293,6 +337,14 @@
> 	return parent;
> }
> 
>+void releaseWidget () {
>+	super.releaseWidget ();
>+	if (menu != null && !menu.isDisposed ()) {
>+		menu.dispose ();
>+	}
>+	menu = null;
>+}
>+
> void releaseHandle () {
> 	super.releaseHandle ();
> 	parent = null;
>@@ -357,6 +409,33 @@
> }
> 
> /**
>+ * Sets the receiver's chevron menu to the argument, which may be 
>+ * null indicating that no drop-down menu should be displayed.
>+ * 
>+ * If this property is null a drop-down menu can still be displayed manually by adding a
>+ * {@link SelectionListener} to the receiver and handling{@link SWT#ARROW} events.
>+ * 
>+ * @param menu the drop-down menu to be displayed when the receiver's arrow is pressed
>+ * @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>
>+ */
>+public void setMenu (Menu menu) {
>+	checkWidget();
>+	if (menu != null) {
>+		if (menu.isDisposed()) SWT.error(SWT.ERROR_INVALID_ARGUMENT);
>+		if ((menu.style & SWT.POP_UP) == 0) {
>+			error (SWT.ERROR_MENU_NOT_POP_UP);
>+		}
>+		if (menu.parent != parent.menuShell ()) {
>+			error (SWT.ERROR_INVALID_PARENT);
>+		}
>+	}
>+	this.menu = menu;
>+}
>+
>+/**
> * Returns a point describing the receiver's ideal size.
> * The x coordinate of the result is the ideal width of the receiver.
> * The y coordinate of the result is the ideal height of the receiver.
>@@ -685,6 +764,33 @@
> }
> 
> /**
>+ * Removes the listener from the collection of listeners who will
>+ * be notified when the platform-specific chevron menu trigger has
>+ * occurred.
>+ *
>+ * @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 MenuDetectListener
>+ * @see #addMenuDetectListener
>+ *
>+ * @since 3.3
>+ */
>+public void removeMenuDetectListener (MenuDetectListener listener) {
>+	checkWidget ();
>+	if (listener == null) error (SWT.ERROR_NULL_ARGUMENT);
>+	if (eventTable == null) return;
>+	eventTable.unhook (SWT.MenuDetect, listener);
>+}
>+
>+/**
> * Removes the listener from the collection of listeners that
> * will be notified when the control is selected by the user.
> *
>Index: Eclipse SWT PI/win32/library/os_stats.c
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.swt/Eclipse SWT PI/win32/library/os_stats.c,v
>retrieving revision 1.90
>diff -u -r1.90 os_stats.c
>--- Eclipse SWT PI/win32/library/os_stats.c	26 Jun 2007 19:52:07 -0000	1.90
>+++ Eclipse SWT PI/win32/library/os_stats.c	3 Jul 2007 07:31:12 -0000
>@@ -14,8 +14,8 @@
> 
> #ifdef NATIVE_STATS
> 
>-int OS_nativeFunctionCount = 883;
>-int OS_nativeFunctionCallCount[883];
>+int OS_nativeFunctionCount = 884;
>+int OS_nativeFunctionCallCount[884];
> char * OS_nativeFunctionNames[] = {
> 	"ACCEL_1sizeof",
> 	"ACTCTX_1sizeof",
>@@ -867,6 +867,7 @@
> 	"ToUnicode",
> 	"TrackMouseEvent",
> 	"TrackPopupMenu",
>+	"TrackPopupMenuEx",
> 	"TranslateAcceleratorA",
> 	"TranslateAcceleratorW",
> 	"TranslateCharsetInfo",
>Index: Eclipse SWT PI/win32/library/os_structs.h
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.swt/Eclipse SWT PI/win32/library/os_structs.h,v
>retrieving revision 1.46
>diff -u -r1.46 os_structs.h
>--- Eclipse SWT PI/win32/library/os_structs.h	24 Apr 2007 22:42:37 -0000	1.46
>+++ Eclipse SWT PI/win32/library/os_structs.h	3 Jul 2007 07:31:24 -0000
>@@ -1427,6 +1427,18 @@
> #define TOOLINFO_sizeof() 0
> #endif
> 
>+#ifndef NO_TPMPARAMS
>+void cacheTPMPARAMSFields(JNIEnv *env, jobject lpObject);
>+TPMPARAMS *getTPMPARAMSFields(JNIEnv *env, jobject lpObject, TPMPARAMS *lpStruct);
>+void setTPMPARAMSFields(JNIEnv *env, jobject lpObject, TPMPARAMS *lpStruct);
>+#define TPMPARAMS_sizeof() sizeof(TPMPARAMS)
>+#else
>+#define cacheTPMPARAMSFields(a,b)
>+#define getTPMPARAMSFields(a,b,c) NULL
>+#define setTPMPARAMSFields(a,b,c)
>+#define TPMPARAMS_sizeof() 0
>+#endif
>+
> #ifndef NO_TRACKMOUSEEVENT
> void cacheTRACKMOUSEEVENTFields(JNIEnv *env, jobject lpObject);
> TRACKMOUSEEVENT *getTRACKMOUSEEVENTFields(JNIEnv *env, jobject lpObject, TRACKMOUSEEVENT *lpStruct);
>Index: Eclipse SWT PI/win32/library/os_stats.h
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.swt/Eclipse SWT PI/win32/library/os_stats.h,v
>retrieving revision 1.90
>diff -u -r1.90 os_stats.h
>--- Eclipse SWT PI/win32/library/os_stats.h	26 Jun 2007 19:52:07 -0000	1.90
>+++ Eclipse SWT PI/win32/library/os_stats.h	3 Jul 2007 07:31:12 -0000
>@@ -875,6 +875,7 @@
> 	ToUnicode_FUNC,
> 	TrackMouseEvent_FUNC,
> 	TrackPopupMenu_FUNC,
>+	TrackPopupMenuEx_FUNC,
> 	TranslateAcceleratorA_FUNC,
> 	TranslateAcceleratorW_FUNC,
> 	TranslateCharsetInfo_FUNC,
>Index: Eclipse SWT PI/win32/library/os_structs.c
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.swt/Eclipse SWT PI/win32/library/os_structs.c,v
>retrieving revision 1.54
>diff -u -r1.54 os_structs.c
>--- Eclipse SWT PI/win32/library/os_structs.c	24 Apr 2007 22:42:37 -0000	1.54
>+++ Eclipse SWT PI/win32/library/os_structs.c	3 Jul 2007 07:31:23 -0000
>@@ -6523,6 +6523,49 @@
> }
> #endif
> 
>+#ifndef NO_TPMPARAMS
>+typedef struct TPMPARAMS_FID_CACHE {
>+	int cached;
>+	jclass clazz;
>+	jfieldID cbSize, left, top, right, bottom;
>+} TPMPARAMS_FID_CACHE;
>+
>+TPMPARAMS_FID_CACHE TPMPARAMSFc;
>+
>+void cacheTPMPARAMSFields(JNIEnv *env, jobject lpObject)
>+{
>+	if (TPMPARAMSFc.cached) return;
>+	TPMPARAMSFc.clazz = (*env)->GetObjectClass(env, lpObject);
>+	TPMPARAMSFc.cbSize = (*env)->GetFieldID(env, TPMPARAMSFc.clazz, "cbSize", "I");
>+	TPMPARAMSFc.left = (*env)->GetFieldID(env, TPMPARAMSFc.clazz, "left", "I");
>+	TPMPARAMSFc.top = (*env)->GetFieldID(env, TPMPARAMSFc.clazz, "top", "I");
>+	TPMPARAMSFc.right = (*env)->GetFieldID(env, TPMPARAMSFc.clazz, "right", "I");
>+	TPMPARAMSFc.bottom = (*env)->GetFieldID(env, TPMPARAMSFc.clazz, "bottom", "I");
>+	TPMPARAMSFc.cached = 1;
>+}
>+
>+TPMPARAMS *getTPMPARAMSFields(JNIEnv *env, jobject lpObject, TPMPARAMS *lpStruct)
>+{
>+	if (!TPMPARAMSFc.cached) cacheTPMPARAMSFields(env, lpObject);
>+	lpStruct->cbSize = (*env)->GetIntField(env, lpObject, TPMPARAMSFc.cbSize);
>+	lpStruct->rcExclude.left = (*env)->GetIntField(env, lpObject, TPMPARAMSFc.left);
>+	lpStruct->rcExclude.top = (*env)->GetIntField(env, lpObject, TPMPARAMSFc.top);
>+	lpStruct->rcExclude.right = (*env)->GetIntField(env, lpObject, TPMPARAMSFc.right);
>+	lpStruct->rcExclude.bottom = (*env)->GetIntField(env, lpObject, TPMPARAMSFc.bottom);
>+	return lpStruct;
>+}
>+
>+void setTPMPARAMSFields(JNIEnv *env, jobject lpObject, TPMPARAMS *lpStruct)
>+{
>+	if (!TPMPARAMSFc.cached) cacheTPMPARAMSFields(env, lpObject);
>+	(*env)->SetIntField(env, lpObject, TPMPARAMSFc.cbSize, (jint)lpStruct->cbSize);
>+	(*env)->SetIntField(env, lpObject, TPMPARAMSFc.left, (jint)lpStruct->rcExclude.left);
>+	(*env)->SetIntField(env, lpObject, TPMPARAMSFc.top, (jint)lpStruct->rcExclude.top);
>+	(*env)->SetIntField(env, lpObject, TPMPARAMSFc.right, (jint)lpStruct->rcExclude.right);
>+	(*env)->SetIntField(env, lpObject, TPMPARAMSFc.bottom, (jint)lpStruct->rcExclude.bottom);
>+}
>+#endif
>+
> #ifndef NO_TRACKMOUSEEVENT
> typedef struct TRACKMOUSEEVENT_FID_CACHE {
> 	int cached;
>Index: Eclipse SWT PI/win32/library/os.c
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.swt/Eclipse SWT PI/win32/library/os.c,v
>retrieving revision 1.131
>diff -u -r1.131 os.c
>--- Eclipse SWT PI/win32/library/os.c	27 Jun 2007 15:38:17 -0000	1.131
>+++ Eclipse SWT PI/win32/library/os.c	3 Jul 2007 07:31:12 -0000
>@@ -13506,6 +13506,18 @@
> }
> #endif
> 
>+#ifndef NO_TPMPARAMS_1sizeof
>+JNIEXPORT jint JNICALL OS_NATIVE(TPMPARAMS_1sizeof)
>+	(JNIEnv *env, jclass that)
>+{
>+	jint rc = 0;
>+	OS_NATIVE_ENTER(env, that, TPMPARAMS_1sizeof_FUNC);
>+	rc = (jint)TPMPARAMS_sizeof();
>+	OS_NATIVE_EXIT(env, that, TPMPARAMS_1sizeof_FUNC);
>+	return rc;
>+}
>+#endif
>+
> #ifndef NO_TRACKMOUSEEVENT_1sizeof
> JNIEXPORT jint JNICALL OS_NATIVE(TRACKMOUSEEVENT_1sizeof)
> 	(JNIEnv *env, jclass that)
>@@ -13660,6 +13672,22 @@
> }
> #endif
> 
>+#ifndef NO_TrackPopupMenuEx
>+JNIEXPORT jboolean JNICALL OS_NATIVE(TrackPopupMenuEx)
>+	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jint arg4, jobject arg5)
>+{
>+	TPMPARAMS _arg5, *lparg5=NULL;
>+	jboolean rc = 0;
>+	OS_NATIVE_ENTER(env, that, TrackPopupMenuEx_FUNC);
>+	if (arg5) if ((lparg5 = getTPMPARAMSFields(env, arg5, &_arg5)) == NULL) goto fail;
>+	rc = (jboolean)TrackPopupMenuEx(arg0, arg1, arg2, arg3, arg4, lparg5);
>+fail:
>+	if (arg5 && lparg5) setTPMPARAMSFields(env, arg5, lparg5);
>+	OS_NATIVE_EXIT(env, that, TrackPopupMenuEx_FUNC);
>+	return rc;
>+}
>+#endif
>+
> #ifndef NO_TranslateAcceleratorA
> JNIEXPORT jint JNICALL OS_NATIVE(TranslateAcceleratorA)
> 	(JNIEnv *env, jclass that, jint arg0, jint arg1, jobject arg2)
>Index: Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/OS.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/OS.java,v
>retrieving revision 1.346
>diff -u -r1.346 OS.java
>--- Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/OS.java	27 Jun 2007 15:38:17 -0000	1.346
>+++ Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/OS.java	3 Jul 2007 07:31:28 -0000
>@@ -1548,6 +1548,7 @@
> 	public static final int TB_GETROWS = 0x428;
> 	public static final int TB_GETSTATE = 0x412;
> 	public static final int TB_GETTOOLTIPS = 0x423;
>+	public static final int TB_HITTEST = 0x445;
> 	public static final int TB_INSERTBUTTON = IsUnicode ? 0x443 : 0x415;
> 	public static final int TB_LOADIMAGES = 0x432;
> 	public static final int TB_MAPACCELERATOR = 0x0400 + (IsUnicode ? 90 : 78);
>@@ -1618,6 +1619,8 @@
> 	public static final int TPM_LEFTBUTTON = 0x0;
> 	public static final int TPM_RIGHTBUTTON = 0x2;
> 	public static final int TPM_RIGHTALIGN = 0x8;
>+	public static final int TPM_HORIZONTAL = 0x00;
>+	public static final int TPM_VERTICAL = 0x40;
> 	public static final String TRACKBAR_CLASS = "msctls_trackbar32"; //$NON-NLS-1$
> 	public static final int TRANSPARENT = 0x1;
> 	public static final int TREIS_DISABLED = 4;
>@@ -2138,6 +2141,7 @@
> public static final native int TEXTMETRICA_sizeof ();
> public static final native int TEXTMETRICW_sizeof ();
> public static final native int TOOLINFO_sizeof ();
>+public static final native int TPMPARAMS_sizeof ();
> public static final native int TRACKMOUSEEVENT_sizeof ();
> public static final native int TRIVERTEX_sizeof ();
> public static final native int TVHITTESTINFO_sizeof ();
>@@ -3858,6 +3862,7 @@
> public static final native boolean TreeView_GetItemRect (int /*long*/ hwndTV, int /*long*/ hitem, RECT prc, boolean fItemRect);
> public static final native boolean TrackMouseEvent (TRACKMOUSEEVENT lpEventTrack);
> public static final native boolean TrackPopupMenu (int /*long*/ hMenu, int uFlags, int x, int y, int nReserved, int /*long*/ hWnd, RECT prcRect);
>+public static final native boolean TrackPopupMenuEx (int /*long*/ hMenu, int uFlags, int x, int y, int /*long*/ hWnd, TPMPARAMS lptpm);
> public static final native int TranslateAcceleratorW (int /*long*/ hWnd, int /*long*/ hAccTable, MSG lpMsg);
> public static final native int TranslateAcceleratorA (int /*long*/ hWnd, int /*long*/ hAccTable, MSG lpMsg);
> public static final native boolean TranslateCharsetInfo (int /*long*/ lpSrc, int [] lpCs, int dwFlags);
>Index: Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/TPMPARAMS.java
>===================================================================
>RCS file: Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/TPMPARAMS.java
>diff -N Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/TPMPARAMS.java
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/TPMPARAMS.java	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,8 @@
>+package org.eclipse.swt.internal.win32;
>+
>+public class TPMPARAMS {
>+	public int cbSize;
>+//	public RECT rcExclude;
>+	public int left, top, right, bottom;
>+	public static int sizeof = OS.TPMPARAMS_sizeof ();
>+}

Actions: View | Diff

Attachments on bug 193318: 71745 | 71746 | 71747 | 71748 | 71749 | 72862 | 72863 | 72930 | 72931 | 90591 | 90592 | 91606 | 91607