diff options
| author | Fabien Freling <fabien.freling@nokia.com> | 2011-03-15 15:09:06 +0100 |
|---|---|---|
| committer | Fabien Freling <fabien.freling@nokia.com> | 2011-03-15 15:09:06 +0100 |
| commit | b36f947147e3f5acf444c94d6e2a608506b7e753 (patch) | |
| tree | a0bf253b8e315305cfada01871f3a1cbf54aef43 /src/gui/kernel/qt_cocoa_helpers_mac.mm | |
| parent | d524e983c60ba59f3c65d811ec92f02c97d1a8ab (diff) | |
| parent | c0cd8db0498daaa8151d1f80143b6849016bdc7c (diff) | |
Merge remote branch 'mainline/master' into merge_raster
Diffstat (limited to 'src/gui/kernel/qt_cocoa_helpers_mac.mm')
| -rw-r--r-- | src/gui/kernel/qt_cocoa_helpers_mac.mm | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/gui/kernel/qt_cocoa_helpers_mac.mm b/src/gui/kernel/qt_cocoa_helpers_mac.mm index d5a780c224..32123ee682 100644 --- a/src/gui/kernel/qt_cocoa_helpers_mac.mm +++ b/src/gui/kernel/qt_cocoa_helpers_mac.mm @@ -184,7 +184,7 @@ struct dndenum_mapper bool Qt2Mac; }; -#ifdef QT_MAC_USE_COCOA && __OBJC__ +#if defined(QT_MAC_USE_COCOA) && defined(__OBJC__) static dndenum_mapper dnd_enums[] = { { NSDragOperationLink, Qt::LinkAction, true }, @@ -1048,7 +1048,6 @@ QWidget *qt_mac_getTargetForKeyEvent(QWidget *widgetThatReceivedEvent) // events QWidget *qt_mac_getTargetForMouseEvent( // You can call this function without providing an event. - // If so, set returnGlobalPoint before the call. NSEvent *event, QEvent::Type eventType, QPoint &returnLocalPoint, @@ -1057,7 +1056,8 @@ QWidget *qt_mac_getTargetForMouseEvent( QWidget **returnWidgetUnderMouse) { Q_UNUSED(event); - returnGlobalPoint = flipPoint([NSEvent mouseLocation]).toPoint(); + NSPoint nsglobalpoint = event ? [[event window] convertBaseToScreen:[event locationInWindow]] : [NSEvent mouseLocation]; + returnGlobalPoint = flipPoint(nsglobalpoint).toPoint(); QWidget *mouseGrabber = QWidget::mouseGrabber(); bool buttonDownNotBlockedByModal = qt_button_down && !QApplicationPrivate::isBlockedByModal(qt_button_down); QWidget *popup = QApplication::activePopupWidget(); @@ -1627,6 +1627,7 @@ void qt_mac_constructQIconFromIconRef(const IconRef icon, const IconRef overlayI #ifdef QT_MAC_USE_COCOA void qt_mac_menu_collapseSeparators(void */*NSMenu **/ theMenu, bool collapse) { + QMacCocoaAutoReleasePool pool; OSMenuRef menu = static_cast<OSMenuRef>(theMenu); if (collapse) { bool previousIsSeparator = true; // setting to true kills all the separators placed at the top. |