|
|
|
@ -18,7 +18,7 @@
@@ -18,7 +18,7 @@
|
|
|
|
|
extern void qt_mac_set_dock_menu(QMenu *); |
|
|
|
|
#endif |
|
|
|
|
|
|
|
|
|
static MacDockIconHandler *s_instance = NULL; |
|
|
|
|
static MacDockIconHandler *s_instance = nullptr; |
|
|
|
|
|
|
|
|
|
bool dockClickHandler(id self,SEL _cmd,...) { |
|
|
|
|
Q_UNUSED(self) |
|
|
|
@ -34,7 +34,7 @@ void setupDockClickHandler() {
@@ -34,7 +34,7 @@ void setupDockClickHandler() {
|
|
|
|
|
Class cls = objc_getClass("NSApplication"); |
|
|
|
|
id appInst = objc_msgSend((id)cls, sel_registerName("sharedApplication")); |
|
|
|
|
|
|
|
|
|
if (appInst != NULL) { |
|
|
|
|
if (appInst != nullptr) { |
|
|
|
|
id delegate = objc_msgSend(appInst, sel_registerName("delegate")); |
|
|
|
|
Class delClass = (Class)objc_msgSend(delegate, sel_registerName("class")); |
|
|
|
|
SEL shouldHandle = sel_registerName("applicationShouldHandleReopen:hasVisibleWindows:"); |
|
|
|
@ -53,7 +53,7 @@ MacDockIconHandler::MacDockIconHandler() : QObject()
@@ -53,7 +53,7 @@ MacDockIconHandler::MacDockIconHandler() : QObject()
|
|
|
|
|
setupDockClickHandler(); |
|
|
|
|
this->m_dummyWidget = new QWidget(); |
|
|
|
|
this->m_dockMenu = new QMenu(this->m_dummyWidget); |
|
|
|
|
this->setMainWindow(NULL); |
|
|
|
|
this->setMainWindow(nullptr); |
|
|
|
|
#if QT_VERSION < 0x050000 |
|
|
|
|
qt_mac_set_dock_menu(this->m_dockMenu); |
|
|
|
|
#elif QT_VERSION >= 0x050200 |
|
|
|
@ -69,7 +69,7 @@ void MacDockIconHandler::setMainWindow(QMainWindow *window) {
@@ -69,7 +69,7 @@ void MacDockIconHandler::setMainWindow(QMainWindow *window) {
|
|
|
|
|
MacDockIconHandler::~MacDockIconHandler() |
|
|
|
|
{ |
|
|
|
|
delete this->m_dummyWidget; |
|
|
|
|
this->setMainWindow(NULL); |
|
|
|
|
this->setMainWindow(nullptr); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
QMenu *MacDockIconHandler::dockMenu() |
|
|
|
|