From 0570b26f90f031b09970f8fca1a67339b66ee33f Mon Sep 17 00:00:00 2001 From: Norwegian Rock Cat Date: Tue, 23 Jun 2009 17:16:10 +0200 Subject: Put back in these status bar changes for 10.4 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit I was a bit overzelous removing them, but they should remain for 10.4 Reviewed-by: Morten Sørvig --- src/gui/styles/qmacstyle_mac.mm | 4 ++++ src/gui/widgets/qstatusbar.cpp | 3 +++ 2 files changed, 7 insertions(+) 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(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(parent()) == 0 || -- cgit v0.12