procxx
/
kepka
mirror of https://github.com/procxx/kepka.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Suppress new macOS deprecation warnings

This commit is contained in:
Berkus Decker 2017-11-24 22:53:33 +02:00 committed by Berkus Decker
parent bf468f36ea
commit be8570e8c2
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Telegram/SourceFiles/platform/mac/file_utilities_mac.mm
View File

@ -530,7 +530,7 @@ bool UnsafeShowOpenWith(const QString &filepath) {
NSArray *appsPaths = [[NSFileManager defaultManager] URLsForDirectory:NSApplicationDirectory inDomains:NSLocalDomainMask]; NSArray *appsPaths = [[NSFileManager defaultManager] URLsForDirectory:NSApplicationDirectory inDomains:NSLocalDomainMask];
if ([appsPaths count]) [openPanel setDirectoryURL:[appsPaths firstObject]]; if ([appsPaths count]) [openPanel setDirectoryURL:[appsPaths firstObject]];
[openPanel beginWithCompletionHandler:^(NSInteger result){ [openPanel beginWithCompletionHandler:^(NSInteger result){
if (result == NSFileHandlingPanelOKButton) { if (result == NSModalResponseOK) {
if ([[openPanel URLs] count] > 0) { if ([[openPanel URLs] count] > 0) {
NSURL *app = [[openPanel URLs] objectAtIndex:0]; NSURL *app = [[openPanel URLs] objectAtIndex:0];
NSString *path = [app path]; NSString *path = [app path];

6
Telegram/SourceFiles/platform/mac/main_window_mac.mm
View File

@ -162,7 +162,7 @@ void MainWindow::Private::setWindowBadge(const QString &str) {
} }
void MainWindow::Private::initCustomTitle(NSWindow *window, NSView *view) { void MainWindow::Private::initCustomTitle(NSWindow *window, NSView *view) {
[window setStyleMask:[window styleMask] | NSFullSizeContentViewWindowMask]; [window setStyleMask:[window styleMask] | NSWindowStyleMaskFullSizeContentView];
[window setTitlebarAppearsTransparent:YES]; [window setTitlebarAppearsTransparent:YES];
auto inner = [window contentLayoutRect]; auto inner = [window contentLayoutRect];
auto full = [view frame]; auto full = [view frame];
@ -198,7 +198,7 @@ void MainWindow::Private::enableShadow(WId winId) {
bool MainWindow::Private::filterNativeEvent(void *event) { bool MainWindow::Private::filterNativeEvent(void *event) {
NSEvent *e = static_cast<NSEvent*>(event); NSEvent *e = static_cast<NSEvent*>(event);
if (e && [e type] == NSSystemDefined && [e subtype] == SPSystemDefinedEventMediaKeys) { if (e && [e type] == NSEventTypeSystemDefined && [e subtype] == SPSystemDefinedEventMediaKeys) {
#ifndef OS_MAC_STORE #ifndef OS_MAC_STORE
// If event tap is not installed, handle events that reach the app instead // If event tap is not installed, handle events that reach the app instead
if (![SPMediaKeyTap usesGlobalMediaKeyTap]) { if (![SPMediaKeyTap usesGlobalMediaKeyTap]) {
@ -226,7 +226,7 @@ MainWindow::MainWindow()
void MainWindow::closeWithoutDestroy() { void MainWindow::closeWithoutDestroy() {
NSWindow *nsWindow = [reinterpret_cast<NSView*>(winId()) window]; NSWindow *nsWindow = [reinterpret_cast<NSView*>(winId()) window];
auto isFullScreen = (([nsWindow styleMask] & NSFullScreenWindowMask) == NSFullScreenWindowMask); auto isFullScreen = (([nsWindow styleMask] & NSWindowStyleMaskFullScreen) == NSWindowStyleMaskFullScreen);
if (isFullScreen) { if (isFullScreen) {
_hideAfterFullScreenTimer.callOnce(kHideAfterFullscreenTimeoutMs); _hideAfterFullScreenTimer.callOnce(kHideAfterFullscreenTimeoutMs);
[nsWindow toggleFullScreen:nsWindow]; [nsWindow toggleFullScreen:nsWindow];

4
Telegram/SourceFiles/platform/mac/specific_mac_p.mm
View File

@ -177,7 +177,7 @@ ApplicationDelegate *_sharedDelegate = nil;
} }
- (void) mediaKeyTap:(SPMediaKeyTap*)keyTap receivedMediaKeyEvent:(NSEvent*)e { - (void) mediaKeyTap:(SPMediaKeyTap*)keyTap receivedMediaKeyEvent:(NSEvent*)e {
if (e && [e type] == NSSystemDefined && [e subtype] == SPSystemDefinedEventMediaKeys) { if (e && [e type] == NSEventTypeSystemDefined && [e subtype] == SPSystemDefinedEventMediaKeys) {
objc_handleMediaKeyEvent(e); objc_handleMediaKeyEvent(e);
} }
} }
@ -256,7 +256,7 @@ void objc_showOverAll(WId winId, bool canFocus) {
NSWindow *wnd = [reinterpret_cast<NSView *>(winId) window]; NSWindow *wnd = [reinterpret_cast<NSView *>(winId) window];
[wnd setLevel:NSPopUpMenuWindowLevel]; [wnd setLevel:NSPopUpMenuWindowLevel];
if (!canFocus) { if (!canFocus) {
[wnd setStyleMask:NSUtilityWindowMask | NSNonactivatingPanelMask]; [wnd setStyleMask:NSWindowStyleMaskUtilityWindow | NSWindowStyleMaskNonactivatingPanel];
[wnd setCollectionBehavior:NSWindowCollectionBehaviorMoveToActiveSpace|NSWindowCollectionBehaviorStationary|NSWindowCollectionBehaviorFullScreenAuxiliary|NSWindowCollectionBehaviorIgnoresCycle]; [wnd setCollectionBehavior:NSWindowCollectionBehaviorMoveToActiveSpace|NSWindowCollectionBehaviorStationary|NSWindowCollectionBehaviorFullScreenAuxiliary|NSWindowCollectionBehaviorIgnoresCycle];
} }
} }