Skip to content

[Cocoa] Replace deprecated macOS Window Style Mask constants #3216

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

Open
HeikoKlare wants to merge 1 commit into
base: master
Choose a base branch
from
Open

[Cocoa] Replace deprecated macOS Window Style Mask constants #3216

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
9 changes: 9 additions & 0 deletions ....eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/AppKitFull.bridgesupport
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2539,6 +2539,15 @@
<enum name='NSWindowSharingNone' value='0'/>
<enum name='NSWindowSharingReadOnly' value='1'/>
<enum name='NSWindowSharingReadWrite' value='2'/>
<enum name='NSWindowStyleMaskBorderless' value='0'/>
<enum name='NSWindowStyleMaskClosable' value='2'/>
<enum name='NSWindowStyleMaskDocModalWindow' value='64'/>
<enum name='NSWindowStyleMaskFullScreen' value='16384'/>
<enum name='NSWindowStyleMaskMiniaturizable' value='4'/>
<enum name='NSWindowStyleMaskNonactivatingPanel' value='128'/>
<enum name='NSWindowStyleMaskResizable' value='8'/>
<enum name='NSWindowStyleMaskTitled' value='1'/>
<enum name='NSWindowStyleMaskUtilityWindow' value='16'/>
<enum name='NSWindowTitleHidden' value='1'/>
<enum name='NSWindowTitleVisible' value='0'/>
<enum name='NSWindowToolbarButton' value='3'/>
Expand Down
18 changes: 9 additions & 9 deletions ...e.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/AppKitFull.bridgesupport.extras
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4373,15 +4373,13 @@
<enum name="NSBevelLineJoinStyle" swt_gen="true"></enum>
<enum name="NSBezelBorder" swt_gen="true"></enum>
<enum name="NSBoldFontMask" swt_gen="true"></enum>
<enum name="NSBorderlessWindowMask" swt_gen="true"></enum>
<enum name="NSBottomTabsBezelBorder" swt_gen="true"></enum>
<enum name="NSBoxCustom" swt_gen="true"></enum>
<enum name="NSBoxSeparator" swt_gen="true"></enum>
<enum name="NSButtLineCapStyle" swt_gen="true"></enum>
<enum name="NSCancelButton" swt_gen="true"></enum>
<enum name="NSCarriageReturnCharacter" swt_gen="true"></enum>
<enum name="NSClockAndCalendarDatePickerStyle" swt_gen="true"></enum>
<enum name="NSClosableWindowMask" swt_gen="true"></enum>
<enum name="NSClosePathBezierPathElement" swt_gen="true"></enum>
<enum name="NSCommandKeyMask" swt_gen="true"></enum>
<enum name="NSCompositeClear" swt_gen="true"></enum>
Expand All @@ -4394,7 +4392,6 @@
<enum name="NSCurveToBezierPathElement" swt_gen="true"></enum>
<enum name="NSDeleteCharacter" swt_gen="true"></enum>
<enum name="NSDeviceIndependentModifierFlagsMask" swt_gen="true"></enum>
<enum name="NSDocModalWindowMask" swt_gen="true"></enum>
<enum name="NSDragOperationCopy" swt_gen="true"></enum>
<enum name="NSDragOperationDelete" swt_gen="true"></enum>
<enum name="NSDragOperationEvery" swt_gen="true"></enum>
Expand All @@ -4417,7 +4414,6 @@
<enum name="NSFocusRingTypeNone" swt_gen="true"></enum>
<enum name="NSFontPanelAllEffectsModeMask" swt_gen="true"></enum>
<enum name="NSFontPanelAllModesMask" swt_gen="true"></enum>
<enum name="NSFullScreenWindowMask" swt_gen="true"></enum>
<enum name="NSHelpFunctionKey" swt_gen="true"></enum>
<enum name="NSHelpKeyMask" swt_gen="true"></enum>
<enum name="NSHourMinuteDatePickerElementFlag" swt_gen="true"></enum>
Expand Down Expand Up @@ -4451,7 +4447,6 @@
<enum name="NSLineBreakByWordWrapping" swt_gen="true"></enum>
<enum name="NSLineToBezierPathElement" swt_gen="true"></enum>
<enum name="NSMiniControlSize" swt_gen="true"></enum>
<enum name="NSMiniaturizableWindowMask" swt_gen="true"></enum>
<enum name="NSMiterLineJoinStyle" swt_gen="true"></enum>
<enum name="NSMixedState" swt_gen="true"></enum>
<enum name="NSMomentaryLightButton" swt_gen="true"></enum>
Expand All @@ -4464,7 +4459,6 @@
<enum name="NSNoImage" swt_gen="true"></enum>
<enum name="NSNoTitle" swt_gen="true"></enum>
<enum name="NSNonZeroWindingRule" swt_gen="true"></enum>
<enum name="NSNonactivatingPanelMask" swt_gen="true"></enum>
<enum name="NSOffState" swt_gen="true"></enum>
<enum name="NSOnState" swt_gen="true"></enum>
<enum name="NSOpenGLCPSurfaceOrder" swt_gen="true"></enum>
Expand All @@ -4491,7 +4485,6 @@
<enum name="NSRadioButton" swt_gen="true"></enum>
<enum name="NSRegularControlSize" swt_gen="true"></enum>
<enum name="NSRegularSquareBezelStyle" swt_gen="true"></enum>
<enum name="NSResizableWindowMask" swt_gen="true"></enum>
<enum name="NSRightMouseDown" swt_gen="true"></enum>
<enum name="NSRightMouseDragged" swt_gen="true"></enum>
<enum name="NSRightMouseUp" swt_gen="true"></enum>
Expand Down Expand Up @@ -4535,7 +4528,6 @@
<enum name="NSTextAlignmentRight" swt_gen="true"></enum>
<enum name="NSTextFieldAndStepperDatePickerStyle" swt_gen="true"></enum>
<enum name="NSTextFieldDatePickerStyle" swt_gen="true"></enum>
<enum name="NSTitledWindowMask" swt_gen="true"></enum>
<enum name="NSToolbarDisplayModeIconOnly" swt_gen="true"></enum>
<enum name="NSTouchPhaseAny" swt_gen="true"></enum>
<enum name="NSTouchPhaseBegan" swt_gen="true"></enum>
Expand All @@ -4547,7 +4539,6 @@
<enum name="NSUnderlineStyleNone" swt_gen="true"></enum>
<enum name="NSUnderlineStyleSingle" swt_gen="true"></enum>
<enum name="NSUnderlineStyleThick" swt_gen="true"></enum>
<enum name="NSUtilityWindowMask" swt_gen="true"></enum>
<enum name="NSViewHeightSizable" swt_gen="true"></enum>
<enum name="NSViewMaxXMargin" swt_gen="true"></enum>
<enum name="NSViewMaxYMargin" swt_gen="true"></enum>
Expand All @@ -4560,6 +4551,15 @@
<enum name="NSWindowCollectionBehaviorFullScreenAuxiliary" swt_gen="true"></enum>
<enum name="NSWindowCollectionBehaviorFullScreenPrimary" swt_gen="true"></enum>
<enum name="NSWindowCollectionBehaviorMoveToActiveSpace" swt_gen="true"></enum>
<enum name="NSWindowStyleMaskBorderless" swt_gen="true"></enum>
<enum name="NSWindowStyleMaskClosable" swt_gen="true"></enum>
<enum name="NSWindowStyleMaskDocModalWindow" swt_gen="true"></enum>
<enum name="NSWindowStyleMaskFullScreen" swt_gen="true"></enum>
<enum name="NSWindowStyleMaskMiniaturizable" swt_gen="true"></enum>
<enum name="NSWindowStyleMaskNonactivatingPanel" swt_gen="true"></enum>
<enum name="NSWindowStyleMaskResizable" swt_gen="true"></enum>
<enum name="NSWindowStyleMaskTitled" swt_gen="true"></enum>
<enum name="NSWindowStyleMaskUtilityWindow" swt_gen="true"></enum>
<enum name="NSWritingDirectionLeftToRight" swt_gen="true"></enum>
<enum name="NSWritingDirectionRightToLeft" swt_gen="true"></enum>
<enum name="NSYearMonthDatePickerElementFlag" swt_gen="true"></enum>
Expand Down
27 changes: 18 additions & 9 deletions bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/OS.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2165,15 +2165,15 @@ public static Selector getSelector (long value) {
public static final int NSBevelLineJoinStyle = 2;
public static final int NSBezelBorder = 2;
public static final int NSBoldFontMask = 2;
public static final int NSBorderlessWindowMask = 0;

public static final int NSBottomTabsBezelBorder = 2;
public static final int NSBoxCustom = 4;
public static final int NSBoxSeparator = 2;
public static final int NSButtLineCapStyle = 0;
public static final int NSCancelButton = 0;
public static final int NSCarriageReturnCharacter = 13;
public static final int NSClockAndCalendarDatePickerStyle = 1;
public static final int NSClosableWindowMask = 2;

public static final int NSClosePathBezierPathElement = 3;
public static final int NSCommandKeyMask = 1048576;
public static final int NSCompositeClear = 0;
Expand All @@ -2186,7 +2186,7 @@ public static Selector getSelector (long value) {
public static final int NSCurveToBezierPathElement = 2;
public static final int NSDeleteCharacter = 127;
public static final long NSDeviceIndependentModifierFlagsMask = 4294901760L;
public static final int NSDocModalWindowMask = 64;

public static final int NSDragOperationCopy = 1;
public static final int NSDragOperationDelete = 32;
public static final long NSDragOperationEvery = -1L;
Expand All @@ -2210,7 +2210,7 @@ public static Selector getSelector (long value) {
public static final int NSFocusRingTypeNone = 1;
public static final int NSFontPanelAllEffectsModeMask = 1048320;
public static final int NSFontPanelAllModesMask = -1;
public static final int NSFullScreenWindowMask = 16384;

public static final int NSHelpFunctionKey = 63302;
public static final int NSHelpKeyMask = 4194304;
public static final int NSHourMinuteDatePickerElementFlag = 12;
Expand Down Expand Up @@ -2244,7 +2244,7 @@ public static Selector getSelector (long value) {
public static final int NSLineBreakByWordWrapping = 0;
public static final int NSLineToBezierPathElement = 1;
public static final int NSMiniControlSize = 2;
public static final int NSMiniaturizableWindowMask = 4;

public static final int NSMiterLineJoinStyle = 0;
public static final int NSMixedState = -1;
public static final int NSMomentaryLightButton = 0;
Expand All @@ -2257,7 +2257,7 @@ public static Selector getSelector (long value) {
public static final int NSNoImage = 0;
public static final int NSNoTitle = 0;
public static final int NSNonZeroWindingRule = 0;
public static final int NSNonactivatingPanelMask = 128;

public static final int NSOffState = 0;
public static final int NSOnState = 1;
public static final int NSOpenGLCPSurfaceOrder = 235;
Expand All @@ -2284,7 +2284,7 @@ public static Selector getSelector (long value) {
public static final int NSRadioButton = 4;
public static final int NSRegularControlSize = 0;
public static final int NSRegularSquareBezelStyle = 2;
public static final int NSResizableWindowMask = 8;

public static final int NSRightMouseDown = 3;
public static final int NSRightMouseDragged = 7;
public static final int NSRightMouseUp = 4;
Expand Down Expand Up @@ -2328,7 +2328,7 @@ public static Selector getSelector (long value) {
public static final int NSTextAlignmentRight = IS_X86_64 ? 1 : 2;
public static final int NSTextFieldAndStepperDatePickerStyle = 0;
public static final int NSTextFieldDatePickerStyle = 2;
public static final int NSTitledWindowMask = 1;

public static final int NSToolbarDisplayModeIconOnly = 2;
public static final long NSTouchPhaseAny = -1L;
public static final int NSTouchPhaseBegan = 1;
Expand All @@ -2340,7 +2340,7 @@ public static Selector getSelector (long value) {
public static final int NSUnderlineStyleNone = 0;
public static final int NSUnderlineStyleSingle = 1;
public static final int NSUnderlineStyleThick = 2;
public static final int NSUtilityWindowMask = 16;

public static final int NSViewHeightSizable = 16;
public static final int NSViewMaxXMargin = 4;
public static final int NSViewMaxYMargin = 32;
Expand All @@ -2353,6 +2353,15 @@ public static Selector getSelector (long value) {
public static final int NSWindowCollectionBehaviorFullScreenAuxiliary = 256;
public static final int NSWindowCollectionBehaviorFullScreenPrimary = 128;
public static final int NSWindowCollectionBehaviorMoveToActiveSpace = 2;
public static final int NSWindowStyleMaskBorderless = 0;
public static final int NSWindowStyleMaskClosable = 2;
public static final int NSWindowStyleMaskDocModalWindow = 64;
public static final int NSWindowStyleMaskFullScreen = 16384;
public static final int NSWindowStyleMaskMiniaturizable = 4;
public static final int NSWindowStyleMaskNonactivatingPanel = 128;
public static final int NSWindowStyleMaskResizable = 8;
public static final int NSWindowStyleMaskTitled = 1;
public static final int NSWindowStyleMaskUtilityWindow = 16;
public static final int NSWritingDirectionLeftToRight = 0;
public static final int NSWritingDirectionRightToLeft = 1;
public static final int NSYearMonthDatePickerElementFlag = 192;
Expand Down
2 changes: 1 addition & 1 deletion bundles/org.eclipse.swt/Eclipse SWT Printing/cocoa/org/eclipse/swt/printing/Printer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -242,7 +242,7 @@ protected void create(DeviceData deviceData) {
}
NSRect rect = new NSRect();
window = (NSWindow)new NSWindow().alloc();
window.initWithContentRect(rect, OS.NSBorderlessWindowMask, OS.NSBackingStoreBuffered, false);
window.initWithContentRect(rect, OS.NSWindowStyleMaskBorderless, OS.NSBackingStoreBuffered, false);
String className = "SWTPrinterView"; //$NON-NLS-1$
if (OS.objc_lookUpClass(className) == 0) {
long cls = OS.objc_allocateClassPair(OS.class_NSView, className, 0);
Expand Down
2 changes: 1 addition & 1 deletion bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Display.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3359,7 +3359,7 @@ public long internal_new_GC (GCData data) {
if (screenWindow == null) {
NSWindow window = (NSWindow) new NSWindow ().alloc ();
NSRect rect = new NSRect();
window = window.initWithContentRect(rect, OS.NSBorderlessWindowMask, OS.NSBackingStoreBuffered, false);
window = window.initWithContentRect(rect, OS.NSWindowStyleMaskBorderless, OS.NSBackingStoreBuffered, false);
window.setReleasedWhenClosed(false);
screenWindow = window;
}
Expand Down
22 changes: 11 additions & 11 deletions bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Shell.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -554,7 +554,7 @@ boolean canBecomeKeyWindow (long id, long sel) {
}
}
long styleMask = window.styleMask();
if (styleMask == OS.NSBorderlessWindowMask || (styleMask & (OS.NSNonactivatingPanelMask | OS.NSDocModalWindowMask | OS.NSResizableWindowMask)) != 0) return true;
if (styleMask == OS.NSWindowStyleMaskBorderless || (styleMask & (OS.NSWindowStyleMaskNonactivatingPanel | OS.NSWindowStyleMaskDocModalWindow | OS.NSWindowStyleMaskResizable)) != 0) return true;
}
return super.canBecomeKeyWindow (id, sel);
}
Expand Down Expand Up @@ -653,23 +653,23 @@ public Rectangle computeTrim (int x, int y, int width, int height) {
void createHandle () {
state |= HIDDEN;
if (window == null && view == null) {
int styleMask = OS.NSBorderlessWindowMask;
int styleMask = OS.NSWindowStyleMaskBorderless;
if ((style & (SWT.TOOL | SWT.SHEET)) != 0) {
window = (NSWindow) new SWTPanel().alloc();
if ((style & SWT.SHEET) != 0) {
styleMask |= OS.NSDocModalWindowMask;
styleMask |= OS.NSWindowStyleMaskDocModalWindow;
} else {
styleMask |= OS.NSUtilityWindowMask | OS.NSNonactivatingPanelMask;
styleMask |= OS.NSWindowStyleMaskUtilityWindow | OS.NSWindowStyleMaskNonactivatingPanel;
}
} else {
window = (NSWindow) new SWTWindow().alloc ();
}
if ((style & SWT.NO_TRIM) == 0) {
if ((style & SWT.TITLE) != 0) styleMask |= OS.NSTitledWindowMask;
if ((style & SWT.CLOSE) != 0) styleMask |= OS.NSClosableWindowMask;
if ((style & SWT.MIN) != 0) styleMask |= OS.NSMiniaturizableWindowMask;
if ((style & SWT.MAX) != 0) styleMask |= OS.NSResizableWindowMask;
if ((style & SWT.RESIZE) != 0) styleMask |= OS.NSResizableWindowMask;
if ((style & SWT.TITLE) != 0) styleMask |= OS.NSWindowStyleMaskTitled;
if ((style & SWT.CLOSE) != 0) styleMask |= OS.NSWindowStyleMaskClosable;
if ((style & SWT.MIN) != 0) styleMask |= OS.NSWindowStyleMaskMiniaturizable;
if ((style & SWT.MAX) != 0) styleMask |= OS.NSWindowStyleMaskResizable;
if ((style & SWT.RESIZE) != 0) styleMask |= OS.NSWindowStyleMaskResizable;
}
NSScreen screen = null;
NSScreen primaryScreen = new NSScreen(NSScreen.screens().objectAtIndex(0));
Expand All @@ -683,7 +683,7 @@ void createHandle () {
window.setMovable(false);
}
if ((style & SWT.TOOL) != 0) {
// Feature in Cocoa: NSPanels that use NSUtilityWindowMask are always promoted to the floating window layer.
// Feature in Cocoa: NSPanels that use NSWindowStyleMaskUtilityWindow are always promoted to the floating window layer.
// Fix is to call setFloatingPanel:NO, which turns off this behavior.
((NSPanel)window).setFloatingPanel(false);
// By default, panels hide on deactivation.
Expand Down Expand Up @@ -987,7 +987,7 @@ public boolean getFullScreen () {

boolean _getFullScreen () {
if ((window.collectionBehavior() & OS.NSWindowCollectionBehaviorFullScreenPrimary) != 0) {
return (window.styleMask() & OS.NSFullScreenWindowMask) != 0 ? true : false;
return (window.styleMask() & OS.NSWindowStyleMaskFullScreen) != 0 ? true : false;
}
return fullScreen;
}
Expand Down
2 changes: 1 addition & 1 deletion bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Tracker.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -765,7 +765,7 @@ public boolean open () {
NSScreen screen = new NSScreen(screens.objectAtIndex(i));
NSRect frame = screen.frame();
NSWindow window = (NSWindow)new NSWindow().alloc();
window = window.initWithContentRect(frame, OS.NSBorderlessWindowMask, OS.NSBackingStoreBuffered, false);
window = window.initWithContentRect(frame, OS.NSWindowStyleMaskBorderless, OS.NSBackingStoreBuffered, false);
window.setOpaque(false);
window.setLevel(OS.NSStatusWindowLevel);
window.setContentView(null);
Expand Down
Loading