diff --git a/tests/cefclient/browser/browser_window_osr_mac.mm b/tests/cefclient/browser/browser_window_osr_mac.mm index 92a6fb4ad..884b18d1d 100644 --- a/tests/cefclient/browser/browser_window_osr_mac.mm +++ b/tests/cefclient/browser/browser_window_osr_mac.mm @@ -21,6 +21,10 @@ #import +// Begin disable NSOpenGL deprecation warnings. +#pragma clang diagnostic push +#pragma clang diagnostic ignored "-Wdeprecated-declarations" + @interface BrowserOpenGLView : NSOpenGLView { @private @@ -119,15 +123,18 @@ NSPoint ConvertPointFromWindowToScreen(NSWindow* window, NSPoint point) { [self resetDragDrop]; - NSArray* types = [NSArray - arrayWithObjects:kCEFDragDummyPboardType, NSStringPboardType, - NSFilenamesPboardType, NSPasteboardTypeString, nil]; + NSArray* types = [NSArray arrayWithObjects:kCEFDragDummyPboardType, + NSPasteboardTypeFileURL, + NSPasteboardTypeString, nil]; [self registerForDraggedTypes:types]; } return self; } +// End disable NSOpenGL deprecation warnings. +#pragma clang diagnostic pop + - (void)dealloc { [[NSNotificationCenter defaultCenter] removeObserver:self @@ -998,7 +1005,7 @@ NSPoint ConvertPointFromWindowToScreen(NSWindow* window, NSPoint point) { } // URL. - if ([type isEqualToString:NSURLPboardType]) { + if ([type isEqualToString:NSPasteboardTypeURL]) { DCHECK(current_drag_data_->IsLink()); NSString* strUrl = [NSString stringWithUTF8String:current_drag_data_->GetLinkURL() @@ -1030,12 +1037,12 @@ NSPoint ConvertPointFromWindowToScreen(NSWindow* window, NSPoint point) { forType:fileUTI_]; // Plain text. - } else if ([type isEqualToString:NSStringPboardType]) { + } else if ([type isEqualToString:NSPasteboardTypeString]) { NSString* strTitle = [NSString stringWithUTF8String:current_drag_data_->GetFragmentText() .ToString() .c_str()]; - [pboard setString:strTitle forType:NSStringPboardType]; + [pboard setString:strTitle forType:NSPasteboardTypeString]; } else if ([type isEqualToString:kCEFDragDummyPboardType]) { // The dummy type _was_ promised and someone decided to call the bluff. @@ -1122,7 +1129,7 @@ NSPoint ConvertPointFromWindowToScreen(NSWindow* window, NSPoint point) { // URL (and title). if (current_drag_data_->IsLink()) { - [pasteboard_ addTypes:@[ NSURLPboardType, kNSURLTitlePboardType ] + [pasteboard_ addTypes:@[ NSPasteboardTypeURL, kNSURLTitlePboardType ] owner:self]; } @@ -1149,9 +1156,15 @@ NSPoint ConvertPointFromWindowToScreen(NSWindow* window, NSPoint point) { CFRelease(mimeTypeCF); // File (HFS) promise. NSArray* fileUTIList = @[ fileUTI_ ]; - [pasteboard_ addTypes:@[ NSFilesPromisePboardType ] owner:self]; + NSString* NSPasteboardTypeFileURLPromise = +#if __has_feature(objc_arc) + (__bridge NSString*)kPasteboardTypeFileURLPromise; +#else + (NSString*)kPasteboardTypeFileURLPromise; +#endif + [pasteboard_ addTypes:@[ NSPasteboardTypeFileURLPromise ] owner:self]; [pasteboard_ setPropertyList:fileUTIList - forType:NSFilesPromisePboardType]; + forType:NSPasteboardTypeFileURLPromise]; [pasteboard_ addTypes:fileUTIList owner:self]; } @@ -1159,7 +1172,7 @@ NSPoint ConvertPointFromWindowToScreen(NSWindow* window, NSPoint point) { // Plain text. if (!current_drag_data_->GetFragmentText().empty()) { - [pasteboard_ addTypes:@[ NSStringPboardType ] owner:self]; + [pasteboard_ addTypes:@[ NSPasteboardTypeString ] owner:self]; } } @@ -1171,14 +1184,14 @@ NSPoint ConvertPointFromWindowToScreen(NSWindow* window, NSPoint point) { NSArray* types = [pboard types]; // Get plain text. - if ([types containsObject:NSStringPboardType]) { + if ([types containsObject:NSPasteboardTypeString]) { data->SetFragmentText( - [[pboard stringForType:NSStringPboardType] UTF8String]); + [[pboard stringForType:NSPasteboardTypeString] UTF8String]); } // Get files. - if ([types containsObject:NSFilenamesPboardType]) { - NSArray* files = [pboard propertyListForType:NSFilenamesPboardType]; + if ([types containsObject:NSPasteboardTypeFileURL]) { + NSArray* files = [pboard propertyListForType:NSPasteboardTypeFileURL]; if ([files isKindOfClass:[NSArray class]] && [files count]) { for (NSUInteger i = 0; i < [files count]; i++) { NSString* filename = [files objectAtIndex:i]; diff --git a/tests/cefclient/browser/osr_renderer.cc b/tests/cefclient/browser/osr_renderer.cc index c28044886..ef0880449 100644 --- a/tests/cefclient/browser/osr_renderer.cc +++ b/tests/cefclient/browser/osr_renderer.cc @@ -7,6 +7,7 @@ #if defined(OS_WIN) #include #elif defined(OS_MAC) +#define GL_SILENCE_DEPRECATION #include #elif defined(OS_LINUX) #include diff --git a/tests/cefclient/browser/root_window_mac.mm b/tests/cefclient/browser/root_window_mac.mm index bc9c73b2a..072566fbf 100644 --- a/tests/cefclient/browser/root_window_mac.mm +++ b/tests/cefclient/browser/root_window_mac.mm @@ -58,7 +58,7 @@ NSButton* MakeButton(NSRect* rect, NSString* title, NSView* parent) { [button autorelease]; #endif // !__has_feature(objc_arc) [button setTitle:title]; - [button setBezelStyle:NSSmallSquareBezelStyle]; + [button setBezelStyle:NSBezelStyleSmallSquare]; [button setAutoresizingMask:(NSViewMaxXMargin | NSViewMinYMargin)]; [parent addSubview:button]; rect->origin.x += BUTTON_WIDTH; diff --git a/tests/cefclient/browser/text_input_client_osr_mac.mm b/tests/cefclient/browser/text_input_client_osr_mac.mm index b6d74c7fa..1695b76f6 100644 --- a/tests/cefclient/browser/text_input_client_osr_mac.mm +++ b/tests/cefclient/browser/text_input_client_osr_mac.mm @@ -43,7 +43,7 @@ void ExtractUnderlines(NSAttributedString* string, if (NSColor* colorAttr = [attrs objectForKey:NSUnderlineColorAttributeName]) { color = CefColorFromNSColor( - [colorAttr colorUsingColorSpaceName:NSDeviceRGBColorSpace]); + [colorAttr colorUsingColorSpace:NSColorSpace.deviceRGBColorSpace]); } cef_composition_underline_t line = { {static_cast(range.location),