Implement Menu and MenuItem

jossonsmith · jossonsmith · commit ef43cf359d5b · 2006-09-18T14:49:33.000Z
diff --git a/tests/net.sf.j2s.test.swt/src/net/sf/j2s/test/swt/os/Popup.java b/tests/net.sf.j2s.test.swt/src/net/sf/j2s/test/swt/os/Popup.java
@@ -146,7 +146,7 @@ public static Rectangle popupMenu(Rectangle bounds, Rectangle rect, int width, i
 						}
 					}
 				} else {
-					x = rect.x + rect.width;
+					x = rect.x;
 				}
 			}
 		}
diff --git a/tests/net.sf.j2s.test.swt/src/net/sf/j2s/test/swt/widgets/TestPopupMenu.java b/tests/net.sf.j2s.test.swt/src/net/sf/j2s/test/swt/widgets/TestPopupMenu.java
@@ -49,7 +49,7 @@ public static void main (String [] args) {
 	item.setSelection(true);
 	item.setAccelerator(SWT.CTRL + 'X');
 	item = new MenuItem (menu, SWT.RADIO);
-	item.setText ("Copy a very long string \tCtrl+C");
+	item.setText ("Copy a very &long string \tCtrl+C");
 	item.setSelection(true);
 	item.setAccelerator(SWT.CTRL + 'T');
 	item.addSelectionListener(new SelectionAdapter() {
@@ -62,6 +62,43 @@ public void widgetSelected(SelectionEvent e) {
 	item.setImage(null);
 	item.setSelection(true);
 	item.setAccelerator(SWT.CTRL + 'R');
+	
+	item = new MenuItem (menu, SWT.CASCADE);
+	item.setText ("Pa&ste");
+	
+	Menu submenu = new Menu (item);
+	MenuItem subitem = new MenuItem (submenu, SWT.PUSH);
+	subitem.setText ("Popup");
+	subitem = new MenuItem (submenu, SWT.SEPARATOR);
+	subitem = new MenuItem (submenu, SWT.PUSH);
+	subitem.setText ("Pas&te");
+	subitem.setEnabled(false);
+	subitem = new MenuItem (submenu, SWT.PUSH | SWT.CHECK);
+	subitem.setText ("Copy\tCtrl+C");
+	subitem.setSelection(true);
+	subitem.setAccelerator(SWT.CTRL + 'C');
+	subitem = new MenuItem (submenu, SWT.CHECK);
+	subitem.setText ("&Cut\tCtrl+X");
+	subitem.setImage(imageOpen);
+	subitem.setSelection(true);
+	subitem.setAccelerator(SWT.CTRL + 'X');
+	subitem = new MenuItem (submenu, SWT.RADIO);
+	subitem.setText ("Copy a very long string \tCtrl+C");
+	subitem.setSelection(true);
+	subitem.setAccelerator(SWT.CTRL + 'T');
+	subitem.addSelectionListener(new SelectionAdapter() {
+		public void widgetSelected(SelectionEvent e) {
+			System.out.println("Copy cut");
+		}
+	});
+	subitem = new MenuItem (submenu, SWT.RADIO);
+	subitem.setText ("Remove\tCtrl+Shift+X");
+	subitem.setImage(null);
+	subitem.setSelection(true);
+	subitem.setAccelerator(SWT.CTRL + 'R');
+
+	item.setMenu(submenu);
+	
 	c1.setMenu (menu);
 	c2.setMenu (menu);
 	shell.setMenu (menu);

Original file line number	Diff line number	Diff line change
`@@ -146,7 +146,7 @@ public static Rectangle popupMenu(Rectangle bounds, Rectangle rect, int width, i`
`146`	`146`	`}`
`147`	`147`	`}`
`148`	`148`	`} else {`
`149`		`- x = rect.x + rect.width;`
	`149`	`+ x = rect.x;`
`150`	`150`	`}`
`151`	`151`	`}`
`152`	`152`	`}`