qt: Replace objc_msgSend with native syntax
This commit is contained in:
parent
db67101c74
commit
0bb33b5348
3 changed files with 18 additions and 13 deletions
|
@ -585,7 +585,7 @@ case $host in
|
||||||
fi
|
fi
|
||||||
|
|
||||||
AX_CHECK_LINK_FLAG([[-Wl,-headerpad_max_install_names]], [LDFLAGS="$LDFLAGS -Wl,-headerpad_max_install_names"])
|
AX_CHECK_LINK_FLAG([[-Wl,-headerpad_max_install_names]], [LDFLAGS="$LDFLAGS -Wl,-headerpad_max_install_names"])
|
||||||
CPPFLAGS="$CPPFLAGS -DMAC_OSX"
|
CPPFLAGS="$CPPFLAGS -DMAC_OSX -DOBJC_OLD_DISPATCH_PROTOTYPES=0"
|
||||||
OBJCXXFLAGS="$CXXFLAGS"
|
OBJCXXFLAGS="$CXXFLAGS"
|
||||||
;;
|
;;
|
||||||
*android*)
|
*android*)
|
||||||
|
|
|
@ -58,9 +58,10 @@
|
||||||
#pragma GCC diagnostic push
|
#pragma GCC diagnostic push
|
||||||
#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
|
#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
|
||||||
|
|
||||||
#include <objc/objc-runtime.h>
|
|
||||||
#include <CoreServices/CoreServices.h>
|
#include <CoreServices/CoreServices.h>
|
||||||
#include <QProcess>
|
#include <QProcess>
|
||||||
|
|
||||||
|
void ForceActivation();
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
namespace GUIUtil {
|
namespace GUIUtil {
|
||||||
|
@ -360,10 +361,7 @@ bool isObscured(QWidget *w)
|
||||||
void bringToFront(QWidget* w)
|
void bringToFront(QWidget* w)
|
||||||
{
|
{
|
||||||
#ifdef Q_OS_MAC
|
#ifdef Q_OS_MAC
|
||||||
// Force application activation on macOS. With Qt 5.4 this is required when
|
ForceActivation();
|
||||||
// an action in the dock menu is triggered.
|
|
||||||
id app = objc_msgSend((id) objc_getClass("NSApplication"), sel_registerName("sharedApplication"));
|
|
||||||
objc_msgSend(app, sel_registerName("activateIgnoringOtherApps:"), YES);
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
if (w) {
|
if (w) {
|
||||||
|
|
|
@ -1,12 +1,11 @@
|
||||||
// Copyright (c) 2011-2018 The Bitcoin Core developers
|
// Copyright (c) 2011-2019 The Bitcoin Core developers
|
||||||
// Distributed under the MIT software license, see the accompanying
|
// Distributed under the MIT software license, see the accompanying
|
||||||
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
|
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
|
||||||
|
|
||||||
#include "macdockiconhandler.h"
|
#include "macdockiconhandler.h"
|
||||||
|
|
||||||
#undef slots
|
#include <AppKit/AppKit.h>
|
||||||
#include <objc/objc.h>
|
#include <objc/runtime.h>
|
||||||
#include <objc/message.h>
|
|
||||||
|
|
||||||
static MacDockIconHandler *s_instance = nullptr;
|
static MacDockIconHandler *s_instance = nullptr;
|
||||||
|
|
||||||
|
@ -21,9 +20,7 @@ bool dockClickHandler(id self, SEL _cmd, ...) {
|
||||||
}
|
}
|
||||||
|
|
||||||
void setupDockClickHandler() {
|
void setupDockClickHandler() {
|
||||||
id app = objc_msgSend((id)objc_getClass("NSApplication"), sel_registerName("sharedApplication"));
|
Class delClass = (Class)[[[NSApplication sharedApplication] delegate] class];
|
||||||
id delegate = objc_msgSend(app, sel_registerName("delegate"));
|
|
||||||
Class delClass = (Class)objc_msgSend(delegate, sel_registerName("class"));
|
|
||||||
SEL shouldHandle = sel_registerName("applicationShouldHandleReopen:hasVisibleWindows:");
|
SEL shouldHandle = sel_registerName("applicationShouldHandleReopen:hasVisibleWindows:");
|
||||||
class_replaceMethod(delClass, shouldHandle, (IMP)dockClickHandler, "B@:");
|
class_replaceMethod(delClass, shouldHandle, (IMP)dockClickHandler, "B@:");
|
||||||
}
|
}
|
||||||
|
@ -44,3 +41,13 @@ void MacDockIconHandler::cleanup()
|
||||||
{
|
{
|
||||||
delete s_instance;
|
delete s_instance;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Force application activation on macOS. With Qt 5.5.1 this is required when
|
||||||
|
* an action in the Dock menu is triggered.
|
||||||
|
* TODO: Define a Qt version where it's no-longer necessary.
|
||||||
|
*/
|
||||||
|
void ForceActivation()
|
||||||
|
{
|
||||||
|
[[NSApplication sharedApplication] activateIgnoringOtherApps:YES];
|
||||||
|
}
|
||||||
|
|
Loading…
Add table
Reference in a new issue