Update Control Examples

jossonsmith · jossonsmith · commit c1730d96d021 · 2006-07-16T17:16:37.000Z
diff --git a/tests/org.eclipse.swt.examples/src/org/eclipse/swt/examples/controlexample/ControlExample.java b/tests/org.eclipse.swt.examples/src/org/eclipse/swt/examples/controlexample/ControlExample.java
@@ -187,17 +187,14 @@ void initResources() {
 					
 					for (int i = 0; i < imageLocations.length; ++i) {
 						InputStream sourceStream = clazz.getResourceAsStream(imageLocations[i]);
-						images[i] = new Image(null, sourceStream);
-//						ImageData source = new ImageData(sourceStream);
-//						ImageData mask = source.getTransparencyMask();
-//						images[i] = new Image(null, source, mask);
-//						try {
-//							sourceStream.close();
-//						} catch (IOException e) {
-//							e.printStackTrace();
-//						}
-						
-						//images[i] = new Image(null, "bin/org/eclipse/swt/examples/controlexample/" + imageLocations[i]);
+						ImageData source = new ImageData(sourceStream);
+						ImageData mask = source.getTransparencyMask();
+						images[i] = new Image(null, source, mask);
+						try {
+							sourceStream.close();
+						} catch (IOException e) {
+							e.printStackTrace();
+						}
 					}
 				}
 				return;
@@ -216,20 +213,20 @@ void initResources() {
 	 */
 	public static void main(String[] args) {
 		Display display = new Display();
-		int style = SWT.SHELL_TRIM;
 		int styleNone = SWT.NONE;
-//		/**
-//		 * @j2sNative 
-//		 * window.extraDisplay (display);
-//		 * style = styleNone;
-//		 */ {}
+		int style = styleNone;
+		style = SWT.SHELL_TRIM;
+		/**
+		 * @j2sNative 
+		 * style = styleNone;
+		 */ {}
 		
 		Shell shell = new Shell(display, style);
 		shell.setLayout(new FillLayout());
 		ControlExample instance = new ControlExample(shell);
 		shell.setText(getResourceString("window.title"));
-		setShellSize(display, shell);
-//		shell.setMaximized(true);
+//		setShellSize(display, shell);
+		shell.setMaximized(true);
 		shell.open();
 		while (! shell.isDisposed()) {
 			if (! display.readAndDispatch()) display.sleep();
diff --git a/tests/org.eclipse.swt.examples/src/org/eclipse/swt/examples/controlexample/Tab.java b/tests/org.eclipse.swt.examples/src/org/eclipse/swt/examples/controlexample/Tab.java
@@ -114,7 +114,7 @@ void createControlGroup () {
 		 * "Style" group, the "Other" group and the "Size" group.
 		 */	
 		controlGroup = new Group (tabFolderPage, SWT.NONE);
-		controlGroup.setLayout (new GridLayout (2, true));
+		controlGroup.setLayout (new GridLayout (2, false));
 		controlGroup.setLayoutData (new GridData(SWT.FILL, SWT.FILL, false, false));
 		controlGroup.setText (ControlExample.getResourceString("Parameters"));
 	
