*** empty log message ***

1 files changed, 23 insertions, 46 deletions

diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/ScrollBar.java b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/ScrollBar.java
index 290f65253b..f54e74dbdb 100755
--- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/ScrollBar.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/ScrollBar.java
@@ -143,8 +143,7 @@ ScrollBar (Scrollable parent, int style) {
  * @see SelectionEvent

  */

 public void addSelectionListener (SelectionListener listener) {

-	if (!isValidThread ()) error (SWT.ERROR_THREAD_INVALID_ACCESS);

-	if (!isValidWidget ()) error (SWT.ERROR_WIDGET_DISPOSED);

+	checkWidget();

 	if (listener == null) error (SWT.ERROR_NULL_ARGUMENT);

 	TypedListener typedListener = new TypedListener(listener);

 	addListener (SWT.Selection,typedListener);

@@ -204,8 +203,7 @@ public Display getDisplay () {
  * </ul>

  */

 public boolean getEnabled () {

-	if (!isValidThread ()) error (SWT.ERROR_THREAD_INVALID_ACCESS);

-	if (!isValidWidget ()) error (SWT.ERROR_WIDGET_DISPOSED);

+	checkWidget();

 	return (state & DISABLED) == 0;

 }

 

@@ -222,8 +220,7 @@ public boolean getEnabled () {
  * </ul>

  */

 public int getIncrement () {

-	if (!isValidThread ()) error (SWT.ERROR_THREAD_INVALID_ACCESS);

-	if (!isValidWidget ()) error (SWT.ERROR_WIDGET_DISPOSED);

+	checkWidget();

 	return increment;

 }

 

@@ -238,8 +235,7 @@ public int getIncrement () {
  * </ul>

  */

 public int getMaximum () {

-	if (!isValidThread ()) error (SWT.ERROR_THREAD_INVALID_ACCESS);

-	if (!isValidWidget ()) error (SWT.ERROR_WIDGET_DISPOSED);

+	checkWidget();

 	SCROLLINFO info = new SCROLLINFO ();

 	info.cbSize = SCROLLINFO.sizeof;

 	info.fMask = OS.SIF_RANGE;

@@ -260,8 +256,7 @@ public int getMaximum () {
  * </ul>

  */

 public int getMinimum () {

-	if (!isValidThread ()) error (SWT.ERROR_THREAD_INVALID_ACCESS);

-	if (!isValidWidget ()) error (SWT.ERROR_WIDGET_DISPOSED);

+	checkWidget();

 	SCROLLINFO info = new SCROLLINFO ();

 	info.cbSize = SCROLLINFO.sizeof;

 	info.fMask = OS.SIF_RANGE;

@@ -284,8 +279,7 @@ public int getMinimum () {
  * </ul>

  */

 public int getPageIncrement () {

-	if (!isValidThread ()) error (SWT.ERROR_THREAD_INVALID_ACCESS);

-	if (!isValidWidget ()) error (SWT.ERROR_WIDGET_DISPOSED);

+	checkWidget();

 	return pageIncrement;

 }

 

@@ -300,8 +294,7 @@ public int getPageIncrement () {
  * </ul>

  */

 public Scrollable getParent () {

-	if (!isValidThread ()) error (SWT.ERROR_THREAD_INVALID_ACCESS);

-	if (!isValidWidget ()) error (SWT.ERROR_WIDGET_DISPOSED);

+	checkWidget();

 	return parent;

 }

 

@@ -316,8 +309,7 @@ public Scrollable getParent () {
  * </ul>

  */

 public int getSelection () {

-	if (!isValidThread ()) error (SWT.ERROR_THREAD_INVALID_ACCESS);

-	if (!isValidWidget ()) error (SWT.ERROR_WIDGET_DISPOSED);

+	checkWidget();

 	SCROLLINFO info = new SCROLLINFO ();

 	info.cbSize = SCROLLINFO.sizeof;

 	info.fMask = OS.SIF_POS;

@@ -340,8 +332,7 @@ public int getSelection () {
  * </ul>

  */

 public Point getSize () {

-	if (!isValidThread ()) error (SWT.ERROR_THREAD_INVALID_ACCESS);

-	if (!isValidWidget ()) error (SWT.ERROR_WIDGET_DISPOSED);

+	checkWidget();

 	RECT rect = new RECT ();

 	OS.GetClientRect (parent.handle, rect);

 	int width, height;

@@ -369,8 +360,7 @@ public Point getSize () {
  * @see ScrollBar

  */

 public int getThumb () {

-	if (!isValidThread ()) error (SWT.ERROR_THREAD_INVALID_ACCESS);

-	if (!isValidWidget ()) error (SWT.ERROR_WIDGET_DISPOSED);

+	checkWidget();

 	SCROLLINFO info = new SCROLLINFO ();

 	info.cbSize = SCROLLINFO.sizeof;

 	info.fMask = OS.SIF_PAGE;

@@ -399,8 +389,7 @@ public int getThumb () {
  * </ul>

  */

 public boolean getVisible () {

-	if (!isValidThread ()) error (SWT.ERROR_THREAD_INVALID_ACCESS);

-	if (!isValidWidget ()) error (SWT.ERROR_WIDGET_DISPOSED);

+	checkWidget();

 	return (state & HIDDEN) == 0;

 }

 

@@ -427,8 +416,7 @@ int hwndScrollBar () {
  * </ul>

  */

 public boolean isEnabled () {

-	if (!isValidThread ()) error (SWT.ERROR_THREAD_INVALID_ACCESS);

-	if (!isValidWidget ()) error (SWT.ERROR_WIDGET_DISPOSED);

+	checkWidget();

 	return getEnabled () && parent.isEnabled ();

 }

 

@@ -450,8 +438,7 @@ public boolean isEnabled () {
  * </ul>

  */

 public boolean isVisible () {

-	if (!isValidThread ()) error (SWT.ERROR_THREAD_INVALID_ACCESS);

-	if (!isValidWidget ()) error (SWT.ERROR_WIDGET_DISPOSED);

+	checkWidget();

 	return getVisible () && parent.isVisible ();

 }

 

@@ -484,8 +471,7 @@ void releaseWidget () {
  * @see #addSelectionListener

  */

 public void removeSelectionListener (SelectionListener listener) {

-	if (!isValidThread ()) error (SWT.ERROR_THREAD_INVALID_ACCESS);

-	if (!isValidWidget ()) error (SWT.ERROR_WIDGET_DISPOSED);

+	checkWidget();

 	if (listener == null) error (SWT.ERROR_NULL_ARGUMENT);

 	if (eventTable == null) return;

 	eventTable.unhook (SWT.Selection, listener);

@@ -518,8 +504,7 @@ int scrollBarType () {
  * </ul>

  */

 public void setEnabled (boolean enabled) {

-	if (!isValidThread ()) error (SWT.ERROR_THREAD_INVALID_ACCESS);

-	if (!isValidWidget ()) error (SWT.ERROR_WIDGET_DISPOSED);

+	checkWidget();

 	int hwnd = hwndScrollBar (), type = scrollBarType ();

 	int flags = OS.ESB_DISABLE_BOTH;

 	if (enabled) flags = OS.ESB_ENABLE_BOTH;

@@ -542,8 +527,7 @@ public void setEnabled (boolean enabled) {
  * </ul>

  */

 public void setIncrement (int value) {

-	if (!isValidThread ()) error (SWT.ERROR_THREAD_INVALID_ACCESS);

-	if (!isValidWidget ()) error (SWT.ERROR_WIDGET_DISPOSED);

+	checkWidget();

 	if (value < 1) return;

 	increment = value;

 }

@@ -561,8 +545,7 @@ public void setIncrement (int value) {
  * </ul>

  */

 public void setMaximum (int value) {

-	if (!isValidThread ()) error (SWT.ERROR_THREAD_INVALID_ACCESS);

-	if (!isValidWidget ()) error (SWT.ERROR_WIDGET_DISPOSED);

+	checkWidget();

 	if (value < 0) return;

 	SCROLLINFO info = new SCROLLINFO ();

 	info.cbSize = SCROLLINFO.sizeof;

@@ -612,8 +595,7 @@ public void setMaximum (int value) {
  * </ul>

  */

 public void setMinimum (int value) {

-	if (!isValidThread ()) error (SWT.ERROR_THREAD_INVALID_ACCESS);

-	if (!isValidWidget ()) error (SWT.ERROR_WIDGET_DISPOSED);

+	checkWidget();

 	if (value < 0) return;

 	SCROLLINFO info = new SCROLLINFO ();

 	info.cbSize = SCROLLINFO.sizeof;

@@ -664,8 +646,7 @@ public void setMinimum (int value) {
  * </ul>

  */

 public void setPageIncrement (int value) {

-	if (!isValidThread ()) error (SWT.ERROR_THREAD_INVALID_ACCESS);

-	if (!isValidWidget ()) error (SWT.ERROR_WIDGET_DISPOSED);

+	checkWidget();

 	if (value < 1) return;

 	pageIncrement = value;

 }

@@ -683,8 +664,7 @@ public void setPageIncrement (int value) {
  * </ul>

  */

 public void setSelection (int selection) {

-	if (!isValidThread ()) error (SWT.ERROR_THREAD_INVALID_ACCESS);

-	if (!isValidWidget ()) error (SWT.ERROR_WIDGET_DISPOSED);

+	checkWidget();

 	if (selection < 0) return;

 	SCROLLINFO info = new SCROLLINFO ();

 	info.cbSize = SCROLLINFO.sizeof;

@@ -709,8 +689,7 @@ public void setSelection (int selection) {
  * @see ScrollBar

  */

 public void setThumb (int value) {

-	if (!isValidThread ()) error (SWT.ERROR_THREAD_INVALID_ACCESS);

-	if (!isValidWidget ()) error (SWT.ERROR_WIDGET_DISPOSED);

+	checkWidget();

 

 	/* Position the thumb */

 	if (value < 1) return;

@@ -772,8 +751,7 @@ public void setThumb (int value) {
  * </ul>

  */

 public void setValues (int selection, int minimum, int maximum, int thumb, int increment, int pageIncrement) {

-	if (!isValidThread ()) error (SWT.ERROR_THREAD_INVALID_ACCESS);

-	if (!isValidWidget ()) error (SWT.ERROR_WIDGET_DISPOSED);

+	checkWidget();

 	if (selection < 0) return;

 	if (minimum < 0) return;

 	if (maximum < 0) return;

@@ -837,8 +815,7 @@ public void setValues (int selection, int minimum, int maximum, int thumb, int i
  * </ul>

  */

 public void setVisible (boolean visible) {

-	if (!isValidThread ()) error (SWT.ERROR_THREAD_INVALID_ACCESS);

-	if (!isValidWidget ()) error (SWT.ERROR_WIDGET_DISPOSED);

+	checkWidget();

 	int hwnd = hwndScrollBar (), type = scrollBarType ();

 	if (OS.ShowScrollBar (hwnd, type, visible)) {

 		/*