From 92a32e050fe0c545d0b7b70501c224d09f8d9ed6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Arne=20Vestb=C3=B8?= Date: Fri, 28 Aug 2020 11:58:30 +0200 Subject: Remove QMacNativeWidget and QMacCocoaViewContainer MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The functionality should be available via QWidget::winId(), and QWidget::createWindowContainer() + QWindow::fromWinId(). Any bugs in this area should be fixed by improving the general wrapping APIs. Fixes: QTBUG-83254 Change-Id: I86584a4a8138d17d65a50da39efd58039f10da91 Reviewed-by: Morten Johan Sørvig --- src/widgets/doc/snippets/qmacnativewidget/main.mm | 94 ----------------------- 1 file changed, 94 deletions(-) delete mode 100644 src/widgets/doc/snippets/qmacnativewidget/main.mm (limited to 'src/widgets/doc/snippets') diff --git a/src/widgets/doc/snippets/qmacnativewidget/main.mm b/src/widgets/doc/snippets/qmacnativewidget/main.mm deleted file mode 100644 index 45e39c4953..0000000000 --- a/src/widgets/doc/snippets/qmacnativewidget/main.mm +++ /dev/null @@ -1,94 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2016 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the documentation of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:BSD$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see https://www.qt.io/terms-conditions. For further -** information use the contact form at https://www.qt.io/contact-us. -** -** BSD License Usage -** Alternatively, you may use this file under the terms of the BSD license -** as follows: -** -** "Redistribution and use in source and binary forms, with or without -** modification, are permitted provided that the following conditions are -** met: -** * Redistributions of source code must retain the above copyright -** notice, this list of conditions and the following disclaimer. -** * Redistributions in binary form must reproduce the above copyright -** notice, this list of conditions and the following disclaimer in -** the documentation and/or other materials provided with the -** distribution. -** * Neither the name of The Qt Company Ltd nor the names of its -** contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. -** -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#include -#include -#import - -int main(int argc, char **argv) -{ - QApplication app(argc, argv); -//![0] - NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; - NSWindow *window = [[NSWindow alloc] initWithContentRect:NSMakeRect(200, app.desktop()->height() - 200, 239, 200) - styleMask:NSTitledWindowMask | NSClosableWindowMask - | NSMiniaturizableWindowMask | NSResizableWindowMask - backing:NSBackingStoreBuffered defer:NO]; - - 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); - - // Adjust Cocoa layouts - NSView *nativeWidgetView = reinterpret_cast(nativeWidget->winId()); - NSView *contentView = [window contentView]; - [contentView setAutoresizesSubviews:YES]; - [nativeWidgetView setAutoresizingMask:NSViewWidthSizable | NSViewHeightSizable]; - [nativeWidgetView setAutoresizesSubviews:YES]; - NSView *pushButtonView = reinterpret_cast(pushButton->winId()); - [pushButtonView setAutoresizingMask:NSViewWidthSizable]; - - // Add the nativeWidget to the window. - [contentView addSubview:nativeWidgetView positioned:NSWindowAbove relativeTo:nil]; - nativeWidget->show(); - pushButton->show(); - - // Show the window. - [window makeKeyAndOrderFront:window]; - [pool release]; -//![0] - return app.exec(); // gives us the same behavior in both -} -- cgit v1.2.3