Skip to content

Deprecation: Cursor(Device, ImageData, ImageData, int, int) #2563

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 2, 2025
Merged

Deprecation: Cursor(Device, ImageData, ImageData, int, int) #2563

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/graphics/Cursor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -276,7 +276,10 @@ public Cursor(Device device, int style) {
* </ul>
*
* @see #dispose()
*
* @deprecated Use {@link #Cursor(Device, ImageDataProvider, int, int)} instead.
*/
@Deprecated
public Cursor(Device device, ImageData source, ImageData mask, int hotspotX, int hotspotY) {
super(device);
if (source == null) SWT.error(SWT.ERROR_NULL_ARGUMENT);
Expand Down
3 changes: 3 additions & 0 deletions bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/graphics/Cursor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -184,7 +184,10 @@ public Cursor(Device device, int style) {
* </ul>
*
* @see #dispose()
*
* @deprecated Use {@link #Cursor(Device, ImageDataProvider, int, int)} instead.
*/
@Deprecated
public Cursor(Device device, ImageData source, ImageData mask, int hotspotX, int hotspotY) {
super(device);
if (source == null) SWT.error(SWT.ERROR_NULL_ARGUMENT);
Expand Down
3 changes: 3 additions & 0 deletions bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/Cursor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,10 @@ public Cursor(Device device, int style) {
* </ul>
*
* @see #dispose()
*
* @deprecated Use {@link #Cursor(Device, ImageDataProvider, int, int)} instead.
*/
@Deprecated
public Cursor(Device device, ImageData source, ImageData mask, int hotspotX, int hotspotY) {
super(device);
this.cursorHandleProvider = new ImageDataWithMaskCursorHandleProvider(source, mask, hotspotX, hotspotY);
Expand Down
5 changes: 5 additions & 0 deletions ...t.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_graphics_Cursor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,6 +140,7 @@ public void test_ConstructorLorg_eclipse_swt_graphics_DeviceLorg_eclipse_swt_gra
ImageData source = loader.load(stream)[0];
ImageData mask = source.getTransparencyMask();
if (mask != null && (source.depth == 1)) {
@SuppressWarnings("deprecation")
Cursor cursor = new Cursor(display, source, mask, 0, 0);
cursor.dispose();
}
Expand Down Expand Up @@ -176,12 +177,14 @@ public void test_InvalidArgumentsForAllConstructors() {
});

assertThrows("When source is null", IllegalArgumentException.class, () -> {
@SuppressWarnings("deprecation")
Cursor cursorFromImageAndMask = new Cursor(Display.getDefault(), null, mask, 0, 0);
cursorFromImageAndMask.dispose();
});

assertThrows("When mask is null and source doesn't heve a mask",
IllegalArgumentException.class, () -> {
@SuppressWarnings("deprecation")
Cursor cursorFromImageAndMask = new Cursor(Display.getDefault(), source, null, 0, 0);
cursorFromImageAndMask.dispose();
});
Expand All @@ -191,12 +194,14 @@ public void test_InvalidArgumentsForAllConstructors() {
ImageData source32 = new ImageData(32, 32, 1, new PaletteData(new RGB[] { new RGB(0, 0, 0) }));
ImageData mask16 = new ImageData(16, 16, 1, new PaletteData(new RGB[] { new RGB(0, 0, 0) }));

@SuppressWarnings("deprecation")
Cursor cursorFromImageAndMask = new Cursor(Display.getDefault(), source32, mask16, 0, 0);
cursorFromImageAndMask.dispose();
});

assertThrows("When hotspot is outside the bounds of the image",
IllegalArgumentException.class, () -> {
@SuppressWarnings("deprecation")
Cursor cursorFromImageAndMask = new Cursor(Display.getDefault(), source, mask, 18, 18);
cursorFromImageAndMask.dispose();
});
Expand Down
Loading