diff options
author | Norwegian Rock Cat <qt-info@nokia.com> | 2009-06-23 15:16:10 (GMT) |
---|---|---|
committer | Norwegian Rock Cat <qt-info@nokia.com> | 2009-06-23 15:17:10 (GMT) |
commit | 0570b26f90f031b09970f8fca1a67339b66ee33f (patch) | |
tree | 7773a94bb4584c18a631eb4d58a43f32b47d405a | |
parent | 4aed5d9130ec291c4897740085599b89f683a7e9 (diff) | |
download | Qt-0570b26f90f031b09970f8fca1a67339b66ee33f.zip Qt-0570b26f90f031b09970f8fca1a67339b66ee33f.tar.gz Qt-0570b26f90f031b09970f8fca1a67339b66ee33f.tar.bz2 |
Put back in these status bar changes for 10.4
I was a bit overzelous removing them, but they should remain for 10.4
Reviewed-by: Morten Sørvig
-rw-r--r-- | src/gui/styles/qmacstyle_mac.mm | 4 | ||||
-rw-r--r-- | src/gui/widgets/qstatusbar.cpp | 3 |
2 files changed, 7 insertions, 0 deletions
diff --git a/src/gui/styles/qmacstyle_mac.mm b/src/gui/styles/qmacstyle_mac.mm index 8812614..f88d90a 100644 --- a/src/gui/styles/qmacstyle_mac.mm +++ b/src/gui/styles/qmacstyle_mac.mm @@ -3325,6 +3325,10 @@ void QMacStyle::drawPrimitive(PrimitiveElement pe, const QStyleOption *opt, QPai drawTabCloseButton(p, hover, active, selected); } break; case PE_PanelStatusBar: { + if (QSysInfo::MacintoshVersion <= QSysInfo::MV_10_4) { + QWindowsStyle::drawPrimitive(pe, opt, p, w); + break; + } // Use the Leopard style only if the status bar is the status bar for a // QMainWindow with a unifed toolbar. if (w == 0 || w->parent() == 0 || qobject_cast<QMainWindow *>(w->parent()) == 0 || diff --git a/src/gui/widgets/qstatusbar.cpp b/src/gui/widgets/qstatusbar.cpp index 8a174f9..da70aac 100644 --- a/src/gui/widgets/qstatusbar.cpp +++ b/src/gui/widgets/qstatusbar.cpp @@ -804,6 +804,9 @@ bool QStatusBar::event(QEvent *e) #ifndef Q_WS_MAC return QWidget::event(e); #else + if (QSysInfo::MacintoshVersion <= QSysInfo::MV_10_4) + return QWidget::event(e); + // Enable drag-click only if the status bar is the status bar for a // QMainWindow with a unifed toolbar. if (parent() == 0 || qobject_cast<QMainWindow *>(parent()) == 0 || |