From 9fa6e8f627d0c61fd5a3b993903a362dc04bf707 Mon Sep 17 00:00:00 2001 From: Morten Sorvig Date: Thu, 29 Sep 2011 14:29:05 +0200 Subject: Clean-up a macro for Cocoa MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Remove the usage of Q_MAC_USE_COCOA and Carbon code paths. Change-Id: Ib569ad8c6d9ffe258f454b3c3b06e95294a10112 Reviewed-on: http://codereview.qt-project.org/5100 Reviewed-by: Morten Johan Sørvig Sanity-Review: Morten Johan Sørvig --- src/widgets/platforms/mac/qpaintengine_mac.cpp | 8 -------- 1 file changed, 8 deletions(-) (limited to 'src/widgets/platforms/mac/qpaintengine_mac.cpp') diff --git a/src/widgets/platforms/mac/qpaintengine_mac.cpp b/src/widgets/platforms/mac/qpaintengine_mac.cpp index 3def016b56..af8e0e36c3 100644 --- a/src/widgets/platforms/mac/qpaintengine_mac.cpp +++ b/src/widgets/platforms/mac/qpaintengine_mac.cpp @@ -556,11 +556,7 @@ QCoreGraphicsPaintEngine::end() Q_D(QCoreGraphicsPaintEngine); setActive(false); if(d->pdev->devType() == QInternal::Widget && static_cast(d->pdev)->windowType() == Qt::Desktop) { -#ifndef QT_MAC_USE_COCOA - HideWindow(qt_mac_window_for(static_cast(d->pdev))); -#else // // ### need to do [qt_mac_window_for(static_cast(d->pdev)) orderOut]; (need to rename) -#endif } if(d->shading) { @@ -1045,11 +1041,7 @@ void QCoreGraphicsPaintEngine::drawTextItem(const QPointF &pos, const QTextItem if (ti.glyphs.numGlyphs) { switch (fe->type()) { case QFontEngine::Mac: -#ifdef QT_MAC_USE_COCOA static_cast(fe)->draw(d->hd, pos.x(), pos.y(), ti, paintDevice()->height()); -#else - static_cast(fe)->draw(d->hd, pos.x(), pos.y(), ti, paintDevice()->height()); -#endif break; case QFontEngine::Box: d->drawBoxTextItem(pos, ti); -- cgit v1.2.3