Do not set font to null on startup.

6 files changed, 8 insertions, 0 deletions

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 4082a223c4..d9cfc54fa1 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
@@ -295,6 +295,7 @@ class CTabFolderTab extends Tab {
 	 * Sets the font of CTabItem 0.
 	 */
 	void setItemFont () {
+		if (instance.startup) return;
 		tabFolder1.getItem (0).setFont (itemFont);
 	}
 }
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 3201eac2f2..52f6757b60 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
@@ -32,6 +32,8 @@ public class ControlExample {
 		"openFolder.gif",
 		"target.gif" };
 
+	boolean startup = true;
+
 	/**
 	 * Creates an instance of a ControlExample embedded inside
 	 * the supplied parent Composite.
@@ -48,6 +50,7 @@ public class ControlExample {
 		    item.setControl (tabs [i].createTabFolderPage (tabFolder));
 		    item.setData (tabs [i]);
 		}
+		startup = false;
 	}
 
 	/**
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 b733a704fe..17994629d2 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
@@ -836,6 +836,7 @@ abstract class Tab {
 	 * Sets the font of the "Example" widgets.
 	 */
 	void setExampleWidgetFont () {
+		if (instance.startup) return;
 		if (fontButton == null) return; // no font button on this tab
 		Control [] controls = getExampleWidgets ();
 		for (int i = 0; i < controls.length; i++) {
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 d98e3ac7ad..ba6d3a42d8 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
@@ -327,6 +327,7 @@ class TableTab extends ScrollableTab {
 	 * Sets the font of TableItem 0.
 	 */
 	void setItemFont () {
+		if (instance.startup) return;
 		table1.getItem (0).setFont (itemFont);
 		packColumns ();
 	}
diff --git a/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/controlexample/TableTreeTab.java b/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/controlexample/TableTreeTab.java
index bf833b2b07..f2f692fc02 100644
--- a/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/controlexample/TableTreeTab.java
+++ b/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/controlexample/TableTreeTab.java
@@ -359,6 +359,7 @@ class TableTreeTab extends ScrollableTab {
 	 * Sets the font of the Node 1 TreeItems.
 	 */
 	void setItemFont () {
+		if (instance.startup) return;
 		node1.setFont (itemFont);
 	}
 
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 484a391be6..8cc69baa0d 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
@@ -298,6 +298,7 @@ class TreeTab extends ScrollableTab {
 	 * Sets the font of the Node 1 TreeItems.
 	 */
 	void setItemFont () {
+		if (instance.startup) return;
 		textNode1.setFont (itemFont);
 		imageNode1.setFont (itemFont);
 	}