summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCarolyn MacLeod <carolyn>2006-03-15 23:27:29 +0000
committerCarolyn MacLeod <carolyn>2006-03-15 23:27:29 +0000
commita17452dd94a1be56628b278a6ea50bfeb76fe36f (patch)
treee3ac08b4cb9cf05e2d9e64f04eda8c0120e94b31
parent2a91f7d1b466e7aaf2c654218f72c1b3835595eb (diff)
downloadeclipse.platform.swt-a17452dd94a1be56628b278a6ea50bfeb76fe36f.tar.gz
eclipse.platform.swt-a17452dd94a1be56628b278a6ea50bfeb76fe36f.tar.xz
eclipse.platform.swt-a17452dd94a1be56628b278a6ea50bfeb76fe36f.zip
Don't reset widget state on startup.
-rw-r--r--examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/controlexample/CanvasTab.java2
-rw-r--r--examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/controlexample/CoolBarTab.java2
-rw-r--r--examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/controlexample/GroupTab.java2
-rwxr-xr-xexamples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/controlexample/RangeTab.java8
-rwxr-xr-xexamples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/controlexample/SliderTab.java8
-rw-r--r--examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/controlexample/SpinnerTab.java10
-rwxr-xr-xexamples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/controlexample/TableTab.java11
-rwxr-xr-xexamples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/controlexample/TreeTab.java11
8 files changed, 32 insertions, 22 deletions
diff --git a/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/controlexample/CanvasTab.java b/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/controlexample/CanvasTab.java
index f6f72a7d7d..3e3fe44108 100644
--- a/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/controlexample/CanvasTab.java
+++ b/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/controlexample/CanvasTab.java
@@ -305,6 +305,6 @@ class CanvasTab extends Tab {
noMergePaintsButton.setSelection ((canvas.getStyle () & SWT.NO_MERGE_PAINTS) != 0);
noRedrawResizeButton.setSelection ((canvas.getStyle () & SWT.NO_REDRAW_RESIZE) != 0);
doubleBufferedButton.setSelection ((canvas.getStyle () & SWT.DOUBLE_BUFFERED) != 0);
- setCaret ();
+ if (!instance.startup) setCaret ();
}
}
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 957f909233..da0cefb2a5 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
@@ -305,7 +305,7 @@ class CoolBarTab extends Tab {
borderButton.setSelection ((coolBar.getStyle () & SWT.BORDER) != 0);
flatButton.setSelection ((coolBar.getStyle () & SWT.FLAT) != 0);
dropDownButton.setSelection ((coolBar.getItem(0).getStyle () & SWT.DROP_DOWN) != 0);
- setWidgetLocked ();
+ if (!instance.startup) setWidgetLocked ();
}
/**
diff --git a/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/controlexample/GroupTab.java b/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/controlexample/GroupTab.java
index fec62e6f5f..01f4e82e43 100644
--- a/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/controlexample/GroupTab.java
+++ b/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/controlexample/GroupTab.java
@@ -162,6 +162,6 @@ class GroupTab extends Tab {
shadowOutButton.setSelection ((group1.getStyle () & SWT.SHADOW_OUT) != 0);
shadowNoneButton.setSelection ((group1.getStyle () & SWT.SHADOW_NONE) != 0);
borderButton.setSelection ((group1.getStyle () & SWT.BORDER) != 0);
- setTitleText ();
+ if (!instance.startup) setTitleText ();
}
}
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 cd0a14ad74..b597c3493c 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
@@ -150,9 +150,11 @@ abstract class RangeTab extends Tab {
*/
void setExampleWidgetState () {
super.setExampleWidgetState ();
- setWidgetMinimum ();
- setWidgetMaximum ();
- setWidgetSelection ();
+ if (!instance.startup) {
+ setWidgetMinimum ();
+ setWidgetMaximum ();
+ setWidgetSelection ();
+ }
Control [] controls = getExampleWidgets ();
if (controls.length != 0) {
if (orientationButtons) {
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 d26efb17a7..cd05aae626 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
@@ -205,9 +205,11 @@ class SliderTab extends RangeTab {
*/
void setExampleWidgetState () {
super.setExampleWidgetState ();
- setWidgetIncrement ();
- setWidgetPageIncrement ();
- setWidgetThumb ();
+ if (!instance.startup) {
+ setWidgetIncrement ();
+ setWidgetPageIncrement ();
+ setWidgetThumb ();
+ }
}
/**
diff --git a/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/controlexample/SpinnerTab.java b/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/controlexample/SpinnerTab.java
index ae8c2778d7..42d7dab116 100644
--- a/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/controlexample/SpinnerTab.java
+++ b/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/controlexample/SpinnerTab.java
@@ -71,6 +71,8 @@ class SpinnerTab extends RangeTab {
/* Create the example widgets */
spinner1 = new Spinner (spinnerGroup, style);
+ spinner1.setMaximum(100);
+ spinner1.setSelection(50);
}
/**
@@ -244,9 +246,11 @@ class SpinnerTab extends RangeTab {
super.setExampleWidgetState ();
readOnlyButton.setSelection ((spinner1.getStyle () & SWT.READ_ONLY) != 0);
wrapButton.setSelection ((spinner1.getStyle () & SWT.WRAP) != 0);
- setWidgetIncrement ();
- setWidgetPageIncrement ();
- setWidgetDigits ();
+ if (!instance.startup) {
+ setWidgetIncrement ();
+ setWidgetPageIncrement ();
+ setWidgetDigits ();
+ }
}
/**
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 61b5a1df62..68240ffd9d 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
@@ -569,17 +569,18 @@ class TableTab extends ScrollableTab {
* Sets the state of the "Example" widgets.
*/
void setExampleWidgetState () {
- super.setExampleWidgetState ();
setItemBackground ();
setItemForeground ();
setItemFont ();
setCellBackground ();
setCellForeground ();
setCellFont ();
- setExampleWidgetSize ();
- setWidgetHeaderVisible ();
- setWidgetSortIndicator ();
- setWidgetLinesVisible ();
+ if (!instance.startup) {
+ setWidgetHeaderVisible ();
+ setWidgetSortIndicator ();
+ setWidgetLinesVisible ();
+ }
+ super.setExampleWidgetState ();
checkButton.setSelection ((table1.getStyle () & SWT.CHECK) != 0);
fullSelectionButton.setSelection ((table1.getStyle () & SWT.FULL_SELECTION) != 0);
hideSelectionButton.setSelection ((table1.getStyle () & SWT.HIDE_SELECTION) != 0);
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 ba45d7d595..dca1152f5f 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
@@ -535,17 +535,18 @@ class TreeTab extends ScrollableTab {
* Sets the state of the "Example" widgets.
*/
void setExampleWidgetState () {
- super.setExampleWidgetState ();
setItemBackground ();
setItemForeground ();
setItemFont ();
setCellBackground ();
setCellForeground ();
setCellFont ();
- setExampleWidgetSize ();
- setWidgetHeaderVisible ();
- setWidgetSortIndicator ();
- setWidgetLinesVisible ();
+ if (!instance.startup) {
+ setWidgetHeaderVisible ();
+ setWidgetSortIndicator ();
+ setWidgetLinesVisible ();
+ }
+ super.setExampleWidgetState ();
checkButton.setSelection ((tree1.getStyle () & SWT.CHECK) != 0);
checkButton.setSelection ((tree2.getStyle () & SWT.CHECK) != 0);
fullSelectionButton.setSelection ((tree1.getStyle () & SWT.FULL_SELECTION) != 0);