diff options
author | Richard Moe Gustavsen <richard.gustavsen@nokia.com> | 2009-05-14 08:37:37 (GMT) |
---|---|---|
committer | Richard Moe Gustavsen <richard.gustavsen@nokia.com> | 2009-05-14 08:40:44 (GMT) |
commit | 8a97b3b9e506580b4a89c1277068b274794a858c (patch) | |
tree | 9173079cf343bec99a1475fcfe7fe3033d07baac /src/gui/kernel | |
parent | 4cfe2b57d97488b4f312ad2ec2985f619b4984b6 (diff) | |
download | Qt-8a97b3b9e506580b4a89c1277068b274794a858c.zip Qt-8a97b3b9e506580b4a89c1277068b274794a858c.tar.gz Qt-8a97b3b9e506580b4a89c1277068b274794a858c.tar.bz2 |
Sheets misbehaviour on Carbon - Mac OS X
Seems like some old legacy code was left behind when sheets behaved as
application modal. This is not the case anymore, so this patch just
removes the special case code for enforcing the old behaviour, and let
carbon do the correct thing instead.
Task-number: 252379
Reviewed-by: Trenton Schulz
Diffstat (limited to 'src/gui/kernel')
-rw-r--r-- | src/gui/kernel/qwidget_mac.mm | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/src/gui/kernel/qwidget_mac.mm b/src/gui/kernel/qwidget_mac.mm index b315eaf..0e021dc 100644 --- a/src/gui/kernel/qwidget_mac.mm +++ b/src/gui/kernel/qwidget_mac.mm @@ -786,16 +786,6 @@ OSStatus QWidgetPrivate::qt_window_event(EventHandlerCallRef er, EventRef event, // By also setting the current modal window back into the event, we // help Carbon determining which window is supposed to be raised. handled_event = qApp->activePopupWidget() ? true : false; - QWidget *top = 0; - if (!QApplicationPrivate::tryModalHelper(widget, &top) && top && top != widget){ - if(!qt_mac_is_macsheet(top) || top->parentWidget() != widget) { - handled_event = true; - WindowPtr topWindowRef = qt_mac_window_for(top); - SetEventParameter(event, kEventParamModalWindow, typeWindowRef, sizeof(topWindowRef), &topWindowRef); - HIModalClickResult clickResult = kHIModalClickIsModal; - SetEventParameter(event, kEventParamModalClickResult, typeModalClickResult, sizeof(clickResult), &clickResult); - } - } #endif } else if(ekind == kEventWindowClose) { widget->d_func()->close_helper(QWidgetPrivate::CloseWithSpontaneousEvent); |