summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCarolyn MacLeod <carolyn>2008-05-28 21:37:27 +0000
committerCarolyn MacLeod <carolyn>2008-05-28 21:37:27 +0000
commit10946719389470f65e13f1be11fcaf6eb8e0708e (patch)
treeb95c19ccc8da4827cfcde2c88aa1423641308a99
parent3a3b000b99cbce518a33fdb9f12963c362140bb5 (diff)
downloadeclipse.platform.swt-10946719389470f65e13f1be11fcaf6eb8e0708e.tar.gz
eclipse.platform.swt-10946719389470f65e13f1be11fcaf6eb8e0708e.tar.xz
eclipse.platform.swt-10946719389470f65e13f1be11fcaf6eb8e0708e.zip
234481 - API consistency changes needed
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/wpf/org/eclipse/swt/dnd/Transfer.java3
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT/emulated/datetime/org/eclipse/swt/widgets/DateTime.java2
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT/emulated/graphics/org/eclipse/swt/graphics/Transform.java8
-rwxr-xr-xbundles/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/widgets/Control.java4
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT/wpf/org/eclipse/swt/widgets/Caret.java11
5 files changed, 16 insertions, 12 deletions
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/wpf/org/eclipse/swt/dnd/Transfer.java b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/wpf/org/eclipse/swt/dnd/Transfer.java
index 839c04cd26..35e8adbe65 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/wpf/org/eclipse/swt/dnd/Transfer.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/wpf/org/eclipse/swt/dnd/Transfer.java
@@ -176,4 +176,7 @@ static int getWPFFormat(int registeredType) {
return createDotNetString(registeredTypes[registeredType]);
}
+protected boolean validate(Object object) {
+ return true;
+}
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/emulated/datetime/org/eclipse/swt/widgets/DateTime.java b/bundles/org.eclipse.swt/Eclipse SWT/emulated/datetime/org/eclipse/swt/widgets/DateTime.java
index 0dd87cb2b1..c7ce1267dd 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/emulated/datetime/org/eclipse/swt/widgets/DateTime.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/emulated/datetime/org/eclipse/swt/widgets/DateTime.java
@@ -1155,7 +1155,7 @@ int unformattedIntValue(int fieldName, String newText, boolean adjust, int max)
return newValue;
}
-public void updateControl() {
+void updateControl() {
if (text != null) {
String string = getFormattedString(style);
ignoreVerify = true;
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/emulated/graphics/org/eclipse/swt/graphics/Transform.java b/bundles/org.eclipse.swt/Eclipse SWT/emulated/graphics/org/eclipse/swt/graphics/Transform.java
index 162342299d..1390efb321 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/emulated/graphics/org/eclipse/swt/graphics/Transform.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/emulated/graphics/org/eclipse/swt/graphics/Transform.java
@@ -161,6 +161,10 @@ public void getElements(float[] elements) {
if (elements.length < 6) SWT.error(SWT.ERROR_INVALID_ARGUMENT);
}
+public void identity() {
+ if (isDisposed()) SWT.error(SWT.ERROR_GRAPHIC_DISPOSED);
+}
+
/**
* Modifies the receiver such that the matrix it represents becomes the
* the mathematical inverse of the matrix it previously represented.
@@ -273,6 +277,10 @@ public void setElements(float m11, float m12, float m21, float m22, float dx, fl
if (isDisposed()) SWT.error(SWT.ERROR_GRAPHIC_DISPOSED);
}
+public void shear(float shearX, float shearY) {
+ if (isDisposed()) SWT.error(SWT.ERROR_GRAPHIC_DISPOSED);
+}
+
/**
* Given an array containing points described by alternating x and y values,
* modify that array such that each point has been replaced with the result of
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/widgets/Control.java b/bundles/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/widgets/Control.java
index 6f890ef9bb..b830590600 100755
--- a/bundles/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/widgets/Control.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/widgets/Control.java
@@ -1227,6 +1227,10 @@ Control [] getPath () {
}
return result;
}
+public Region getRegion () {
+ checkWidget ();
+ return region;
+}
/**
* Returns the receiver's shell. For all controls other than
* shells, this simply returns the control's nearest ancestor
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/wpf/org/eclipse/swt/widgets/Caret.java b/bundles/org.eclipse.swt/Eclipse SWT/wpf/org/eclipse/swt/widgets/Caret.java
index 3fa6bf2aa5..fdd54d751c 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/wpf/org/eclipse/swt/widgets/Caret.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/wpf/org/eclipse/swt/widgets/Caret.java
@@ -37,7 +37,6 @@ public class Caret extends Widget {
boolean isVisible;
Image image;
Font font;
- int offset;
/**
* Constructs a new instance of this class given its parent
@@ -198,11 +197,6 @@ public Point getLocation () {
return new Point (x, y);
}
-public int getOffset () {
- checkWidget ();
- return offset;
-}
-
/**
* Returns the receiver's parent, which must be a <code>Canvas</code>.
*
@@ -467,11 +461,6 @@ public void setLocation (Point location) {
setLocation (location.x, location.y);
}
-public void setOffset (int offset) {
- checkWidget ();
- this.offset = Math.max (0, offset);
-}
-
/**
* Sets the receiver's size to the point specified by the arguments.
*