Bug 334147 - Several SWT snippets use incorrect positioning

33 files changed, 90 insertions, 25 deletions

diff --git a/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet11.java b/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet11.java
index e274805fe9..dbfcbbd767 100644
--- a/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet11.java
+++ b/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet11.java
@@ -17,6 +17,7 @@ package org.eclipse.swt.snippets;
  * http://www.eclipse.org/swt/snippets/
  */
 import org.eclipse.swt.*;
+import org.eclipse.swt.graphics.Rectangle;
 import org.eclipse.swt.widgets.*;
 
 public class Snippet11 {
@@ -25,7 +26,8 @@ public static void main (String [] args) {
 	Display display = new Display ();
 	Shell shell = new Shell (display);
 	Text text = new Text (shell, SWT.BORDER | SWT.V_SCROLL);
-	text.setBounds (10, 10, 100, 100);
+	Rectangle clientArea = shell.getClientArea ();
+	text.setBounds (clientArea.x + 10, clientArea.y + 10, 100, 100);
 	for (int i=0; i<16; i++) {
 		text.append ("Line " + i + "\n");
 	}
diff --git a/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet12.java b/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet12.java
index 8d7a992595..f0de4af62b 100644
--- a/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet12.java
+++ b/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet12.java
@@ -17,6 +17,7 @@ package org.eclipse.swt.snippets;
  * http://www.eclipse.org/swt/snippets/
  */
 import org.eclipse.swt.*;
+import org.eclipse.swt.graphics.Rectangle;
 import org.eclipse.swt.widgets.*;
 
 public class Snippet12 {
@@ -25,7 +26,8 @@ public static void main (String [] args) {
 	Display display = new Display ();
 	Shell shell = new Shell (display);
 	Text text = new Text (shell, SWT.BORDER | SWT.V_SCROLL);
-	text.setBounds (10, 10, 100, 100);
+	Rectangle clientArea = shell.getClientArea ();
+	text.setBounds (clientArea.x + 10, clientArea.y + 10, 100, 100);
 	for (int i=0; i<16; i++) {
 		text.append ("Line " + i + "\n");
 	}
diff --git a/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet17.java b/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet17.java
index f0ff83b040..b2cbc93ebb 100644
--- a/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet17.java
+++ b/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet17.java
@@ -17,6 +17,7 @@ package org.eclipse.swt.snippets;
  * http://www.eclipse.org/swt/snippets/
  */
 import org.eclipse.swt.*;
+import org.eclipse.swt.graphics.Rectangle;
 import org.eclipse.swt.widgets.*;
 
 public class Snippet17 {
@@ -25,7 +26,8 @@ public static void main (String [] args) {
 	Display display = new Display ();
 	Shell shell = new Shell (display);
 	Slider slider = new Slider (shell, SWT.HORIZONTAL);
-	slider.setBounds (10, 10, 200, 32);
+	Rectangle clientArea = shell.getClientArea ();
+	slider.setBounds (clientArea.x + 10, clientArea.y + 10, 200, 32);
 	slider.addListener (SWT.Selection, new Listener () {
 		public void handleEvent (Event event) {
 			String string = "SWT.NONE";
diff --git a/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet18.java b/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet18.java
index 808bfb9ded..bd1ab1bb88 100644
--- a/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet18.java
+++ b/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet18.java
@@ -17,6 +17,7 @@ package org.eclipse.swt.snippets;
  * http://www.eclipse.org/swt/snippets/
  */
 import org.eclipse.swt.*;
+import org.eclipse.swt.graphics.Rectangle;
 import org.eclipse.swt.widgets.*;
 
 public class Snippet18 {
@@ -28,10 +29,12 @@ public static void main (String [] args) {
 		ToolItem item = new ToolItem (bar, SWT.PUSH);
 		item.setText ("Item " + i);
 	}
+	Rectangle clientArea = shell.getClientArea ();
+	bar.setLocation (clientArea.x, clientArea.y);
 	bar.pack ();
 	shell.open ();
 	Display display = shell.getDisplay ();
-	while (!shell.isDisposed()) {
+	while (!shell.isDisposed ()) {
 		if (!display.readAndDispatch ()) display.sleep ();
 	}
 	display.dispose ();
diff --git a/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet19.java b/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet19.java
index be6916966b..2f56a9caab 100644
--- a/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet19.java
+++ b/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet19.java
@@ -17,6 +17,7 @@ package org.eclipse.swt.snippets;
  * http://www.eclipse.org/swt/snippets/
  */
 import org.eclipse.swt.*;
+import org.eclipse.swt.graphics.Rectangle;
 import org.eclipse.swt.widgets.*;
 
 public class Snippet19 {
@@ -25,7 +26,8 @@ public static void main (String [] args) {
 	Display display = new Display ();
 	Shell shell = new Shell (display);
 	Text text = new Text (shell, SWT.BORDER | SWT.V_SCROLL);
-	text.setBounds (10, 10, 200, 200);
+	Rectangle clientArea = shell.getClientArea ();
+	text.setBounds ( clientArea.x + 10, clientArea.y + 10, 200, 200);
 	text.addListener (SWT.Verify, new Listener () {
 		public void handleEvent (Event e) {
 			String string = e.text;
diff --git a/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet20.java b/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet20.java
index 46f0bd9eb7..72f61d56ff 100644
--- a/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet20.java
+++ b/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet20.java
@@ -34,6 +34,8 @@ public static void main (String [] args) {
 		item.setPreferredSize (item.computeSize (size.x, size.y));
 		item.setControl (button);
 	}
+	Rectangle clientArea = shell.getClientArea ();
+	bar.setLocation (clientArea.x, clientArea.y);
 	bar.pack ();
 	shell.open ();
 	while (!shell.isDisposed ()) {
diff --git a/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet21.java b/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet21.java
index 317952d9e4..406c4f66de 100644
--- a/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet21.java
+++ b/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet21.java
@@ -28,7 +28,8 @@ public static void main (String [] args) {
 	final Color blue = display.getSystemColor (SWT.COLOR_BLUE);
 	Shell shell = new Shell (display);
 	Button b = new Button (shell, SWT.PUSH);
-	b.setBounds (10, 10, 100, 32);
+	Rectangle clientArea = shell.getClientArea ();
+	b.setBounds (clientArea.x + 10, clientArea.y + 10, 100, 32);
 	b.setText ("Button");
 	shell.setDefaultButton (b);
 	final Canvas c = new Canvas (shell, SWT.BORDER);
diff --git a/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet22.java b/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet22.java
index 765b5badb0..c5f73e2a88 100644
--- a/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet22.java
+++ b/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet22.java
@@ -16,6 +16,7 @@ package org.eclipse.swt.snippets;
  * For a list of all SWT example snippets see
  * http://www.eclipse.org/swt/snippets/
  */
+import org.eclipse.swt.graphics.Rectangle;
 import org.eclipse.swt.widgets.*;
 
 public class Snippet22 {
@@ -25,7 +26,8 @@ public static void main (String [] args) {
 	Shell shell = new Shell (display);
 	Text text = new Text (shell, 0);
 	text.setText ("ASDF");
-	text.setSize (64, 32);
+	Rectangle clientArea = shell.getClientArea ();
+	text.setBounds (clientArea.x, clientArea.y, 64, 32);
 	text.selectAll ();
 	shell.pack ();
 	shell.open ();
diff --git a/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet26.java b/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet26.java
index e1fbde13b6..dabc0befce 100644
--- a/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet26.java
+++ b/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet26.java
@@ -17,6 +17,7 @@ package org.eclipse.swt.snippets;
  * http://www.eclipse.org/swt/snippets/
  */
 import org.eclipse.swt.*;
+import org.eclipse.swt.graphics.Rectangle;
 import org.eclipse.swt.widgets.*;
 
 public class Snippet26 {
@@ -26,7 +27,8 @@ public static void main (String [] args) {
 	Shell shell = new Shell (display);
 	Combo combo = new Combo (shell, SWT.READ_ONLY);
 	combo.setItems (new String [] {"Alpha", "Bravo", "Charlie"});
-	combo.setSize (200, 200);
+	Rectangle clientArea = shell.getClientArea ();
+	combo.setBounds (clientArea.x, clientArea.y, 200, 200);
 	shell.pack ();
 	shell.open ();
 	while (!shell.isDisposed ()) {
diff --git a/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet3.java b/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet3.java
index a95f1edaa5..c3ab2c46da 100644
--- a/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet3.java
+++ b/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet3.java
@@ -43,6 +43,8 @@ public static void main(String[] args) {
 	for (int i = 0; i < columnCount; i++) {
 		table.getColumn(i).pack();
 	}
+	Rectangle clientArea = shell.getClientArea();
+	table.setLocation(clientArea.x, clientArea.y);
 	Point size = table.computeSize(SWT.DEFAULT, 200);
 	table.setSize(size);
 	shell.pack();
diff --git a/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet34.java b/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet34.java
index 27765cbfd2..87a6477d2b 100644
--- a/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet34.java
+++ b/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet34.java
@@ -32,6 +32,8 @@ public static void main (String[] args) {
 	gc.dispose ();
 	Shell shell = new Shell (display);
 	Label label = new Label (shell, SWT.BORDER);
+	Rectangle clientArea = shell.getClientArea ();
+	label.setLocation (clientArea.x, clientArea.y);
 	label.setImage (image);
 	label.pack ();
 	shell.pack ();
diff --git a/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet35.java b/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet35.java
index 38387ce7dd..f79e184b3e 100644
--- a/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet35.java
+++ b/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet35.java
@@ -17,6 +17,7 @@ package org.eclipse.swt.snippets;
  * http://www.eclipse.org/swt/snippets/
  */
 import org.eclipse.swt.*;
+import org.eclipse.swt.graphics.Rectangle;
 import org.eclipse.swt.widgets.*;
 
 public class Snippet35 {
@@ -29,7 +30,8 @@ public static void main (String [] args) {
 		TableItem item = new TableItem (table, 0);
 		item.setText ("Item " + i);
 	}
-	table.setSize (100, 100);
+	Rectangle clientArea = shell.getClientArea ();
+	table.setBounds (clientArea.x, clientArea.y, 100, 100);
 	shell.setSize (200, 200);
 	shell.open ();
 	while (!shell.isDisposed()) {
diff --git a/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet36.java b/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet36.java
index 7d4919d01c..a7523d713f 100644
--- a/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet36.java
+++ b/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet36.java
@@ -32,6 +32,8 @@ public static void main (String [] args) {
 	gc.dispose ();
 	Shell shell = new Shell (display);
 	ToolBar toolBar = new ToolBar (shell, SWT.FLAT | SWT.BORDER);
+	Rectangle clientArea = shell.getClientArea ();
+	toolBar.setLocation (clientArea.x, clientArea.y);
 	for (int i=0; i<12; i++) {
 		int style = i % 3 == 2 ? SWT.DROP_DOWN : SWT.PUSH;
 		ToolItem item = new ToolItem (toolBar, style);
diff --git a/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet4.java b/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet4.java
index 8fc8411f8b..453b851015 100644
--- a/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet4.java
+++ b/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet4.java
@@ -18,6 +18,7 @@ package org.eclipse.swt.snippets;
  */
 import org.eclipse.swt.*;
 import org.eclipse.swt.events.*;
+import org.eclipse.swt.graphics.Rectangle;
 import org.eclipse.swt.widgets.*;
 
 public class Snippet4 {
@@ -28,7 +29,8 @@ public class Snippet4 {
 		Button b = new Button(shell, SWT.PUSH);
 		b.setText("Open Dialog ...");
 		b.pack();
-		b.setLocation(10, 10);
+		Rectangle clientArea = shell.getClientArea();
+		b.setLocation(clientArea.x + 10, clientArea.y + 10);
 		b.addSelectionListener(new SelectionAdapter() {
 			public void widgetSelected(SelectionEvent se) {
 				Shell dialog = new Shell(shell, SWT.DIALOG_TRIM);
diff --git a/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet41.java b/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet41.java
index 37037535cb..f63ea90d64 100644
--- a/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet41.java
+++ b/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet41.java
@@ -17,6 +17,7 @@ package org.eclipse.swt.snippets;
  * http://www.eclipse.org/swt/snippets/
  */
 import org.eclipse.swt.*;
+import org.eclipse.swt.graphics.Rectangle;
 import org.eclipse.swt.widgets.*;
 
 public class Snippet41 {
@@ -26,12 +27,13 @@ public static void main (String [] args) {
 	Display display = new Display ();
 	Shell shell = new Shell (display);
 	TabFolder folder = new TabFolder (shell, SWT.BORDER);
-	folder.setSize (200, 200);
+	Rectangle clientArea = shell.getClientArea ();
+	folder.setBounds (clientArea.x, clientArea.y, 200, 200);
 	TabItem item0 = new TabItem (folder, 0);
 	item0.setText ("tab item");
 	item0.setToolTipText ("TabItem toolTip: " + string);
 	ToolBar bar = new ToolBar (shell, SWT.BORDER);
-	bar.setBounds (0, 200, 200, 40);
+	bar.setBounds (clientArea.x, clientArea.y + 200, 200, 40);
 	ToolItem item1 = new ToolItem (bar, SWT.PUSH);
 	item1.setText ("tool item");
 	item1.setToolTipText ("ToolItem toolTip: " + string);
diff --git a/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet44.java b/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet44.java
index 67ee31705d..c405a4980d 100644
--- a/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet44.java
+++ b/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet44.java
@@ -29,7 +29,8 @@ public static void main (String [] args) {
 	shell.open ();
 	final Button b = new Button (shell, 0);
 	b.setText("Push to set cursor to hand");
-	b.setBounds (10, 10, 200, 200);
+	Rectangle clientArea = shell.getClientArea ();
+	b.setBounds (clientArea.x + 10, clientArea.y + 10, 200, 200);
 	b.addListener (SWT.Selection, new Listener () {
 		public void handleEvent (Event e) {
 			b.setCursor (cursor);
diff --git a/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet45.java b/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet45.java
index 52acee3606..eb14486cdf 100644
--- a/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet45.java
+++ b/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet45.java
@@ -17,6 +17,7 @@ package org.eclipse.swt.snippets;
  * http://www.eclipse.org/swt/snippets/
  */
 import org.eclipse.swt.*;
+import org.eclipse.swt.graphics.Rectangle;
 import org.eclipse.swt.widgets.*;
 
 public class Snippet45 {
@@ -25,7 +26,8 @@ public static void main (String [] args) {
 	Display display = new Display ();
 	Shell shell = new Shell (display);
 	Scale scale = new Scale (shell, SWT.BORDER);
-	scale.setSize (200, 64);
+	Rectangle clientArea = shell.getClientArea ();
+	scale.setBounds (clientArea.x, clientArea.y, 200, 64);
 	scale.setMaximum (40);
 	scale.setPageIncrement (5);
 	shell.open ();
diff --git a/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet47.java b/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet47.java
index 16055ca329..28e2237a15 100644
--- a/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet47.java
+++ b/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet47.java
@@ -48,7 +48,8 @@ public static void main (String [] args) {
 	gc.dispose ();
 	
 	ToolBar bar = new ToolBar (shell, SWT.BORDER | SWT.FLAT);
-	bar.setSize (200, 32);
+	Rectangle clientArea = shell.getClientArea ();
+	bar.setBounds (clientArea.x, clientArea.y, 200, 32);
 	for (int i=0; i<12; i++) {
 		ToolItem item = new ToolItem (bar, 0);
 		item.setImage (image);
diff --git a/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet49.java b/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet49.java
index b66a128d9e..ddd436dfc9 100644
--- a/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet49.java
+++ b/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet49.java
@@ -37,6 +37,8 @@ public static void main (String [] args) {
 			toolBar.setSize (size);
 		}
 	});
+	Rectangle clientArea = shell.getClientArea ();
+	toolBar.setLocation (clientArea.x, clientArea.y);
 	toolBar.pack ();
 	shell.pack ();
 	shell.open ();
diff --git a/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet52.java b/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet52.java
index 344246011c..9a2a1b4b13 100644
--- a/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet52.java
+++ b/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet52.java
@@ -17,6 +17,7 @@ package org.eclipse.swt.snippets;
  * http://www.eclipse.org/swt/snippets/
  */
 import org.eclipse.swt.*;
+import org.eclipse.swt.graphics.Rectangle;
 import org.eclipse.swt.widgets.*;
 
 public class Snippet52 {
@@ -25,7 +26,8 @@ public static void main (String [] args) {
 	Display display = new Display ();
 	Shell shell = new Shell (display);
 	Table table = new Table (shell, SWT.BORDER | SWT.MULTI);
-	table.setSize (200, 200);
+	Rectangle clientArea = shell.getClientArea ();
+	table.setBounds (clientArea.x, clientArea.y, 200, 200);
 	for (int i=0; i<128; i++) {
 		TableItem item = new TableItem (table, SWT.NONE);
 		item.setText ("Item " + i);
diff --git a/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet53.java b/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet53.java
index bca0148cd7..1a9e35b549 100644
--- a/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet53.java
+++ b/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet53.java
@@ -17,6 +17,7 @@ package org.eclipse.swt.snippets;
  * http://www.eclipse.org/swt/snippets/
  */
 import org.eclipse.swt.*;
+import org.eclipse.swt.graphics.Rectangle;
 import org.eclipse.swt.widgets.*;
 
 public class Snippet53 {
@@ -25,7 +26,8 @@ public static void main (String [] args) {
 	Display display = new Display ();
 	Shell shell = new Shell (display);
 	final Table table = new Table (shell, SWT.BORDER | SWT.MULTI);
-	table.setSize (200, 200);
+	Rectangle clientArea = shell.getClientArea ();
+	table.setBounds (clientArea.x, clientArea.y, 200, 200);
 	for (int i=0; i<128; i++) {
 		TableItem item = new TableItem (table, SWT.NONE);
 		item.setText ("Item " + i);
diff --git a/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet54.java b/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet54.java
index 0622afa74e..bfcc4d669e 100644
--- a/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet54.java
+++ b/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet54.java
@@ -17,6 +17,7 @@ package org.eclipse.swt.snippets;
  * http://www.eclipse.org/swt/snippets/
  */
 import org.eclipse.swt.*;
+import org.eclipse.swt.graphics.Rectangle;
 import org.eclipse.swt.widgets.*;
 
 public class Snippet54 {
@@ -26,7 +27,8 @@ public static void main (String [] args) {
 	Shell shell = new Shell (display);
 	shell.setSize(400, 300);
 	final Sash sash = new Sash (shell, SWT.BORDER | SWT.VERTICAL);
-	sash.setBounds (180, 10, 32, 240);
+	Rectangle clientArea = shell.getClientArea ();
+	sash.setBounds (180, clientArea.y, 32, clientArea.height);
 	sash.addListener (SWT.Selection, new Listener () {
 		public void handleEvent (Event e) {
 			sash.setBounds (e.x, e.y, e.width, e.height);
diff --git a/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet55.java b/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet55.java
index 0e6a83f2c6..b53a814355 100644
--- a/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet55.java
+++ b/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet55.java
@@ -26,6 +26,8 @@ public static void main (String [] args) {
 	Display display = new Display ();
 	Shell shell = new Shell (display);
 	Text text = new Text (shell, SWT.BORDER);
+	Rectangle clientArea = shell.getClientArea ();
+	text.setLocation (clientArea.x, clientArea.y);
 	int columns = 10;
 	GC gc = new GC (text);
 	FontMetrics fm = gc.getFontMetrics ();
diff --git a/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet56.java b/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet56.java
index 9eeabb81ea..ba5137a906 100644
--- a/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet56.java
+++ b/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet56.java
@@ -17,6 +17,7 @@ package org.eclipse.swt.snippets;
  * http://www.eclipse.org/swt/snippets/
  */
 import org.eclipse.swt.*;
+import org.eclipse.swt.graphics.Rectangle;
 import org.eclipse.swt.widgets.*;
 
 public class Snippet56 {
@@ -25,7 +26,8 @@ public class Snippet56 {
 		final Display display = new Display();
 		Shell shell = new Shell(display);
 		final ProgressBar bar = new ProgressBar(shell, SWT.SMOOTH);
-		bar.setBounds(10, 10, 200, 32);
+		Rectangle clientArea = shell.getClientArea ();
+		bar.setBounds (clientArea.x, clientArea.y, 200, 32);
 		shell.open();
 		final int maximum = bar.getMaximum();
 		new Thread() {
diff --git a/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet57.java b/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet57.java
index 10b9d8f61a..a801c275d1 100644
--- a/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet57.java
+++ b/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet57.java
@@ -17,6 +17,7 @@ package org.eclipse.swt.snippets;
  * http://www.eclipse.org/swt/snippets/
  */
 import org.eclipse.swt.*;
+import org.eclipse.swt.graphics.Rectangle;
 import org.eclipse.swt.widgets.*;
 
 public class Snippet57 {
@@ -25,7 +26,8 @@ public static void main (String [] args) {
 	final Display display = new Display ();
 	Shell shell = new Shell (display);
 	final ProgressBar bar = new ProgressBar (shell, SWT.SMOOTH);
-	bar.setBounds (10, 10, 200, 32);
+	Rectangle clientArea = shell.getClientArea ();
+	bar.setBounds (clientArea.x, clientArea.y, 200, 32);
 	shell.open ();
 	
 	display.timerExec(100, new Runnable() {
diff --git a/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet58.java b/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet58.java
index a914414180..ec7ee66198 100644
--- a/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet58.java
+++ b/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet58.java
@@ -17,6 +17,7 @@ package org.eclipse.swt.snippets;
  * http://www.eclipse.org/swt/snippets/
  */
 import org.eclipse.swt.*;
+import org.eclipse.swt.graphics.Rectangle;
 import org.eclipse.swt.widgets.*;
 
 public class Snippet58 {
@@ -25,6 +26,8 @@ public static void main (String [] args) {
 	Display display = new Display ();
 	Shell shell = new Shell (display);
 	ToolBar bar = new ToolBar (shell, SWT.BORDER);
+	Rectangle clientArea = shell.getClientArea ();
+	bar.setLocation (clientArea.x, clientArea.y);
 	for (int i=0; i<4; i++) {
 		ToolItem item = new ToolItem (bar, 0);
 		item.setText ("Item " + i);
diff --git a/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet59.java b/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet59.java
index 978dacdcea..45df7c49db 100644
--- a/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet59.java
+++ b/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet59.java
@@ -17,6 +17,7 @@ package org.eclipse.swt.snippets;
  * http://www.eclipse.org/swt/snippets/
  */
 import org.eclipse.swt.*;
+import org.eclipse.swt.graphics.Rectangle;
 import org.eclipse.swt.widgets.*;
 
 public class Snippet59 {
@@ -26,7 +27,8 @@ public static void main (String [] args) {
 	Shell shell = new Shell (display);
 	final List list = new List (shell, SWT.BORDER | SWT.MULTI | SWT.V_SCROLL);
 	for (int i=0; i<128; i++) list.add ("Item " + i);
-	list.setBounds (0, 0, 100, 100);
+	Rectangle clientArea = shell.getClientArea ();
+	list.setBounds (clientArea.x, clientArea.y, 100, 100);
 	list.addListener (SWT.Selection, new Listener () {
 		public void handleEvent (Event e) {
 			String string = "";
diff --git a/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet64.java b/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet64.java
index 8a8db13207..06b6797258 100644
--- a/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet64.java
+++ b/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet64.java
@@ -17,6 +17,7 @@ package org.eclipse.swt.snippets;
  * http://www.eclipse.org/swt/snippets/
  */
 import org.eclipse.swt.*;
+import org.eclipse.swt.graphics.Rectangle;
 import org.eclipse.swt.widgets.*;
 
 public class Snippet64 {
@@ -29,7 +30,8 @@ public static void main (String [] args) {
 		TableItem item = new TableItem (table, 0);
 		item.setText ("Item " + i);
 	}
-	table.setBounds (0, 0, 100, 100);
+	Rectangle clientArea = shell.getClientArea ();
+	table.setBounds (clientArea.x, clientArea.y, 100, 100);
 	table.addListener (SWT.Selection, new Listener () {
 		public void handleEvent (Event e) {
 			String string = "";
diff --git a/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet67.java b/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet67.java
index 0214e9d1a0..a809f6e3cf 100644
--- a/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet67.java
+++ b/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet67.java
@@ -26,6 +26,8 @@ public static void main (String [] args) {
 	final Display display = new Display ();
 	final Shell shell = new Shell (display);
 	final ToolBar toolBar = new ToolBar (shell, SWT.NONE);
+	Rectangle clientArea = shell.getClientArea ();
+	toolBar.setLocation(clientArea.x, clientArea.y);
 	final Menu menu = new Menu (shell, SWT.POP_UP);
 	for (int i=0; i<8; i++) {
 		MenuItem item = new MenuItem (menu, SWT.PUSH);
diff --git a/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet73.java b/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet73.java
index 45d855c4f1..e74646b582 100644
--- a/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet73.java
+++ b/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet73.java
@@ -17,6 +17,7 @@ package org.eclipse.swt.snippets;
  * http://www.eclipse.org/swt/snippets/
  */
 import org.eclipse.swt.*;
+import org.eclipse.swt.graphics.Rectangle;
 import org.eclipse.swt.widgets.*;
 
 public class Snippet73 {
@@ -48,7 +49,8 @@ public static void main (String [] args) {
 			}
 		}
 	});
-	tree.setSize (200, 200);
+	Rectangle clientArea = shell.getClientArea ();
+	tree.setBounds (clientArea.x, clientArea.y, 200, 200);
 	shell.setSize (300, 300);
 	shell.open ();
 	while (!shell.isDisposed ()) {
diff --git a/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet76.java b/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet76.java
index e81783bbc6..aa7b1a2c18 100644
--- a/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet76.java
+++ b/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet76.java
@@ -17,6 +17,7 @@ package org.eclipse.swt.snippets;
  * http://www.eclipse.org/swt/snippets/
  */
 import org.eclipse.swt.*;
+import org.eclipse.swt.graphics.Rectangle;
 import org.eclipse.swt.widgets.*;
 
 public class Snippet76 {
@@ -25,6 +26,8 @@ public static void main (String [] args) {
 	Display display = new Display ();
 	final Shell shell = new Shell (display);
 	final TabFolder tabFolder = new TabFolder (shell, SWT.BORDER);
+	Rectangle clientArea = shell.getClientArea ();
+	tabFolder.setLocation (clientArea.x, clientArea.y);
 	for (int i=0; i<6; i++) {
 		TabItem item = new TabItem (tabFolder, SWT.NONE);
 		item.setText ("TabItem " + i);
diff --git a/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet90.java b/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet90.java
index 7bf13cdfa0..a39a5b1e0e 100644
--- a/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet90.java
+++ b/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet90.java
@@ -39,7 +39,8 @@ public static void main (String [] args) {
 			}
 		}
 	});
-	tree.setSize (200, 200);
+	Rectangle clientArea = shell.getClientArea ();
+	tree.setBounds (clientArea.x, clientArea.y, 200, 200);
 	shell.setSize (300, 300);
 	shell.open ();
 	while (!shell.isDisposed ()) {
diff --git a/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet97.java b/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet97.java
index 1d0174c66e..21e7b21227 100644
--- a/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet97.java
+++ b/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet97.java
@@ -17,6 +17,7 @@ package org.eclipse.swt.snippets;
  * http://www.eclipse.org/swt/snippets/
  */
 import org.eclipse.swt.*;
+import org.eclipse.swt.graphics.Rectangle;
 import org.eclipse.swt.widgets.*;
 
 public class Snippet97 {
@@ -44,7 +45,8 @@ public static void main (String [] args) {
 			}
 		}
 	});
-	tree.setSize (200, 200);
+	Rectangle clientArea = shell.getClientArea ();
+	tree.setBounds (clientArea.x, clientArea.y, 200, 200);
 	shell.setSize (300, 300);
 	shell.open ();
 	while (!shell.isDisposed ()) {