diff options
author | Steve Northover <steve> | 2005-08-03 19:58:48 +0000 |
---|---|---|
committer | Steve Northover <steve> | 2005-08-03 19:58:48 +0000 |
commit | 80fe11f60f1cb5347a5ad19f649b59f8b1c15f45 (patch) | |
tree | 3eb34c160014d6fc70a44df4c5a940fdeb7f0bdc | |
parent | 13a310a2d86d21288f6ba8222bb84b202aeb8f10 (diff) | |
download | eclipse.platform.swt-80fe11f60f1cb5347a5ad19f649b59f8b1c15f45.tar.gz eclipse.platform.swt-80fe11f60f1cb5347a5ad19f649b59f8b1c15f45.tar.xz eclipse.platform.swt-80fe11f60f1cb5347a5ad19f649b59f8b1c15f45.zip |
get rid of HANDLE state flag
20 files changed, 6 insertions, 27 deletions
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/widgets/Button.java b/bundles/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/widgets/Button.java index e1bf2d01b2..788aee869f 100755 --- a/bundles/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/widgets/Button.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/widgets/Button.java @@ -201,7 +201,6 @@ public Point computeSize (int wHint, int hHint, boolean changed) { return new Point (width, height); } void createHandle (int index) { - state |= HANDLE; int borderWidth = (style & SWT.BORDER) != 0 ? 1 : 0; int parentHandle = parent.handle; diff --git a/bundles/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/widgets/Combo.java b/bundles/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/widgets/Combo.java index 80a4c2dce1..3b381bef8c 100755 --- a/bundles/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/widgets/Combo.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/widgets/Combo.java @@ -371,8 +371,6 @@ public void copy () { OS.XmTextCopy (argList [1], OS.XtLastTimestampProcessed (xDisplay)); } void createHandle (int index) { - state |= HANDLE; - /* * Feature in Motif. When items are added or removed * from a combo, it may request and be granted, a new diff --git a/bundles/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/widgets/Composite.java b/bundles/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/widgets/Composite.java index 26440cd1c6..0a4732005c 100755 --- a/bundles/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/widgets/Composite.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/widgets/Composite.java @@ -221,7 +221,7 @@ protected void checkSubclass () { /* Do nothing - Subclassing is allowed */ } void createHandle (int index) { - state |= HANDLE | CANVAS; + state |= CANVAS; boolean scroll = (style & (SWT.H_SCROLL | SWT.V_SCROLL)) != 0; createHandle (index, parent.handle, scroll); } diff --git a/bundles/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/widgets/Decorations.java b/bundles/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/widgets/Decorations.java index 77f6739f78..54316f9e88 100755 --- a/bundles/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/widgets/Decorations.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/widgets/Decorations.java @@ -244,7 +244,7 @@ public Rectangle computeTrim (int x, int y, int width, int height) { return trim; } void createHandle (int index) { - state |= HANDLE | CANVAS; + state |= CANVAS; createHandle (index, parent.handle, true); } void createWidget (int index) { diff --git a/bundles/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/widgets/Group.java b/bundles/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/widgets/Group.java index 956327dc43..766b078026 100755 --- a/bundles/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/widgets/Group.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/widgets/Group.java @@ -135,9 +135,7 @@ public Rectangle computeTrim (int x, int y, int width, int height) { } return new Rectangle (trimX, trimY, trimWidth, trimHeight); } -void createHandle (int index) { - state |= HANDLE; - +void createHandle (int index) { /* * Feature in Motif. When a widget is managed or unmanaged, * it may request and be granted, a new size in the OS. This diff --git a/bundles/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/widgets/Label.java b/bundles/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/widgets/Label.java index c4d337c581..ee2a0010c7 100755 --- a/bundles/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/widgets/Label.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/widgets/Label.java @@ -227,7 +227,6 @@ public Point computeSize (int wHint, int hHint, boolean changed) { return new Point (width, height); } void createHandle (int index) { - state |= HANDLE; int parentHandle = parent.handle; int borderWidth = (style & SWT.BORDER) != 0 ? 1 : 0; if ((style & SWT.SEPARATOR) != 0) { diff --git a/bundles/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/widgets/Link.java b/bundles/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/widgets/Link.java index 9455a47f71..cad199ff60 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/widgets/Link.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/widgets/Link.java @@ -133,7 +133,6 @@ public Point computeSize (int wHint, int hHint, boolean changed) { return new Point (width, height); } void createHandle (int index) { - state |= HANDLE; int [] argList = { OS.XmNancestorSensitive, 1, OS.XmNborderWidth, (style & SWT.BORDER) != 0 ? 1 : 0, diff --git a/bundles/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/widgets/List.java b/bundles/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/widgets/List.java index b49ca80f5c..5c1015e850 100755 --- a/bundles/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/widgets/List.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/widgets/List.java @@ -246,9 +246,7 @@ public Rectangle computeTrim (int x, int y, int width, int height) { trimY -= argList [1] + argList [3] + argList [7]; return new Rectangle (trimX, trimY, trimWidth, trimHeight); } -void createHandle (int index) { - state |= HANDLE; - +void createHandle (int index) { /* * Feature in Motif. When items are added or removed * from a list, it may request and be granted, a new diff --git a/bundles/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/widgets/Menu.java b/bundles/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/widgets/Menu.java index 31c4005a4f..89c3636a33 100755 --- a/bundles/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/widgets/Menu.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/widgets/Menu.java @@ -263,9 +263,7 @@ static MenuItem checkNull (MenuItem item) { if (item == null) SWT.error (SWT.ERROR_NULL_ARGUMENT); return item; } -void createHandle (int index) { - state |= HANDLE; - +void createHandle (int index) { /* * Bug in Motif. For some reason, creating a menu after any application context * and shell have been destroyed will segment fault unless a new application diff --git a/bundles/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/widgets/MenuItem.java b/bundles/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/widgets/MenuItem.java index 54717f30d5..54a1259fc7 100755 --- a/bundles/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/widgets/MenuItem.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/widgets/MenuItem.java @@ -254,7 +254,6 @@ protected void checkSubclass () { if (!isValidSubclass ()) error (SWT.ERROR_INVALID_SUBCLASS); } void createHandle (int index) { - state |= HANDLE; int parentHandle = parent.handle; int [] argList1 = {OS.XmNchildren, 0, OS.XmNnumChildren, 0}; OS.XtGetValues (parentHandle, argList1, argList1.length / 2); diff --git a/bundles/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/widgets/ProgressBar.java b/bundles/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/widgets/ProgressBar.java index 1903a26ea9..38453867d3 100755 --- a/bundles/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/widgets/ProgressBar.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/widgets/ProgressBar.java @@ -101,7 +101,6 @@ public Point computeSize (int wHint, int hHint, boolean changed) { return new Point (width, height); } void createHandle (int index) { - state |= HANDLE; int background = defaultBackground (); int parentHandle = parent.handle; int [] argList = { diff --git a/bundles/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/widgets/Sash.java b/bundles/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/widgets/Sash.java index 7d7e771063..060da91eea 100755 --- a/bundles/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/widgets/Sash.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/widgets/Sash.java @@ -122,7 +122,6 @@ public Point computeSize (int wHint, int hHint, boolean changed) { return new Point (width, height); } void createHandle (int index) { - state |= HANDLE; int border = (style & SWT.BORDER) != 0 ? 1 : 0; int [] argList = { OS.XmNborderWidth, border, diff --git a/bundles/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/widgets/Scale.java b/bundles/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/widgets/Scale.java index 57d211345b..c725ba0109 100755 --- a/bundles/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/widgets/Scale.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/widgets/Scale.java @@ -118,7 +118,6 @@ public Point computeSize (int wHint, int hHint, boolean changed) { return new Point (width, height); } void createHandle (int index) { - state |= HANDLE; int [] argList = { OS.XmNtitleString, 0, OS.XmNborderWidth, (style & SWT.BORDER) != 0 ? 1 : 0, diff --git a/bundles/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/widgets/ScrollBar.java b/bundles/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/widgets/ScrollBar.java index 09c10311d8..b3080fcc3c 100755 --- a/bundles/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/widgets/ScrollBar.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/widgets/ScrollBar.java @@ -132,7 +132,6 @@ static int checkStyle (int style) { return checkBits (style, SWT.HORIZONTAL, SWT.VERTICAL, 0, 0, 0, 0); } void createHandle (int index) { - state |= HANDLE; int [] argList = { OS.XmNancestorSensitive, 1, OS.XmNborderWidth, (style & SWT.BORDER) != 0 ? 1 : 0, diff --git a/bundles/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/widgets/Scrollable.java b/bundles/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/widgets/Scrollable.java index 6957be0254..69820fe911 100755 --- a/bundles/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/widgets/Scrollable.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/widgets/Scrollable.java @@ -128,7 +128,6 @@ ScrollBar createStandardBar (int style) { bar.parent = this; bar.style = style; bar.display = display; - bar.state |= HANDLE; int [] argList = {OS.XmNhorizontalScrollBar, 0, OS.XmNverticalScrollBar, 0}; OS.XtGetValues (scrolledHandle, argList, argList.length / 2); if (style == SWT.H_SCROLL) bar.handle = argList [1]; diff --git a/bundles/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/widgets/Shell.java b/bundles/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/widgets/Shell.java index a9dc354f0a..738c39ac47 100755 --- a/bundles/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/widgets/Shell.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/widgets/Shell.java @@ -567,7 +567,7 @@ void createFocusProxy () { OS.XtSetMappedWhenManaged (focusProxy, true); } void createHandle (int index) { - state |= HANDLE | CANVAS; + state |= CANVAS; int decorations = 0; if ((style & SWT.NO_TRIM) == 0) { if ((style & SWT.MIN) != 0) decorations |= OS.MWM_DECOR_MINIMIZE; diff --git a/bundles/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/widgets/Slider.java b/bundles/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/widgets/Slider.java index 8fde304e0e..30c1b08fe1 100755 --- a/bundles/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/widgets/Slider.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/widgets/Slider.java @@ -157,7 +157,6 @@ public Point computeSize (int wHint, int hHint, boolean changed) { return new Point (width, height); } void createHandle (int index) { - state |= HANDLE; int [] argList = { OS.XmNancestorSensitive, 1, OS.XmNhighlightThickness, display.textHighlightThickness, diff --git a/bundles/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/widgets/Spinner.java b/bundles/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/widgets/Spinner.java index 1390b22e93..72d2912451 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/widgets/Spinner.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/widgets/Spinner.java @@ -243,7 +243,6 @@ public void copy () { OS.XmTextCopy (argList [1], OS.XtLastTimestampProcessed (xDisplay)); } void createHandle (int index) { - state |= HANDLE; int [] argList1 = { OS.XmNcolumns, 2, OS.XmNdecimalPoints, 0, diff --git a/bundles/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/widgets/Text.java b/bundles/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/widgets/Text.java index cb13de051a..29fa336bad 100755 --- a/bundles/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/widgets/Text.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/widgets/Text.java @@ -350,7 +350,6 @@ public void copy () { OS.XmTextCopy (handle, OS.XtLastTimestampProcessed (xDisplay)); } void createHandle (int index) { - state |= HANDLE; int [] argList1 = { OS.XmNverifyBell, 0, OS.XmNeditMode, (style & SWT.SINGLE) != 0 ? OS.XmSINGLE_LINE_EDIT : OS.XmMULTI_LINE_EDIT, diff --git a/bundles/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/widgets/ToolItem.java b/bundles/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/widgets/ToolItem.java index 8ca5f933af..1baa7f458b 100755 --- a/bundles/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/widgets/ToolItem.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/widgets/ToolItem.java @@ -164,7 +164,6 @@ protected void checkSubclass () { if (!isValidSubclass ()) error (SWT.ERROR_INVALID_SUBCLASS); } void createHandle (int index) { - state |= HANDLE; int parentHandle = parent.handle; if ((style & SWT.SEPARATOR) != 0) { int orientation = (parent.style & SWT.HORIZONTAL) != 0 ? OS.XmVERTICAL : OS.XmHORIZONTAL; |