*** empty log message ***

4 files changed, 48 insertions, 88 deletions

diff --git a/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/CTabFolder.java b/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/CTabFolder.java
index 4cd8ff51f3..c332833a6e 100755
--- a/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/CTabFolder.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/CTabFolder.java
@@ -72,7 +72,7 @@ public class CTabFolder extends Composite {
 	 * 
 	 * NOTE This field is badly named for historical reasons.  It is not static.
 	 */
-	public int MIN_TAB_WIDTH = 3;
+	public int MIN_TAB_WIDTH = 8;
 	
 	/**
 	 * Color of innermost line of drop shadow border.
@@ -1213,6 +1213,10 @@ void drawTabArea(Event event) {
 		gc.drawPolyline(shape);
 	}
 }
+/**
+ * 
+ * @since 3.0
+ */
 public boolean getBorderVisible() {
 	checkWidget();
 	return borderLeft == 1;
@@ -1235,23 +1239,6 @@ public Rectangle getClientArea() {
 }
 
 /**
- * Returns <code>false</code> if the receiver is minimized,
- * and true otherwise.
- * <p>
- *
- * @return the minimized state
- *
- * @exception SWTException <ul>
- *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
- *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
- * </ul>
- *
- * @deprecated use getMinimized(boolean)
- */
-public boolean getExpanded() {
-	return getMinimized();
-}
-/**
  * Return the tab that is located at the specified index.
  * 
  * @param index the index of the tab item
@@ -1347,6 +1334,8 @@ char getMnemonic (String string) {
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
+ * 
+ * @since 3.0
  */
 public boolean getMinimized() {
 	checkWidget();
@@ -1363,6 +1352,8 @@ public boolean getMinimized() {
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
+ * 
+ * @since 3.0
  */
 public boolean getMaximized() {
 	checkWidget();
@@ -2276,6 +2267,8 @@ public void setBackground (Color color) {
  *		<li>ERROR_THREAD_INVALID_ACCESS when called from the wrong thread</li>
  *		<li>ERROR_WIDGET_DISPOSED when the widget has been disposed</li>
  *	</ul>
+ *
+ * @since 3.0
  */
 public void setBackground(Color[] colors, int[] percents) {
 	setBackground(colors, percents, false);
@@ -2387,6 +2380,8 @@ public void setBackground(Color[] colors, int[] percents, boolean vertical) {
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
+ * 
+ * @since 3.0
  */
 public void setBackground(Image image) {
 	checkWidget();
@@ -2510,22 +2505,6 @@ boolean setButtonBounds() {
 	
 	return changed;
 }
-/**
- * Sets the minimized state of the receiver.
- * <p>
- *
- * @param expanded false if folder is to be minimized
- *
- * @exception SWTException <ul>
- *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
- *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
- * </ul>
- * 
- * @deprecated use setMinimized(boolean)
- */
-public void setExpanded (boolean expanded) {
-	setMinimized(!expanded);
-}
 void setFirstItem(int index) {
 	if (index < 0 || index > items.length - 1) return;
 	if (index == topTabIndex) return;
@@ -2754,7 +2733,7 @@ void setLastItem(int index) {
 }
 /**
  * 
- * 
+ * @since 3.0
  */
 public void setMaximizeVisible(boolean visible) {
 	checkWidget();
@@ -2766,6 +2745,7 @@ public void setMaximizeVisible(boolean visible) {
 }
 /**
  * 
+ * @since 3.0
  */
 public void setMaximized(boolean maximize) {
 	checkWidget ();
@@ -2777,7 +2757,7 @@ public void setMaximized(boolean maximize) {
 }
 /**
  * 
- * 
+ * @since 3.0
  */
 public void setMinimizeVisible(boolean visible) {
 	checkWidget();
@@ -2789,6 +2769,7 @@ public void setMinimizeVisible(boolean visible) {
 }
 /**
  * 
+ * @since 3.0
  */
 public void setMinimized(boolean minimize) {
 	checkWidget ();
@@ -2868,6 +2849,7 @@ void setSelection(int index, boolean notify) {
 	}
 }
 /**
+ * 
  * @since 3.0
  */
 public void setSelectionBackground (Color color) {
@@ -2932,7 +2914,7 @@ public void setSelectionBackground(Color[] colors, int[] percents) {
  *		<li>ERROR_WIDGET_DISPOSED when the widget has been disposed</li>
  *	</ul>
  *
- *@since 3.0
+ * @since 3.0
  */
 public void setSelectionBackground(Color[] colors, int[] percents, boolean vertical) {
 	checkWidget();
@@ -3366,7 +3348,6 @@ boolean updateTabHeight(int oldHeight, boolean force){
 			curve = newCurve;
 		}
 	}
-	
 	notifyListeners(SWT.Resize, new Event());
 	return true;
 }
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/CTabFolder2.java b/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/CTabFolder2.java
index c7179a604f..1ddc2dca05 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/CTabFolder2.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/CTabFolder2.java
@@ -1215,6 +1215,10 @@ void drawTabArea(Event event) {
 		gc.drawPolyline(shape);
 	}
 }
+/**
+ * 
+ * @since 3.0
+ */
 public boolean getBorderVisible() {
 	checkWidget();
 	return borderLeft == 1;
@@ -1237,23 +1241,6 @@ public Rectangle getClientArea() {
 }
 
 /**
- * Returns <code>false</code> if the receiver is minimized,
- * and true otherwise.
- * <p>
- *
- * @return the minimized state
- *
- * @exception SWTException <ul>
- *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
- *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
- * </ul>
- *
- * @deprecated use getMinimized(boolean)
- */
-public boolean getExpanded() {
-	return getMinimized();
-}
-/**
  * Return the tab that is located at the specified index.
  * 
  * @param index the index of the tab item
@@ -1349,6 +1336,8 @@ char getMnemonic (String string) {
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
+ * 
+ * @since 3.0
  */
 public boolean getMinimized() {
 	checkWidget();
@@ -1365,6 +1354,8 @@ public boolean getMinimized() {
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
+ * 
+ * @since 3.0
  */
 public boolean getMaximized() {
 	checkWidget();
@@ -2278,6 +2269,8 @@ public void setBackground (Color color) {
  *		<li>ERROR_THREAD_INVALID_ACCESS when called from the wrong thread</li>
  *		<li>ERROR_WIDGET_DISPOSED when the widget has been disposed</li>
  *	</ul>
+ *
+ * @since 3.0
  */
 public void setBackground(Color[] colors, int[] percents) {
 	setBackground(colors, percents, false);
@@ -2389,6 +2382,8 @@ public void setBackground(Color[] colors, int[] percents, boolean vertical) {
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
+ * 
+ * @since 3.0
  */
 public void setBackground(Image image) {
 	checkWidget();
@@ -2512,22 +2507,6 @@ boolean setButtonBounds() {
 	
 	return changed;
 }
-/**
- * Sets the minimized state of the receiver.
- * <p>
- *
- * @param expanded false if folder is to be minimized
- *
- * @exception SWTException <ul>
- *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
- *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
- * </ul>
- * 
- * @deprecated use setMinimized(boolean)
- */
-public void setExpanded (boolean expanded) {
-	setMinimized(!expanded);
-}
 void setFirstItem(int index) {
 	if (index < 0 || index > items.length - 1) return;
 	if (index == topTabIndex) return;
@@ -2756,7 +2735,7 @@ void setLastItem(int index) {
 }
 /**
  * 
- * 
+ * @since 3.0
  */
 public void setMaximizeVisible(boolean visible) {
 	checkWidget();
@@ -2768,6 +2747,7 @@ public void setMaximizeVisible(boolean visible) {
 }
 /**
  * 
+ * @since 3.0
  */
 public void setMaximized(boolean maximize) {
 	checkWidget ();
@@ -2779,7 +2759,7 @@ public void setMaximized(boolean maximize) {
 }
 /**
  * 
- * 
+ * @since 3.0
  */
 public void setMinimizeVisible(boolean visible) {
 	checkWidget();
@@ -2791,6 +2771,7 @@ public void setMinimizeVisible(boolean visible) {
 }
 /**
  * 
+ * @since 3.0
  */
 public void setMinimized(boolean minimize) {
 	checkWidget ();
@@ -2870,6 +2851,7 @@ void setSelection(int index, boolean notify) {
 	}
 }
 /**
+ * 
  * @since 3.0
  */
 public void setSelectionBackground (Color color) {
@@ -2934,7 +2916,7 @@ public void setSelectionBackground(Color[] colors, int[] percents) {
  *		<li>ERROR_WIDGET_DISPOSED when the widget has been disposed</li>
  *	</ul>
  *
- *@since 3.0
+ * @since 3.0
  */
 public void setSelectionBackground(Color[] colors, int[] percents, boolean vertical) {
 	checkWidget();
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/CTabItem.java b/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/CTabItem.java
index 35ab2f0c79..5fbcd4c843 100755
--- a/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/CTabItem.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/CTabItem.java
@@ -17,8 +17,7 @@ import org.eclipse.swt.widgets.*;
 
 
 /**
-* DO NOT USE - UNDER CONSTRUCTION
-*
+* UNDER CONSTRUCTION
 */
 
 public class CTabItem extends Item {
@@ -27,7 +26,6 @@ public class CTabItem extends Item {
 	Control control; // the tab page
 	
 	String toolTipText;
-	Image disabledImage;
 	String shortenedText;
 	int shortenedTextWidth;
 	
@@ -497,10 +495,12 @@ public Control getControl () {
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
+ * 
+ * @deprecated
  */
 public Image getDisabledImage(){
 	//checkWidget();
-	return disabledImage;
+	return null;
 }
 /**
  * Returns the receiver's parent, which must be a <code>CTabFolder</code>.
@@ -611,13 +611,11 @@ public void setControl (Control control) {
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
+ * 
+ * @deprecated
  */
 public void setDisabledImage (Image image) {
 	checkWidget();
-	// !!! this image is never being used
-	if (image != null && image.equals(getDisabledImage())) return;
-	disabledImage = image;
-	//parent.redraw();
 }
 public void setImage (Image image) {
 	checkWidget();
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/CTabItem2.java b/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/CTabItem2.java
index f382459687..1946fb384a 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/CTabItem2.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/CTabItem2.java
@@ -28,7 +28,6 @@ public class CTabItem2 extends Item {
 	Control control; // the tab page
 	
 	String toolTipText;
-	Image disabledImage;
 	String shortenedText;
 	int shortenedTextWidth;
 	
@@ -498,10 +497,12 @@ public Control getControl () {
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
+ * 
+ * @deprecated
  */
 public Image getDisabledImage(){
 	//checkWidget();
-	return disabledImage;
+	return null;
 }
 /**
  * Returns the receiver's parent, which must be a <code>CTabFolder</code>.
@@ -612,13 +613,11 @@ public void setControl (Control control) {
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
+ * 
+ * @deprecated
  */
 public void setDisabledImage (Image image) {
 	checkWidget();
-	// !!! this image is never being used
-	if (image != null && image.equals(getDisabledImage())) return;
-	disabledImage = image;
-	//parent.redraw();
 }
 public void setImage (Image image) {
 	checkWidget();