*** empty log message ***

20 files changed, 202 insertions, 195 deletions

diff --git a/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/controlexample/AlignableTab.java b/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/controlexample/AlignableTab.java
index 0ae087ce9c..43346a8946 100755
--- a/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/controlexample/AlignableTab.java
+++ b/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/controlexample/AlignableTab.java
@@ -39,7 +39,7 @@ abstract class AlignableTab extends Tab {
 		super.createControlGroup ();

 		

 		/* Create the group */

-		allignmentGroup = new Group (controlGroup, SWT.NULL);

+		allignmentGroup = new Group (controlGroup, SWT.NONE);

 		allignmentGroup.setLayout (new GridLayout ());

 		allignmentGroup.setLayoutData (new GridData(GridData.HORIZONTAL_ALIGN_FILL |

 			GridData.VERTICAL_ALIGN_FILL));

diff --git a/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/controlexample/CComboTab.java b/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/controlexample/CComboTab.java
index 1116466219..562cbad8b9 100644
--- a/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/controlexample/CComboTab.java
+++ b/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/controlexample/CComboTab.java
@@ -45,7 +45,7 @@ class CComboTab extends Tab {
 		super.createExampleGroup ();
 		
 		/* Create a group for the combo box */
-		comboGroup = new Group (exampleGroup, SWT.NULL);
+		comboGroup = new Group (exampleGroup, SWT.NONE);
 		comboGroup.setLayout (new GridLayout ());
 		comboGroup.setLayoutData (new GridData (GridData.GRAB_HORIZONTAL | GridData.HORIZONTAL_ALIGN_FILL | GridData.VERTICAL_ALIGN_FILL));
 		comboGroup.setText (ControlExample.getResourceString("Custom_Combo"));
diff --git a/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/controlexample/CLabelTab.java b/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/controlexample/CLabelTab.java
index 63cfee31e0..0e4aed6f7e 100644
--- a/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/controlexample/CLabelTab.java
+++ b/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/controlexample/CLabelTab.java
@@ -35,7 +35,7 @@ class CLabelTab extends AlignableTab {
 		super.createExampleGroup ();
 		
 		/* Create a group for the text labels */
-		textLabelGroup = new Group(exampleGroup, SWT.NULL);
+		textLabelGroup = new Group(exampleGroup, SWT.NONE);
 		GridLayout gridLayout = new GridLayout ();
 		textLabelGroup.setLayout (gridLayout);
 		gridLayout.numColumns = 3;
diff --git a/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/controlexample/CTabFolderTab.java b/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/controlexample/CTabFolderTab.java
index 72b44d1c03..12b901d0a6 100644
--- a/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/controlexample/CTabFolderTab.java
+++ b/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/controlexample/CTabFolderTab.java
@@ -1,130 +1,130 @@
-package org.eclipse.swt.examples.controlexample;

-

-/*

+package org.eclipse.swt.examples.controlexample;
+
+/*
  * (c) Copyright IBM Corp. 2000, 2002.
  * This file is made available under the terms of the Common Public License v1.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html

- */

-

-import org.eclipse.swt.*;

-import org.eclipse.swt.custom.*;

-import org.eclipse.swt.events.*;

-import org.eclipse.swt.layout.*;

-import org.eclipse.swt.widgets.*;

-

-class CTabFolderTab extends Tab {

-	int lastSelectedTab = 0;

-	

-	/* Example widgets and groups that contain them */

-	CTabFolder tabFolder1;

-	Group tabFolderGroup;

-	

-	/* Style widgets added to the "Style" group */

-	Button topButton, bottomButton, borderButton, flatButton;

-

-	static String [] CTabItems1 = {ControlExample.getResourceString("CTabItem1_0"),

-								  ControlExample.getResourceString("CTabItem1_1"),

-								  ControlExample.getResourceString("CTabItem1_2")};

-

-	/**

-	 * Creates the Tab within a given instance of ControlExample.

-	 */

-	CTabFolderTab(ControlExample instance) {

-		super(instance);

-	}

-	

-	/**

-	 * Creates the "Example" group.

-	 */

-	void createExampleGroup () {

-		super.createExampleGroup ();

-		

-		/* Create a group for the CTabFolder */

-		tabFolderGroup = new Group (exampleGroup, SWT.NULL);

-		tabFolderGroup.setLayout (new GridLayout ());

-		tabFolderGroup.setLayoutData (new GridData (GridData.GRAB_HORIZONTAL | GridData.HORIZONTAL_ALIGN_FILL | GridData.VERTICAL_ALIGN_FILL));

-		tabFolderGroup.setText ("CTabFolder");

-	}

-	

-	/**

-	 * Creates the "Example" widgets.

-	 */

-	void createExampleWidgets () {

-		

-		/* Compute the widget style */

-		int style = SWT.NONE;

-		if (topButton.getSelection ()) style |= SWT.TOP;

-		if (bottomButton.getSelection ()) style |= SWT.BOTTOM;

-		if (borderButton.getSelection ()) style |= SWT.BORDER;

-		if (flatButton.getSelection ()) style |= SWT.FLAT;

-

-		/* Create the example widgets */

-		tabFolder1 = new CTabFolder (tabFolderGroup, style);

-		for (int i = 0; i < CTabItems1.length; i++) {

-			CTabItem item = new CTabItem(tabFolder1, SWT.NONE);

-			item.setText(CTabItems1[i]);

-			Label label = new Label(tabFolder1,SWT.NONE);

-			label.setText(ControlExample.getResourceString("CTabItem_content" + ": " + i));

-			item.setControl(label);

-		}

-		tabFolder1.addListener(SWT.Selection, new Listener() {

-			public void handleEvent(Event event) {

-				lastSelectedTab = tabFolder1.getSelectionIndex();

-			}

-		});

-		tabFolder1.setSelection(lastSelectedTab);

-	}

-	

-	/**

-	 * Creates the "Style" group.

-	 */

-	void createStyleGroup() {

-		super.createStyleGroup ();

-		

-		/* Create the extra widgets */

-		topButton = new Button (styleGroup, SWT.RADIO);

-		topButton.setText ("SWT.TOP");

-		topButton.setSelection(true);

-		bottomButton = new Button (styleGroup, SWT.RADIO);

-		bottomButton.setText ("SWT.BOTTOM");

-		borderButton = new Button (styleGroup, SWT.CHECK);

-		borderButton.setText ("SWT.BORDER");

-		flatButton = new Button (styleGroup, SWT.CHECK);

-		flatButton.setText ("SWT.FLAT");

-		flatButton.setEnabled(false);

-	

-		/* Add the listeners */

-		SelectionListener selectionListener = new SelectionAdapter () {

-			public void widgetSelected(SelectionEvent event) {

-				if ((event.widget.getStyle() & SWT.RADIO) != 0) {

-					if (!((Button) event.widget).getSelection ()) return;

-				}

-				recreateExampleWidgets ();

-			};

-		};

-		topButton.addSelectionListener (selectionListener);

-		bottomButton.addSelectionListener (selectionListener);

-		borderButton.addSelectionListener (selectionListener);

-		flatButton.addSelectionListener (selectionListener);

-		borderButton.addSelectionListener(new SelectionAdapter() {

-			public void widgetSelected(SelectionEvent e) {

-				flatButton.setEnabled(borderButton.getSelection());

-			}

-		});

-	}

-	

-	/**

-	 * Gets the "Example" widget children.

-	 */

-	Control [] getExampleWidgets () {

-		return new Control [] {tabFolder1};

-	}

-	

-	/**

-	 * Gets the text for the tab folder item.

-	 */

-	String getTabText () {

-		return "CTabFolder";

-	}

-}

+ * http://www.eclipse.org/legal/cpl-v10.html
+ */
+
+import org.eclipse.swt.*;
+import org.eclipse.swt.custom.*;
+import org.eclipse.swt.events.*;
+import org.eclipse.swt.layout.*;
+import org.eclipse.swt.widgets.*;
+
+class CTabFolderTab extends Tab {
+	int lastSelectedTab = 0;
+	
+	/* Example widgets and groups that contain them */
+	CTabFolder tabFolder1;
+	Group tabFolderGroup;
+	
+	/* Style widgets added to the "Style" group */
+	Button topButton, bottomButton, borderButton, flatButton;
+
+	static String [] CTabItems1 = {ControlExample.getResourceString("CTabItem1_0"),
+								  ControlExample.getResourceString("CTabItem1_1"),
+								  ControlExample.getResourceString("CTabItem1_2")};
+
+	/**
+	 * Creates the Tab within a given instance of ControlExample.
+	 */
+	CTabFolderTab(ControlExample instance) {
+		super(instance);
+	}
+	
+	/**
+	 * Creates the "Example" group.
+	 */
+	void createExampleGroup () {
+		super.createExampleGroup ();
+		
+		/* Create a group for the CTabFolder */
+		tabFolderGroup = new Group (exampleGroup, SWT.NONE);
+		tabFolderGroup.setLayout (new GridLayout ());
+		tabFolderGroup.setLayoutData (new GridData (GridData.GRAB_HORIZONTAL | GridData.HORIZONTAL_ALIGN_FILL | GridData.VERTICAL_ALIGN_FILL));
+		tabFolderGroup.setText ("CTabFolder");
+	}
+	
+	/**
+	 * Creates the "Example" widgets.
+	 */
+	void createExampleWidgets () {
+		
+		/* Compute the widget style */
+		int style = SWT.NONE;
+		if (topButton.getSelection ()) style |= SWT.TOP;
+		if (bottomButton.getSelection ()) style |= SWT.BOTTOM;
+		if (borderButton.getSelection ()) style |= SWT.BORDER;
+		if (flatButton.getSelection ()) style |= SWT.FLAT;
+
+		/* Create the example widgets */
+		tabFolder1 = new CTabFolder (tabFolderGroup, style);
+		for (int i = 0; i < CTabItems1.length; i++) {
+			CTabItem item = new CTabItem(tabFolder1, SWT.NONE);
+			item.setText(CTabItems1[i]);
+			Label label = new Label(tabFolder1,SWT.NONE);
+			label.setText(ControlExample.getResourceString("CTabItem_content" + ": " + i));
+			item.setControl(label);
+		}
+		tabFolder1.addListener(SWT.Selection, new Listener() {
+			public void handleEvent(Event event) {
+				lastSelectedTab = tabFolder1.getSelectionIndex();
+			}
+		});
+		tabFolder1.setSelection(lastSelectedTab);
+	}
+	
+	/**
+	 * Creates the "Style" group.
+	 */
+	void createStyleGroup() {
+		super.createStyleGroup ();
+		
+		/* Create the extra widgets */
+		topButton = new Button (styleGroup, SWT.RADIO);
+		topButton.setText ("SWT.TOP");
+		topButton.setSelection(true);
+		bottomButton = new Button (styleGroup, SWT.RADIO);
+		bottomButton.setText ("SWT.BOTTOM");
+		borderButton = new Button (styleGroup, SWT.CHECK);
+		borderButton.setText ("SWT.BORDER");
+		flatButton = new Button (styleGroup, SWT.CHECK);
+		flatButton.setText ("SWT.FLAT");
+		flatButton.setEnabled(false);
+	
+		/* Add the listeners */
+		SelectionListener selectionListener = new SelectionAdapter () {
+			public void widgetSelected(SelectionEvent event) {
+				if ((event.widget.getStyle() & SWT.RADIO) != 0) {
+					if (!((Button) event.widget).getSelection ()) return;
+				}
+				recreateExampleWidgets ();
+			};
+		};
+		topButton.addSelectionListener (selectionListener);
+		bottomButton.addSelectionListener (selectionListener);
+		borderButton.addSelectionListener (selectionListener);
+		flatButton.addSelectionListener (selectionListener);
+		borderButton.addSelectionListener(new SelectionAdapter() {
+			public void widgetSelected(SelectionEvent e) {
+				flatButton.setEnabled(borderButton.getSelection());
+			}
+		});
+	}
+	
+	/**
+	 * Gets the "Example" widget children.
+	 */
+	Control [] getExampleWidgets () {
+		return new Control [] {tabFolder1};
+	}
+	
+	/**
+	 * Gets the text for the tab folder item.
+	 */
+	String getTabText () {
+		return "CTabFolder";
+	}
+}
diff --git a/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/controlexample/ComboTab.java b/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/controlexample/ComboTab.java
index 6c8af38278..63f405a1bd 100755
--- a/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/controlexample/ComboTab.java
+++ b/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/controlexample/ComboTab.java
@@ -44,7 +44,7 @@ class ComboTab extends Tab {
 		super.createExampleGroup ();

 		

 		/* Create a group for the combo box */

-		comboGroup = new Group (exampleGroup, SWT.NULL);

+		comboGroup = new Group (exampleGroup, SWT.NONE);

 		comboGroup.setLayout (new GridLayout ());

 		comboGroup.setLayoutData (new GridData (GridData.GRAB_HORIZONTAL | GridData.HORIZONTAL_ALIGN_FILL | GridData.VERTICAL_ALIGN_FILL));

 		comboGroup.setText ("Combo");

diff --git a/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/controlexample/ControlExample.java b/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/controlexample/ControlExample.java
index 7a5d112f47..afbb3ed9bb 100755
--- a/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/controlexample/ControlExample.java
+++ b/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/controlexample/ControlExample.java
@@ -57,10 +57,10 @@ public class ControlExample {
 	public ControlExample(Composite parent) {

 		initResources();

 		form = new SashForm (parent,SWT.VERTICAL);

-		tabFolder = new TabFolder (form, SWT.NULL);

+		tabFolder = new TabFolder (form, SWT.NONE);

 		Tab [] tabs = createTabs();

 		for (int i=0; i<tabs.length; i++) {

-			TabItem item = new TabItem (tabFolder, SWT.NULL);

+			TabItem item = new TabItem (tabFolder, SWT.NONE);

 		    item.setText (tabs [i].getTabText ());

 		    item.setControl (tabs [i].createTabFolderPage (tabFolder));

 		    item.setData (tabs [i]);

diff --git a/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/controlexample/CoolBarTab.java b/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/controlexample/CoolBarTab.java
index cb3b9ce51a..c4358fdf7f 100644
--- a/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/controlexample/CoolBarTab.java
+++ b/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/controlexample/CoolBarTab.java
@@ -55,7 +55,7 @@ class CoolBarTab extends Tab {
 	 */

 	void createExampleGroup () {

 		super.createExampleGroup ();

-		coolBarGroup = new Group (exampleGroup, SWT.NULL);

+		coolBarGroup = new Group (exampleGroup, SWT.NONE);

 		coolBarGroup.setLayout (new GridLayout ());

 		coolBarGroup.setLayoutData (new GridData (GridData.GRAB_HORIZONTAL | GridData.HORIZONTAL_ALIGN_FILL | GridData.VERTICAL_ALIGN_FILL));

 		coolBarGroup.setText ("CoolBar");

diff --git a/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/controlexample/DialogTab.java b/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/controlexample/DialogTab.java
index 699b206b17..61e7f507c8 100755
--- a/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/controlexample/DialogTab.java
+++ b/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/controlexample/DialogTab.java
@@ -83,7 +83,7 @@ class DialogTab extends Tab {
 	void createButtonSelected(SelectionEvent event) {

 	

 		/* Compute the appropriate dialog style */

-		int style = SWT.NULL;

+		int style = SWT.NONE;

 		if (okButton.getEnabled () && okButton.getSelection ()) style |= SWT.OK;

 		if (cancelButton.getEnabled () && cancelButton.getSelection ()) style |= SWT.CANCEL;

 		if (yesButton.getEnabled () && yesButton.getSelection ()) style |= SWT.YES;

@@ -205,7 +205,7 @@ class DialogTab extends Tab {
 		 * left half of each example tab.  It consists of the

 		 * style group, the display group and the size group.

 		 */			

-		controlGroup = new Group (tabFolderPage, SWT.NULL);

+		controlGroup = new Group (tabFolderPage, SWT.NONE);

 		GridLayout gridLayout= new GridLayout ();

 		controlGroup.setLayout(gridLayout);

 		gridLayout.numColumns = 2;

@@ -217,7 +217,7 @@ class DialogTab extends Tab {
 		 * Create a group to hold the dialog style combo box and

 		 * create dialog button.

 		 */

-		dialogStyleGroup = new Group (controlGroup, SWT.NULL);

+		dialogStyleGroup = new Group (controlGroup, SWT.NONE);

 		dialogStyleGroup.setLayout (new GridLayout ());

 		GridData gridData = new GridData (GridData.HORIZONTAL_ALIGN_CENTER);

 		gridData.horizontalSpan = 2;

@@ -244,12 +244,12 @@ class DialogTab extends Tab {
 		dialogCombo.setText (strings [0]);

 	

 		/* Create the create dialog button */

-		Button createButton = new Button(dialogStyleGroup, SWT.NULL);

+		Button createButton = new Button(dialogStyleGroup, SWT.NONE);

 		createButton.setText (ControlExample.getResourceString("Create_Dialog"));

 		createButton.setLayoutData (new GridData(GridData.HORIZONTAL_ALIGN_CENTER));

 	

 		/* Create a group for the various dialog button style controls */

-		Group buttonStyleGroup = new Group (controlGroup, SWT.NULL);

+		Group buttonStyleGroup = new Group (controlGroup, SWT.NONE);

 		buttonStyleGroup.setLayout (new GridLayout ());

 		buttonStyleGroup.setLayoutData (new GridData (GridData.HORIZONTAL_ALIGN_FILL | GridData.VERTICAL_ALIGN_FILL));

 		buttonStyleGroup.setText (ControlExample.getResourceString("Button_Styles"));

@@ -271,7 +271,7 @@ class DialogTab extends Tab {
 		ignoreButton.setText ("SWT.IGNORE");

 	

 		/* Create a group for the icon style controls */

-		Group iconStyleGroup = new Group (controlGroup, SWT.NULL);

+		Group iconStyleGroup = new Group (controlGroup, SWT.NONE);

 		iconStyleGroup.setLayout (new GridLayout ());

 		iconStyleGroup.setLayoutData (new GridData (GridData.HORIZONTAL_ALIGN_FILL | GridData.VERTICAL_ALIGN_FILL));

 		iconStyleGroup.setText (ControlExample.getResourceString("Icon_Styles"));

@@ -289,7 +289,7 @@ class DialogTab extends Tab {
 		iconWorkingButton.setText ("SWT.ICON_WORKING");

 	

 		/* Create a group for the modal style controls */

-		Group modalStyleGroup = new Group (controlGroup, SWT.NULL);

+		Group modalStyleGroup = new Group (controlGroup, SWT.NONE);

 		modalStyleGroup.setLayout (new GridLayout ());

 		modalStyleGroup.setLayoutData (new GridData (GridData.HORIZONTAL_ALIGN_FILL | GridData.VERTICAL_ALIGN_FILL));

 		modalStyleGroup.setText (ControlExample.getResourceString("Modal_Styles"));

@@ -305,7 +305,7 @@ class DialogTab extends Tab {
 		systemModalButton.setText ("SWT.SYSTEM_MODAL");

 	

 		/* Create a group for the file dialog style controls */

-		Group fileDialogStyleGroup = new Group (controlGroup, SWT.NULL);

+		Group fileDialogStyleGroup = new Group (controlGroup, SWT.NONE);

 		fileDialogStyleGroup.setLayout (new GridLayout ());

 		fileDialogStyleGroup.setLayoutData (new GridData (GridData.HORIZONTAL_ALIGN_FILL | GridData.VERTICAL_ALIGN_FILL));

 		fileDialogStyleGroup.setText (ControlExample.getResourceString("File_Dialog_Styles"));

@@ -370,7 +370,7 @@ class DialogTab extends Tab {
 		 * Create a group for the text widget to display

 		 * the results returned by the example dialogs.

 		 */

-		resultGroup = new Group (exampleGroup, SWT.NULL);

+		resultGroup = new Group (exampleGroup, SWT.NONE);

 		resultGroup.setLayout (new GridLayout ());

 		resultGroup.setLayoutData (new GridData (GridData.FILL_BOTH));

 		resultGroup.setText (ControlExample.getResourceString("Dialog_Result"));

diff --git a/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/controlexample/LabelTab.java b/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/controlexample/LabelTab.java
index df7fc68ec1..491b068167 100755
--- a/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/controlexample/LabelTab.java
+++ b/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/controlexample/LabelTab.java
@@ -34,7 +34,7 @@ class LabelTab extends AlignableTab {
 		super.createExampleGroup ();

 		

 		/* Create a group for the text labels */

-		textLabelGroup = new Group(exampleGroup, SWT.NULL);

+		textLabelGroup = new Group(exampleGroup, SWT.NONE);

 		GridLayout gridLayout = new GridLayout ();

 		textLabelGroup.setLayout (gridLayout);

 		gridLayout.numColumns = 3;

@@ -99,7 +99,7 @@ class LabelTab extends AlignableTab {
 		horizontalButton.setText ("SWT.HORIZONTAL");

 		verticalButton = new Button (styleGroup, SWT.RADIO);

 		verticalButton.setText ("SWT.VERTICAL");

-		Group styleSubGroup = new Group (styleGroup, SWT.NULL);

+		Group styleSubGroup = new Group (styleGroup, SWT.NONE);

 		styleSubGroup.setLayout (new GridLayout ());

 		shadowInButton = new Button (styleSubGroup, SWT.RADIO);

 		shadowInButton.setText ("SWT.SHADOW_IN");

diff --git a/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/controlexample/ListTab.java b/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/controlexample/ListTab.java
index d82d62a2cf..f63e1d6f84 100755
--- a/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/controlexample/ListTab.java
+++ b/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/controlexample/ListTab.java
@@ -41,7 +41,7 @@ class ListTab extends ScrollableTab {
 		super.createExampleGroup ();

 		

 		/* Create a group for the list */

-		listGroup = new Group (exampleGroup, SWT.NULL);

+		listGroup = new Group (exampleGroup, SWT.NONE);

 		listGroup.setLayout (new GridLayout ());

 		listGroup.setLayoutData (new GridData (GridData.GRAB_HORIZONTAL | GridData.HORIZONTAL_ALIGN_FILL | GridData.VERTICAL_ALIGN_FILL));

 		listGroup.setText ("List");

diff --git a/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/controlexample/ProgressBarTab.java b/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/controlexample/ProgressBarTab.java
index dcc74e1088..9a350e8c1a 100755
--- a/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/controlexample/ProgressBarTab.java
+++ b/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/controlexample/ProgressBarTab.java
@@ -34,7 +34,7 @@ class ProgressBarTab extends RangeTab {
 		super.createExampleGroup ();

 

 		/* Create a group for the progress bar */

-		progressBarGroup = new Group (exampleGroup, SWT.NULL);

+		progressBarGroup = new Group (exampleGroup, SWT.NONE);

 		progressBarGroup.setLayout (new GridLayout ());

 		progressBarGroup.setLayoutData (new GridData (GridData.GRAB_HORIZONTAL | GridData.HORIZONTAL_ALIGN_FILL | GridData.VERTICAL_ALIGN_FILL));

 		progressBarGroup.setText ("ProgressBar");

diff --git a/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/controlexample/RangeTab.java b/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/controlexample/RangeTab.java
index 4fa0ad1b70..f72f61fff5 100755
--- a/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/controlexample/RangeTab.java
+++ b/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/controlexample/RangeTab.java
@@ -43,13 +43,13 @@ abstract class RangeTab extends Tab {
 	void createMaximumGroup() {

 	

 		/* Create the group */

-		Group maximumGroup = new Group (controlGroup, SWT.NULL);

+		Group maximumGroup = new Group (controlGroup, SWT.NONE);

 		maximumGroup.setLayout (new GridLayout ());

 		maximumGroup.setText (ControlExample.getResourceString("Maximum"));

 		maximumGroup.setLayoutData (new GridData (GridData.FILL_HORIZONTAL));

 	

 		/* Create a scale widget */

-		maximumScale = new Scale (maximumGroup, SWT.NULL);

+		maximumScale = new Scale (maximumGroup, SWT.NONE);

 		maximumScale.setMaximum (100);

 		maximumScale.setSelection (100);

 		maximumScale.setPageIncrement (10);

@@ -74,13 +74,13 @@ abstract class RangeTab extends Tab {
 	void createMinimumGroup() {

 	

 		/* Create the group */

-		Group minimumGroup = new Group (controlGroup, SWT.NULL);

+		Group minimumGroup = new Group (controlGroup, SWT.NONE);

 		minimumGroup.setLayout (new GridLayout ());

 		minimumGroup.setText (ControlExample.getResourceString("Minimum"));

 		minimumGroup.setLayoutData (new GridData (GridData.FILL_HORIZONTAL));

 	

 		/* Create a scale widget */

-		minimumScale = new Scale (minimumGroup, SWT.NULL);

+		minimumScale = new Scale (minimumGroup, SWT.NONE);

 		minimumScale.setMaximum (100);

 		minimumScale.setPageIncrement (10);

 		minimumScale.setIncrement (5);

@@ -105,14 +105,14 @@ abstract class RangeTab extends Tab {
 	void createSelectionGroup() {

 	

 		/* Create the group */

-		Group selectionGroup = new Group(controlGroup, SWT.NULL);

+		Group selectionGroup = new Group(controlGroup, SWT.NONE);

 		selectionGroup.setLayout(new GridLayout());

 		GridData gridData = new GridData(GridData.FILL_HORIZONTAL);

 		selectionGroup.setLayoutData(gridData);

 		selectionGroup.setText(ControlExample.getResourceString("Selection"));

 	

 		/* Create a scale widget */

-		selectionScale = new Scale (selectionGroup, SWT.NULL);

+		selectionScale = new Scale (selectionGroup, SWT.NONE);

 		selectionScale.setMaximum (100);

 		selectionScale.setSelection (50);

 		selectionScale.setPageIncrement (10);

diff --git a/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/controlexample/SashFormTab.java b/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/controlexample/SashFormTab.java
index d57c35a740..20706ab88e 100644
--- a/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/controlexample/SashFormTab.java
+++ b/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/controlexample/SashFormTab.java
@@ -86,4 +86,11 @@ class SashFormTab extends Tab {
 	String getTabText () {
 		return "SashForm";
 	}
+	
+	/**
+	 * Recreates the "Example" widgets.
+	 */
+	void recreateExampleWidgets () {
+		// this tab does not use this framework mechanism
+	}
 }
diff --git a/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/controlexample/ShellTab.java b/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/controlexample/ShellTab.java
index a8da54a31f..5f7e90c072 100755
--- a/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/controlexample/ShellTab.java
+++ b/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/controlexample/ShellTab.java
@@ -110,7 +110,7 @@ class ShellTab extends Tab {
 		 * left half of each example tab.  It consists of the

 		 * style group, the display group and the size group.

 		 */		

-		controlGroup = new Group (tabFolderPage, SWT.NULL);

+		controlGroup = new Group (tabFolderPage, SWT.NONE);

 		GridLayout gridLayout= new GridLayout ();

 		controlGroup.setLayout (gridLayout);

 		gridLayout.numColumns = 1;

@@ -119,7 +119,7 @@ class ShellTab extends Tab {
 		controlGroup.setText (ControlExample.getResourceString("Parameters"));

 	

 		/* Create individual groups inside the "Control" group */

-		styleGroup = new Group (controlGroup, SWT.NULL);

+		styleGroup = new Group (controlGroup, SWT.NONE);

 		gridLayout = new GridLayout ();

 		styleGroup.setLayout (gridLayout);

 		gridLayout.numColumns = 2;

@@ -128,7 +128,7 @@ class ShellTab extends Tab {
 		styleGroup.setText (ControlExample.getResourceString("Styles"));

 	

 		/* Create a group for the parent style controls */

-		parentStyleGroup = new Group (styleGroup, SWT.NULL);

+		parentStyleGroup = new Group (styleGroup, SWT.NONE);

 		parentStyleGroup.setLayout (new GridLayout ());

 		GridData gridData = new GridData(GridData.HORIZONTAL_ALIGN_FILL);

 		parentStyleGroup.setLayoutData (gridData);

@@ -147,7 +147,7 @@ class ShellTab extends Tab {
 		parentButton.setText (ControlExample.getResourceString("Parent"));

 	

 		/* Create a group for the decoration style controls */

-		Group decorationStyleGroup = new Group(styleGroup, SWT.NULL);

+		Group decorationStyleGroup = new Group(styleGroup, SWT.NONE);

 		decorationStyleGroup.setLayout (new GridLayout ());

 		GridData gridData = new GridData (GridData.HORIZONTAL_ALIGN_FILL);

 		gridData.verticalSpan = 2;

@@ -191,11 +191,11 @@ class ShellTab extends Tab {
 		systemModalButton.setText ("SWT.SYSTEM_MODAL");

 	

 		/* Create the "create" and "closeAll" buttons */

-		createButton = new Button (styleGroup, SWT.NULL);

+		createButton = new Button (styleGroup, SWT.NONE);

 		gridData = new GridData (GridData.HORIZONTAL_ALIGN_END);

 		createButton.setLayoutData (gridData);

 		createButton.setText (ControlExample.getResourceString("Create_Shell"));

-		closeAllButton = new Button (styleGroup, SWT.NULL);

+		closeAllButton = new Button (styleGroup, SWT.NONE);

 		gridData = new GridData (GridData.HORIZONTAL_ALIGN_BEGINNING);

 		closeAllButton.setText (ControlExample.getResourceString("Close_All_Shells"));

 		closeAllButton.setLayoutData (gridData);

diff --git a/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/controlexample/SliderTab.java b/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/controlexample/SliderTab.java
index 0ded7dcb28..893f0e0bd4 100755
--- a/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/controlexample/SliderTab.java
+++ b/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/controlexample/SliderTab.java
@@ -45,13 +45,13 @@ class SliderTab extends RangeTab {
 		super.createExampleGroup ();

 		

 		/* Create a group for the slider */

-		sliderGroup = new Group (exampleGroup, SWT.NULL);

+		sliderGroup = new Group (exampleGroup, SWT.NONE);

 		sliderGroup.setLayout (new GridLayout ());

 		sliderGroup.setLayoutData (new GridData (GridData.GRAB_HORIZONTAL | GridData.HORIZONTAL_ALIGN_FILL | GridData.VERTICAL_ALIGN_FILL));

 		sliderGroup.setText ("Slider");

 	

 		/* Create a group for the scale */

-		scaleGroup = new Group (exampleGroup, SWT.NULL);

+		scaleGroup = new Group (exampleGroup, SWT.NONE);

 		scaleGroup.setLayout (new GridLayout ());

 		scaleGroup.setLayoutData (new GridData (GridData.GRAB_HORIZONTAL | GridData.HORIZONTAL_ALIGN_FILL | GridData.VERTICAL_ALIGN_FILL));

 		scaleGroup.setText ("Scale");

@@ -90,13 +90,13 @@ class SliderTab extends RangeTab {
 	void createIncrementGroup() {

 	

 		/* Create the group */

-		Group incrementGroup = new Group (controlGroup, SWT.NULL);

+		Group incrementGroup = new Group (controlGroup, SWT.NONE);

 		incrementGroup.setLayout (new GridLayout ());

 		incrementGroup.setText (ControlExample.getResourceString("Increment"));

 		incrementGroup.setLayoutData (new GridData (GridData.FILL_HORIZONTAL));

 	

 		/* Create the scale widget */

-		incrementScale = new Scale (incrementGroup, SWT.NULL);

+		incrementScale = new Scale (incrementGroup, SWT.NONE);

 		incrementScale.setMaximum (100);

 		incrementScale.setSelection (5);

 		incrementScale.setPageIncrement (10);

@@ -121,13 +121,13 @@ class SliderTab extends RangeTab {
 	void createPageIncrementGroup() {

 	

 		/* Create the group */

-		Group pageIncrementGroup = new Group (controlGroup, SWT.NULL);

+		Group pageIncrementGroup = new Group (controlGroup, SWT.NONE);

 		pageIncrementGroup.setLayout (new GridLayout ());

 		pageIncrementGroup.setText (ControlExample.getResourceString("Page_Increment"));

 		pageIncrementGroup.setLayoutData (new GridData (GridData.FILL_HORIZONTAL));

 			

 		/* Create the scale widget */

-		pageIncrementScale = new Scale (pageIncrementGroup, SWT.NULL);

+		pageIncrementScale = new Scale (pageIncrementGroup, SWT.NONE);

 		pageIncrementScale.setMaximum (100);

 		pageIncrementScale.setSelection (10);

 		pageIncrementScale.setPageIncrement (10);

@@ -152,13 +152,13 @@ class SliderTab extends RangeTab {
 	void createThumbGroup() {

 	

 		/* Create the group */

-		Group thumbGroup = new Group (controlGroup, SWT.NULL);

+		Group thumbGroup = new Group (controlGroup, SWT.NONE);

 		thumbGroup.setLayout (new GridLayout ());

 		thumbGroup.setText (ControlExample.getResourceString("Thumb"));

 		thumbGroup.setLayoutData (new GridData (GridData.FILL_HORIZONTAL));

 		

 		/* Create the scale widget */

-		thumbScale = new Scale (thumbGroup, SWT.NULL);

+		thumbScale = new Scale (thumbGroup, SWT.NONE);

 		thumbScale.setMaximum (100);

 		thumbScale.setSelection (10);

 		thumbScale.setPageIncrement (10);

diff --git a/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/controlexample/Tab.java b/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/controlexample/Tab.java
index aadff6304f..349843176d 100755
--- a/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/controlexample/Tab.java
+++ b/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/controlexample/Tab.java
@@ -129,7 +129,7 @@ abstract class Tab {
 	 */

 	void createColorGroup () {

 		/* Create the group */

-		colorGroup = new Group(controlGroup, SWT.NULL);

+		colorGroup = new Group(controlGroup, SWT.NONE);

 		colorGroup.setLayout (new GridLayout (2, false));

 		colorGroup.setLayoutData (new GridData (GridData.HORIZONTAL_ALIGN_FILL | GridData.VERTICAL_ALIGN_FILL));

 		colorGroup.setText (ControlExample.getResourceString ("Colors"));

diff --git a/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/controlexample/TableTab.java b/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/controlexample/TableTab.java
index b4475122b3..74ed69bc63 100755
--- a/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/controlexample/TableTab.java
+++ b/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/controlexample/TableTab.java
@@ -148,7 +148,7 @@ class TableTab extends ScrollableTab {
 		super.createExampleGroup ();

 		

 		/* Create a group for the table */

-		tableGroup = new Group (exampleGroup, SWT.NULL);

+		tableGroup = new Group (exampleGroup, SWT.NONE);

 		tableGroup.setLayout (new GridLayout ());

 		tableGroup.setLayoutData (new GridData (GridData.GRAB_HORIZONTAL | GridData.HORIZONTAL_ALIGN_FILL | GridData.VERTICAL_ALIGN_FILL));

 		tableGroup.setText ("Table");

@@ -173,11 +173,11 @@ class TableTab extends ScrollableTab {
 	

 		/* Fill the table with data */

 		for (int i = 0; i < columnTitles.length; i++) {

-			TableColumn tableColumn = new TableColumn(table1, SWT.NULL);

+			TableColumn tableColumn = new TableColumn(table1, SWT.NONE);

 			tableColumn.setText(columnTitles[i]);

 		}	

 		for (int i=0; i<16; i++) {

-			TableItem item = new TableItem (table1, SWT.NULL);

+			TableItem item = new TableItem (table1, SWT.NONE);

 			item.setImage (instance.images [i % 3]);

 			switch (i % 3) {

 				case 0:

diff --git a/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/controlexample/TextTab.java b/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/controlexample/TextTab.java
index 962aea1ba6..ee54acf275 100755
--- a/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/controlexample/TextTab.java
+++ b/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/controlexample/TextTab.java
@@ -60,13 +60,13 @@ class TextTab extends ScrollableTab {
 		super.createExampleGroup ();

 		

 		/* Create a group for the text widget */

-		textGroup = new Group (exampleGroup, SWT.NULL);

+		textGroup = new Group (exampleGroup, SWT.NONE);

 		textGroup.setLayout (new GridLayout ());

 		textGroup.setLayoutData (new GridData (GridData.GRAB_HORIZONTAL | GridData.HORIZONTAL_ALIGN_FILL | GridData.VERTICAL_ALIGN_FILL));

 		textGroup.setText ("Text");

 	

 		/* Create a group for the styled text widget */

-		styledTextGroup = new Group (exampleGroup, SWT.NULL);

+		styledTextGroup = new Group (exampleGroup, SWT.NONE);

 		styledTextGroup.setLayout (new GridLayout ());

 		styledTextGroup.setLayoutData (new GridData (GridData.GRAB_HORIZONTAL | GridData.HORIZONTAL_ALIGN_FILL | GridData.VERTICAL_ALIGN_FILL));

 		styledTextGroup.setText ("StyledText");

diff --git a/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/controlexample/ToolBarTab.java b/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/controlexample/ToolBarTab.java
index 63380c6c14..faaaec82a0 100755
--- a/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/controlexample/ToolBarTab.java
+++ b/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/controlexample/ToolBarTab.java
@@ -35,13 +35,13 @@ class ToolBarTab extends Tab {
 		super.createExampleGroup ();

 		

 		/* Create a group for the image tool bar */

-		imageToolBarGroup = new Group (exampleGroup, SWT.NULL);

+		imageToolBarGroup = new Group (exampleGroup, SWT.NONE);

 		imageToolBarGroup.setLayout (new GridLayout ());

 		imageToolBarGroup.setLayoutData (new GridData (GridData.GRAB_HORIZONTAL | GridData.HORIZONTAL_ALIGN_FILL | GridData.VERTICAL_ALIGN_FILL));

 		imageToolBarGroup.setText (ControlExample.getResourceString("Image_ToolBar"));

 	

 		/* Create a group for the text tool bar */

-		textToolBarGroup = new Group (exampleGroup, SWT.NULL);

+		textToolBarGroup = new Group (exampleGroup, SWT.NONE);

 		textToolBarGroup.setLayout (new GridLayout ());

 		textToolBarGroup.setLayoutData (new GridData (GridData.GRAB_HORIZONTAL | GridData.HORIZONTAL_ALIGN_FILL | GridData.VERTICAL_ALIGN_FILL));

 		textToolBarGroup.setText (ControlExample.getResourceString("Text_ToolBar"));

diff --git a/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/controlexample/TreeTab.java b/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/controlexample/TreeTab.java
index bdb1ba73fc..f3cfece159 100755
--- a/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/controlexample/TreeTab.java
+++ b/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/controlexample/TreeTab.java
@@ -33,13 +33,13 @@ class TreeTab extends ScrollableTab {
 		super.createExampleGroup ();

 		

 		/* Create a group for the text tree */

-		treeGroup = new Group (exampleGroup, SWT.NULL);

+		treeGroup = new Group (exampleGroup, SWT.NONE);

 		treeGroup.setLayout (new GridLayout ());

 		treeGroup.setLayoutData (new GridData (GridData.GRAB_HORIZONTAL | GridData.HORIZONTAL_ALIGN_FILL | GridData.VERTICAL_ALIGN_FILL));

 		treeGroup.setText ("Tree");

 	

 		/* Create a group for the image tree */

-		imageTreeGroup = new Group (exampleGroup, SWT.NULL);

+		imageTreeGroup = new Group (exampleGroup, SWT.NONE);

 		imageTreeGroup.setLayout (new GridLayout ());

 		imageTreeGroup.setLayoutData (new GridData (GridData.GRAB_HORIZONTAL | GridData.HORIZONTAL_ALIGN_FILL | GridData.VERTICAL_ALIGN_FILL));

 		imageTreeGroup.setText (ControlExample.getResourceString("Tree_With_Images"));

@@ -58,52 +58,52 @@ class TreeTab extends ScrollableTab {
 	

 		/* Create the text tree */

 		tree1 = new Tree (treeGroup, style);

-		TreeItem node1 = new TreeItem (tree1, SWT.NULL);

+		TreeItem node1 = new TreeItem (tree1, SWT.NONE);

 		node1.setText (ControlExample.getResourceString("Node_1"));

-		TreeItem node2 = new TreeItem (tree1, SWT.NULL);

+		TreeItem node2 = new TreeItem (tree1, SWT.NONE);

 		node2.setText (ControlExample.getResourceString("Node_2"));

-		TreeItem node3 = new TreeItem (tree1, SWT.NULL);

+		TreeItem node3 = new TreeItem (tree1, SWT.NONE);

 		node3.setText (ControlExample.getResourceString("Node_3"));

-		TreeItem node4 = new TreeItem (tree1, SWT.NULL);

+		TreeItem node4 = new TreeItem (tree1, SWT.NONE);

 		node4.setText (ControlExample.getResourceString("Node_4"));

-		TreeItem node1_1 = new TreeItem (node1, SWT.NULL);

+		TreeItem node1_1 = new TreeItem (node1, SWT.NONE);

 		node1_1.setText (ControlExample.getResourceString("Node_1_1"));

-		TreeItem node2_1 = new TreeItem (node2, SWT.NULL);

+		TreeItem node2_1 = new TreeItem (node2, SWT.NONE);

 		node2_1.setText (ControlExample.getResourceString("Node_2_1"));

-		TreeItem node3_1 = new TreeItem (node3, SWT.NULL);

+		TreeItem node3_1 = new TreeItem (node3, SWT.NONE);

 		node3_1.setText (ControlExample.getResourceString("Node_3_1"));

-		TreeItem node2_2 = new TreeItem (node2, SWT.NULL);

+		TreeItem node2_2 = new TreeItem (node2, SWT.NONE);

 		node2_2.setText (ControlExample.getResourceString("Node_2_2"));

-		TreeItem node2_2_1 = new TreeItem (node2_2, SWT.NULL);

+		TreeItem node2_2_1 = new TreeItem (node2_2, SWT.NONE);

 		node2_2_1.setText (ControlExample.getResourceString("Node_2_2_1"));

 	

 		/* Create the image tree */	

 		tree2 = new Tree (imageTreeGroup, style);

-		node1 = new TreeItem (tree2, SWT.NULL);

+		node1 = new TreeItem (tree2, SWT.NONE);

 		node1.setText (ControlExample.getResourceString("Node_1"));

 		node1.setImage (instance.images[ControlExample.ciClosedFolder]);

-		node2 = new TreeItem (tree2, SWT.NULL);

+		node2 = new TreeItem (tree2, SWT.NONE);

 		node2.setText (ControlExample.getResourceString("Node_2"));

 		node2.setImage (instance.images[ControlExample.ciClosedFolder]);

-		node3 = new TreeItem (tree2, SWT.NULL);

+		node3 = new TreeItem (tree2, SWT.NONE);

 		node3.setText (ControlExample.getResourceString("Node_3"));

 		node3.setImage (instance.images[ControlExample.ciClosedFolder]);

-		node4 = new TreeItem (tree2, SWT.NULL);

+		node4 = new TreeItem (tree2, SWT.NONE);

 		node4.setText (ControlExample.getResourceString("Node_4"));

 		node4.setImage (instance.images[ControlExample.ciClosedFolder]);

-		node1_1 = new TreeItem (node1, SWT.NULL);

+		node1_1 = new TreeItem (node1, SWT.NONE);

 		node1_1.setText (ControlExample.getResourceString("Node_1_1"));

 		node1_1.setImage (instance.images[ControlExample.ciClosedFolder]);

-		node2_1 = new TreeItem (node2, SWT.NULL);

+		node2_1 = new TreeItem (node2, SWT.NONE);

 		node2_1.setText (ControlExample.getResourceString("Node_2_1"));

 		node2_1.setImage (instance.images[ControlExample.ciClosedFolder]);

-		node3_1 = new TreeItem (node3, SWT.NULL);

+		node3_1 = new TreeItem (node3, SWT.NONE);

 		node3_1.setText (ControlExample.getResourceString("Node_3_1"));

 		node3_1.setImage (instance.images[ControlExample.ciClosedFolder]);

-		node2_2 = new TreeItem(node2, SWT.NULL);

+		node2_2 = new TreeItem(node2, SWT.NONE);

 		node2_2.setText (ControlExample.getResourceString("Node_2_2"));

 		node2_2.setImage (instance.images[ControlExample.ciClosedFolder]);

-		node2_2_1 = new TreeItem (node2_2, SWT.NULL);

+		node2_2_1 = new TreeItem (node2_2, SWT.NONE);

 		node2_2_1.setText (ControlExample.getResourceString("Node_2_2_1"));

 		node2_2_1.setImage (instance.images[ControlExample.ciClosedFolder]);

 	}