diff --git a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/cocoa/org/eclipse/swt/dnd/ImageTransfer.java b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/cocoa/org/eclipse/swt/dnd/ImageTransfer.java index 1ca1a20cce2..9b05decf270 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/cocoa/org/eclipse/swt/dnd/ImageTransfer.java +++ b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/cocoa/org/eclipse/swt/dnd/ImageTransfer.java @@ -103,7 +103,7 @@ public Object nativeToJava(TransferData transferData) { NSRect rect = new NSRect(); rect.width = size.width; rect.height = size.height; - nsImage.drawInRect(rect, new NSRect(), OS.NSCompositeCopy, 1); + nsImage.drawInRect(rect, new NSRect(), OS.NSCompositingOperationCopy, 1); newImage.unlockFocus(); nsImage.release(); nsImage = newImage; diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/AppKitFull.bridgesupport b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/AppKitFull.bridgesupport index 4b185e54240..c0262de117e 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/AppKitFull.bridgesupport +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/AppKitFull.bridgesupport @@ -1420,6 +1420,7 @@ + @@ -1450,6 +1451,10 @@ + + + + @@ -1479,6 +1484,9 @@ + + + @@ -1655,6 +1663,8 @@ + + diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/AppKitFull.bridgesupport.extras b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/AppKitFull.bridgesupport.extras index 2f956cf4c57..b43990cb1d0 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/AppKitFull.bridgesupport.extras +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/AppKitFull.bridgesupport.extras @@ -4385,15 +4385,13 @@ - - - - - - + + + + @@ -4426,8 +4424,8 @@ - - + + @@ -4463,6 +4461,7 @@ + @@ -4493,7 +4492,7 @@ - + @@ -4534,8 +4533,9 @@ - - + + + diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/OS.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/OS.java index a2f6e38e581..40c830f8464 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/OS.java +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/OS.java @@ -2173,16 +2173,15 @@ public static Selector getSelector (long value) { public static final int NSButtonTypePushOnPushOff = 1; public static final int NSButtonTypeRadio = 4; public static final int NSButtonTypeSwitch = 3; -public static final int NSCancelButton = 0; public static final int NSCarriageReturnCharacter = 13; -public static final int NSClockAndCalendarDatePickerStyle = 1; +public static final int NSDatePickerStyleClockAndCalendar = 1; public static final int NSClosePathBezierPathElement = 3; public static final int NSCommandKeyMask = 1048576; -public static final int NSCompositeClear = 0; -public static final int NSCompositeCopy = 1; -public static final int NSCompositeSourceAtop = 5; -public static final int NSCompositeSourceOver = 2; +public static final int NSCompositingOperationClear = 0; +public static final int NSCompositingOperationCopy = 1; +public static final int NSCompositingOperationSourceAtop = 5; +public static final int NSCompositingOperationSourceOver = 2; public static final int NSContentsCellMask = 1; public static final int NSControlKeyMask = 262144; public static final int NSCriticalAlertStyle = 2; @@ -2211,8 +2210,8 @@ public static Selector getSelector (long value) { public static final int NSFileHandlingPanelOKButton = 1; public static final int NSFlagsChanged = 12; public static final int NSFocusRingTypeNone = 1; -public static final int NSFontPanelAllEffectsModeMask = 1048320; -public static final int NSFontPanelAllModesMask = -1; +public static final int NSFontPanelModeMaskAllEffects = 1048320; +public static final int NSFontPanelModeMaskAllModes = -1; public static final int NSHelpFunctionKey = 63302; public static final int NSHelpKeyMask = 4194304; @@ -2249,6 +2248,7 @@ public static Selector getSelector (long value) { public static final int NSControlSizeMini = 2; public static final int NSMiterLineJoinStyle = 0; +public static final int NSModalResponseCancel = 0; public static final int NSControlStateValueMixed = -1; public static final int NSMouseEntered = 8; public static final int NSMouseExited = 9; @@ -2281,7 +2281,7 @@ public static Selector getSelector (long value) { public static final int NSPrintPanelShowsPageSetupAccessory = 256; public static final int NSPrintPanelShowsPrintSelection = 32; public static final int NSProgressIndicatorPreferredThickness = 14; -public static final int NSRGBColorSpaceModel = 1; +public static final int NSColorSpaceModelRGB = 1; public static final int NSControlSizeRegular = 0; public static final int NSRegularSquareBezelStyle = 2; public static final int NSResizableWindowMask = 8; @@ -2322,8 +2322,8 @@ public static Selector getSelector (long value) { public static final int NSTextAlignmentJustified = 3; public static final int NSTextAlignmentLeft = 0; 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 NSDatePickerStyleTextFieldAndStepper = 0; +public static final int NSDatePickerStyleTextField = 2; public static final int NSToolbarDisplayModeIconOnly = 2; public static final long NSTouchPhaseAny = -1L; diff --git a/bundles/org.eclipse.swt/Eclipse SWT Printing/cocoa/org/eclipse/swt/printing/PrintDialog.java b/bundles/org.eclipse.swt/Eclipse SWT Printing/cocoa/org/eclipse/swt/printing/PrintDialog.java index 137ee08e13f..4fdc800a870 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT Printing/cocoa/org/eclipse/swt/printing/PrintDialog.java +++ b/bundles/org.eclipse.swt/Eclipse SWT Printing/cocoa/org/eclipse/swt/printing/PrintDialog.java @@ -211,7 +211,7 @@ public PrinterData open() { response = (int)panel.runModalWithPrintInfo(printInfo); } display.setData(SET_MODAL_DIALOG, null); - if (response != OS.NSCancelButton) { + if (response != OS.NSModalResponseCancel) { NSPrinter printer = printInfo.printer(); NSString str = printer.name(); data = new PrinterData(Printer.DRIVER, str.getString()); diff --git a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/graphics/GC.java b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/graphics/GC.java index 95567123df9..af6e2eb29e8 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/graphics/GC.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/graphics/GC.java @@ -551,7 +551,7 @@ public void copyArea(Image image, int x, int y) { destRect.y = destY; destRect.width = destWidth * scaleFactor; destRect.height = destHeight * scaleFactor; - data.image.handle.drawInRect(destRect, srcRect, OS.NSCompositeCopy, 1); + data.image.handle.drawInRect(destRect, srcRect, OS.NSCompositingOperationCopy, 1); NSGraphicsContext.static_restoreGraphicsState(); return; } @@ -725,7 +725,7 @@ public void copyArea(int srcX, int srcY, int width, int height, int destX, int d destRect.y = destY; destRect.width = width; destRect.height = height; - imageHandle.drawInRect(destRect, srcRect, OS.NSCompositeCopy, 1); + imageHandle.drawInRect(destRect, srcRect, OS.NSCompositingOperationCopy, 1); handle.restoreGraphicsState(); return; } @@ -1304,7 +1304,7 @@ void drawImage(Image srcImage, int srcX, int srcY, int srcWidth, int srcHeight, destRect.y = destY; destRect.width = destWidth; destRect.height = destHeight; - imageHandle.drawInRect(destRect, srcRect, OS.NSCompositeSourceOver, data.alpha / 255f); + imageHandle.drawInRect(destRect, srcRect, OS.NSCompositingOperationSourceOver, data.alpha / 255f); handle.restoreGraphicsState(); } finally { uncheckGC(pool); diff --git a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/internal/graphics/ImageUtil.java b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/internal/graphics/ImageUtil.java index 3e74cacf364..5874e38956d 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/internal/graphics/ImageUtil.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/internal/graphics/ImageUtil.java @@ -50,7 +50,7 @@ public static NSBitmapImageRep createImageRep(Image image, NSSize targetSize) { NSRect sourceRect = new NSRect(); sourceRect.width = 0; sourceRect.height = 0; - imgHandle.drawInRect(target, sourceRect, OS.NSCompositeCopy, 1); + imgHandle.drawInRect(target, sourceRect, OS.NSCompositingOperationCopy, 1); NSGraphicsContext.static_restoreGraphicsState(); rep.autorelease(); return rep; diff --git a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Button.java b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Button.java index 236f53a33a6..e319de8ab73 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Button.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Button.java @@ -448,7 +448,7 @@ void drawInteriorWithFrame_inView (long id, long sel, NSRect cellRect, long view transform.scaleXBy(1, -1); transform.translateXBy(0, -imageSize.height); transform.concat(); - image.handle.drawInRect(destRect, new NSRect(), OS.NSCompositeSourceOver, 1); + image.handle.drawInRect(destRect, new NSRect(), OS.NSCompositingOperationSourceOver, 1); NSGraphicsContext.static_restoreGraphicsState(); } diff --git a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Canvas.java b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Canvas.java index eb28bab7ed5..7218b71ddfd 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Canvas.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Canvas.java @@ -149,7 +149,7 @@ void drawBackground (long id, NSGraphicsContext context, NSRect rect) { if (isObscured()) { glcontext.setValues(new int[]{-1}, OS.NSOpenGLCPSurfaceOrder); context.saveGraphicsState(); - context.setCompositingOperation(OS.NSCompositeClear); + context.setCompositingOperation(OS.NSCompositingOperationClear); if (visiblePath == null) { long visibleRegion = getVisibleRegion(); visiblePath = getPath(visibleRegion); diff --git a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/DateTime.java b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/DateTime.java index 355ffd37a16..bff968fc7eb 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/DateTime.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/DateTime.java @@ -172,10 +172,10 @@ public Point computeSize (int wHint, int hHint, boolean changed) { void createHandle () { NSDatePicker widget = (NSDatePicker)new SWTDatePicker().alloc(); widget.init(); - int pickerStyle = (style & SWT.DROP_DOWN) != 0 ? OS.NSTextFieldDatePickerStyle : OS.NSTextFieldAndStepperDatePickerStyle; + int pickerStyle = (style & SWT.DROP_DOWN) != 0 ? OS.NSDatePickerStyleTextField : OS.NSDatePickerStyleTextFieldAndStepper; int elementFlags = 0; if ((style & SWT.CALENDAR) != 0) { - pickerStyle = OS.NSClockAndCalendarDatePickerStyle; + pickerStyle = OS.NSDatePickerStyleClockAndCalendar; elementFlags = OS.NSYearMonthDayDatePickerElementFlag; } else { if ((style & SWT.TIME) != 0) { diff --git a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Display.java b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Display.java index eeeee130f50..25f78cbc179 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Display.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Display.java @@ -2038,7 +2038,7 @@ Color getWidgetColor (int id) { double [] getNSColorRGB (NSColor color) { if (color == null) return null; NSColorSpace colorSpace = color.colorSpace(); - if (colorSpace == null || colorSpace.colorSpaceModel() != OS.NSRGBColorSpaceModel) { + if (colorSpace == null || colorSpace.colorSpaceModel() != OS.NSColorSpaceModelRGB) { color = color.colorUsingColorSpaceName(OS.NSDeviceRGBColorSpace); } if (color == null) return null; diff --git a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/FontDialog.java b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/FontDialog.java index dfe82d8ed36..983d45bcd75 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/FontDialog.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/FontDialog.java @@ -272,7 +272,7 @@ public void setRGB (RGB rgb) { } int validModesForFontPanel(long id, long sel, long arg0) { - return effectsVisible ? OS.NSFontPanelAllModesMask : OS.NSFontPanelAllModesMask & ~OS.NSFontPanelAllEffectsModeMask; + return effectsVisible ? OS.NSFontPanelModeMaskAllModes : OS.NSFontPanelModeMaskAllModes & ~OS.NSFontPanelModeMaskAllEffects; } void windowWillClose(long id, long sel, long sender) { diff --git a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/TabItem.java b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/TabItem.java index 3323904748c..2928ffd0a4b 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/TabItem.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/TabItem.java @@ -168,7 +168,7 @@ void drawLabelInRect(long id, long sel, boolean shouldTruncateLabel, NSRect rect transform.scaleXBy(1, -1); transform.translateXBy(0, -(destRect.height + 2 * destRect.y)); transform.concat(); - image.handle.drawInRect(destRect, new NSRect(), OS.NSCompositeSourceOver, 1); + image.handle.drawInRect(destRect, new NSRect(), OS.NSCompositingOperationSourceOver, 1); NSGraphicsContext.static_restoreGraphicsState(); rect.x += imageSize.width + IMAGE_GAP; rect.width -= imageSize.width + IMAGE_GAP; diff --git a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Table.java b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Table.java index 9f47131864a..49549fcf9ca 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Table.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Table.java @@ -1110,7 +1110,7 @@ void drawInteriorWithFrame_inView (long id, long sel, NSRect rect, long view) { transform.scaleXBy(1, -1); transform.translateXBy(0, -(destRect.height + 2 * destRect.y)); transform.concat(); - image.drawInRect(destRect, new NSRect(), OS.NSCompositeSourceOver, 1); + image.drawInRect(destRect, new NSRect(), OS.NSCompositingOperationSourceOver, 1); context.restoreGraphicsState(); int imageWidth = imageBounds.width + IMAGE_GAP; rect.x += imageWidth; diff --git a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/TableColumn.java b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/TableColumn.java index 403e9fa5b50..f31ef9e4ff2 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/TableColumn.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/TableColumn.java @@ -367,7 +367,7 @@ void drawInteriorWithFrame_inView (long id, long sel, NSRect cellRect, long view NSRect sourceRect = new NSRect (); sourceRect.width = destRect.width; sourceRect.height = destRect.height; - image.handle.drawInRect (destRect, sourceRect, OS.NSCompositeSourceOver, 1f); + image.handle.drawInRect (destRect, sourceRect, OS.NSCompositingOperationSourceOver, 1f); if (isFlipped) context.restoreGraphicsState (); drawX += destRect.width; } diff --git a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/TaskItem.java b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/TaskItem.java index e753e7d8101..91ca84f81b9 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/TaskItem.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/TaskItem.java @@ -428,7 +428,7 @@ void updateImage () { rect.height = size.height; rect.width = size.width; newImage.lockFocus (); - defaultImage.drawInRect (rect, rect, OS.NSCompositeSourceOver, 1); + defaultImage.drawInRect (rect, rect, OS.NSCompositingOperationSourceOver, 1); if (drawImage) { NSImage badgetImage = overlayImage.handle; NSSize badgeSize = badgetImage.size (); @@ -439,7 +439,7 @@ void updateImage () { dstRect.x = size.width / 2; dstRect.height = size.height / 2; dstRect.width = size.width / 2; - badgetImage.drawInRect(dstRect, srcRect, OS.NSCompositeSourceOver, 1); + badgetImage.drawInRect(dstRect, srcRect, OS.NSCompositingOperationSourceOver, 1); } if (drawIntermidiate || drawProgress) { switch (progressState) { diff --git a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/ToolItem.java b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/ToolItem.java index a29e7efc099..b4fc3ad9e15 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/ToolItem.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/ToolItem.java @@ -451,7 +451,7 @@ void drawImageWithFrameInView (long id, long sel, long image, NSRect rect, long if (drawSelected) { NSColor.colorWithDeviceRed(0,0,0,.3f).setFill(); - OS.NSRectFillUsingOperation(rect, OS.NSCompositeSourceAtop); + OS.NSRectFillUsingOperation(rect, OS.NSCompositingOperationSourceAtop); OS.CGContextEndTransparencyLayer(cgContext); NSGraphicsContext.currentContext().restoreGraphicsState(); } diff --git a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Tracker.java b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Tracker.java index 2e4925356d4..aa8e2507e93 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Tracker.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Tracker.java @@ -344,7 +344,7 @@ void drawRectangles (NSWindow window, Rectangle [] rects, boolean erase) { } else { parentOrigin = new Point (0, 0); } - context.setCompositingOperation(erase ? OS.NSCompositeClear : OS.NSCompositeSourceOver); + context.setCompositingOperation(erase ? OS.NSCompositingOperationClear : OS.NSCompositingOperationSourceOver); NSRect rectFrame = new NSRect(); NSPoint globalPoint = new NSPoint(); double screenHeight = display.getPrimaryFrame().height; @@ -782,7 +782,7 @@ public boolean open () { } NSGraphicsContext.static_saveGraphicsState(); NSGraphicsContext.setCurrentContext(context); - context.setCompositingOperation(OS.NSCompositeClear); + context.setCompositingOperation(OS.NSCompositingOperationClear); frame.x = frame.y = 0; NSBezierPath.fillRect(frame); NSGraphicsContext.static_restoreGraphicsState(); diff --git a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Tree.java b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Tree.java index 0de7b123dad..0a92f0beb2f 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Tree.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Tree.java @@ -1201,7 +1201,7 @@ void drawInteriorWithFrame_inView (long id, long sel, NSRect rect, long view) { transform.scaleXBy(1, -1); transform.translateXBy(0, -(destRect.height + 2 * destRect.y)); transform.concat(); - image.drawInRect(destRect, srcRect, OS.NSCompositeSourceOver, 1); + image.drawInRect(destRect, srcRect, OS.NSCompositingOperationSourceOver, 1); context.restoreGraphicsState(); int imageWidth = imageBounds.width + IMAGE_GAP; rect.x += imageWidth; diff --git a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/TreeColumn.java b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/TreeColumn.java index 1c70f01339b..94f7f58455e 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/TreeColumn.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/TreeColumn.java @@ -369,7 +369,7 @@ void drawInteriorWithFrame_inView (long id, long sel, NSRect cellRect, long view NSRect sourceRect = new NSRect (); sourceRect.width = destRect.width; sourceRect.height = destRect.height; - image.handle.drawInRect (destRect, sourceRect, OS.NSCompositeSourceOver, 1f); + image.handle.drawInRect (destRect, sourceRect, OS.NSCompositingOperationSourceOver, 1f); if (isFlipped) context.restoreGraphicsState (); drawX += destRect.width; }