From 9fa6e8f627d0c61fd5a3b993903a362dc04bf707 Mon Sep 17 00:00:00 2001
From: Morten Sorvig <morten.sorvig@nokia.com>
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 <morten.sorvig@nokia.com>
Sanity-Review: Morten Johan Sørvig <morten.sorvig@nokia.com>
---
 doc/src/snippets/qmacnativewidget/main.mm | 50 -------------------------------
 1 file changed, 50 deletions(-)

(limited to 'doc/src')

diff --git a/doc/src/snippets/qmacnativewidget/main.mm b/doc/src/snippets/qmacnativewidget/main.mm
index a57dc19a28..f83adeff23 100644
--- a/doc/src/snippets/qmacnativewidget/main.mm
+++ b/doc/src/snippets/qmacnativewidget/main.mm
@@ -40,16 +40,11 @@
 
 #include <QtGui/QtGui>
 #include <QtGui/qmacnativewidget_mac.h>
-#ifdef QT_MAC_USE_COCOA
 #import <Cocoa/Cocoa.h>
-#else
-#include <Carbon/Carbon.h>
-#endif
 
 int main(int argc, char **argv)
 {
     QApplication app(argc, argv);
-#ifdef QT_MAC_USE_COCOA
 //![0]
     NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
     NSWindow *window = [[NSWindow alloc] initWithContentRect:NSMakeRect(200, app.desktop()->height() - 200, 239, 200)
@@ -85,50 +80,5 @@ int main(int argc, char **argv)
     [window makeKeyAndOrderFront:window];
     [pool release];
 //![0]
-#else
-//![1]
-    Rect contentRect;
-    SetRect(&contentRect, 200, 200, 400, 400);
-    HIWindowRef windowRef;
-    CreateNewWindow(kDocumentWindowClass, kWindowStandardDocumentAttributes | kWindowCompositingAttribute | kWindowStandardHandlerAttribute | kWindowLiveResizeAttribute, &contentRect, &windowRef);
-    HIViewRef contentView = 0;
-    GetRootControl(windowRef, &contentView);
-
-    QMacNativeWidget *nativeWidget = new QMacNativeWidget();
-    nativeWidget->move(0, 0);
-    nativeWidget->setPalette(QPalette(Qt::red));
-    nativeWidget->setAutoFillBackground(true);
-    QVBoxLayout *layout = new QVBoxLayout();
-    QPushButton *pushButton = new QPushButton("An Embedded Qt Button!", nativeWidget);
-    pushButton->setAttribute(Qt::WA_LayoutUsesWidgetRect); // Don't use the layout rect calculated from QMacStyle.
-    layout->addWidget(pushButton);
-    nativeWidget->setLayout(layout);
-    HIViewRef nativeWidgetView = reinterpret_cast<HIViewRef>(nativeWidget->winId());
-    // Add the nativeWidget to the window.
-    HIViewAddSubview(contentView, nativeWidgetView);
-
-    // Adjust Carbon layouts
-    HILayoutInfo layoutInfo;
-    layoutInfo.version = kHILayoutInfoVersionZero;
-    HIViewGetLayoutInfo(nativeWidgetView, &layoutInfo);
-
-    layoutInfo.binding.top.toView = contentView;
-    layoutInfo.binding.top.kind = kHILayoutBindTop;
-    layoutInfo.binding.left.toView = contentView;
-    layoutInfo.binding.left.kind = kHILayoutBindLeft;
-    layoutInfo.binding.right.toView = contentView;
-    layoutInfo.binding.right.kind = kHILayoutBindRight;
-    layoutInfo.binding.bottom.toView = contentView;
-    layoutInfo.binding.bottom.kind = kHILayoutBindBottom;
-
-    HIViewSetLayoutInfo(nativeWidgetView, &layoutInfo);
-    HIViewApplyLayout(nativeWidgetView);
-
-    pushButton->show();
-    nativeWidget->show();
-    // Show the window.
-    ShowWindow(windowRef);
-//![1]
-#endif
     return app.exec(); // gives us the same behavior in both
 }
-- 
cgit v1.2.3