diff options
author | Richard Moe Gustavsen <richard.gustavsen@nokia.com> | 2010-04-07 10:31:43 (GMT) |
---|---|---|
committer | Richard Moe Gustavsen <richard.gustavsen@nokia.com> | 2010-04-07 10:35:58 (GMT) |
commit | 723fc322438fedc07f774d833195e030e8789d9d (patch) | |
tree | e6a12f3c4fcf24eacd429deae9f9ca21aeafb350 /src/gui/kernel/qcocoasharedwindowmethods_mac_p.h | |
parent | bb718c6a6e626b5b353884525223de5d7a178c2d (diff) | |
download | Qt-723fc322438fedc07f774d833195e030e8789d9d.zip Qt-723fc322438fedc07f774d833195e030e8789d9d.tar.gz Qt-723fc322438fedc07f774d833195e030e8789d9d.tar.bz2 |
Cocoa: remove hackish code that is no longer needed
After Carlos' patch (0c442405a9f85), the code in the event dispatcher
that tried to restore correct window level (or actually block cocoa
from setting the wrong level) can now be removed. Tested on 10.5
and 10.6.
Reviewed-by: cduclos
Diffstat (limited to 'src/gui/kernel/qcocoasharedwindowmethods_mac_p.h')
-rw-r--r-- | src/gui/kernel/qcocoasharedwindowmethods_mac_p.h | 25 |
1 files changed, 0 insertions, 25 deletions
diff --git a/src/gui/kernel/qcocoasharedwindowmethods_mac_p.h b/src/gui/kernel/qcocoasharedwindowmethods_mac_p.h index 129e0a5..ec00915 100644 --- a/src/gui/kernel/qcocoasharedwindowmethods_mac_p.h +++ b/src/gui/kernel/qcocoasharedwindowmethods_mac_p.h @@ -58,7 +58,6 @@ QT_BEGIN_NAMESPACE extern Qt::MouseButton cocoaButton2QtButton(NSInteger buttonNum); // qcocoaview.mm extern QPointer<QWidget> qt_button_down; //qapplication_mac.cpp extern const QStringList& qEnabledDraggedTypes(); // qmime_mac.cpp -extern bool qt_blockCocoaSettingModalWindowLevel; // qeventdispatcher_mac_p.h Q_GLOBAL_STATIC(QPointer<QWidget>, currentDragTarget); @@ -102,30 +101,6 @@ QT_END_NAMESPACE return !(isPopup || isToolTip || isTool); } -- (void)orderWindow:(NSWindowOrderingMode)orderingMode relativeTo:(NSInteger)otherWindowNumber -{ - if (qt_blockCocoaSettingModalWindowLevel) { - // To avoid windows popping in front while restoring modal sessions - // in the event dispatcher, we block cocoa from ordering this window - // to front. The result of not doing this can be seen if executing - // a native color dialog on top of another executing dialog. - return; - } - [super orderWindow:orderingMode relativeTo:otherWindowNumber]; -} - -- (void)setLevel:(NSInteger)windowLevel -{ - if (qt_blockCocoaSettingModalWindowLevel) { - // To avoid windows popping in front while restoring modal sessions - // in the event dispatcher, we block cocoa from ordering this window - // to front. The result of not doing this can be seen if executing - // a native color dialog on top of another executing dialog. - return; - } - [super setLevel:windowLevel]; -} - - (void)toggleToolbarShown:(id)sender { macSendToolbarChangeEvent([self QT_MANGLE_NAMESPACE(qt_qwidget)]); |