Leverage new screenshot API

Author: HannesWell

tests/org.eclipse.swt.tests.gtk/ManualTests/org/eclipse/swt/tests/gtk/snippets/Bug531667_CanvasPrint_does_not_work.java

@@ -19,7 +19,6 @@
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.graphics.Color;
 import org.eclipse.swt.graphics.GC;
-import org.eclipse.swt.graphics.Image;
 import org.eclipse.swt.graphics.ImageData;
 import org.eclipse.swt.graphics.ImageLoader;
 import org.eclipse.swt.graphics.Rectangle;
@@ -54,7 +53,7 @@ public static void main(String[] args) {
 
 		shell.open();
 
-		snapshot(display, composite, filename);
+		snapshot(composite, filename);
 
 		while (!shell.isDisposed()) {
 			if (!display.readAndDispatch()) {
@@ -79,15 +78,11 @@ private static Composite canvas(Display display, Shell shell) {
 		return composite;
 	}
 
-	private static void snapshot(Display display, Composite composite, String filename) {
-		Rectangle bounds = composite.getBounds();
-		Image image = new Image(display, bounds);
-		GC gc = new GC(image);
-		composite.print(gc);
-		gc.dispose();
+	private static void snapshot(Composite composite, String filename) {
+		ImageData screenshot = SWT.takeScreenShot(composite);
 
 		ImageLoader loader = new ImageLoader();
-		loader.data = new ImageData[] { image.getImageData() };
+		loader.data = new ImageData[] { screenshot };
 		File output = new File(filename);
 		output.delete();
 		loader.save(filename, SWT.IMAGE_PNG);

tests/org.eclipse.swt.tests.gtk/ManualTests/org/eclipse/swt/tests/gtk/snippets/Bug547529_ImageLoaderStriping.java

@@ -16,8 +16,6 @@
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.events.SelectionAdapter;
 import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.graphics.GC;
-import org.eclipse.swt.graphics.Image;
 import org.eclipse.swt.graphics.ImageData;
 import org.eclipse.swt.graphics.ImageLoader;
 import org.eclipse.swt.layout.FillLayout;
@@ -72,14 +70,10 @@ public void widgetSelected(SelectionEvent e) {
 	}
 
 	private static void saveImage(Control control, String filename, int format) {
-		Image image = new Image(control.getDisplay(), control.getBounds());
-		GC gc = new GC(image);
-		control.print(gc);
-		gc.dispose();
-		ImageData data = image.getImageData();
+		ImageData screenshot = SWT.takeScreenShot(control);
+		ImageData data = screenshot;
 		ImageLoader loader = new ImageLoader();
 		loader.data = new ImageData[] { data };
 		loader.save(filename, format);
-		image.dispose();
 	}
 }