diff options
| author | Morten Sorvig <morten.sorvig@nokia.com> | 2011-10-19 14:23:45 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2011-10-23 10:23:23 +0200 |
| commit | f6e0a2f59f79ba6b20f2d4d00807d26b71fa9178 (patch) | |
| tree | 3929c5179601ad15df2c5018882c9edeee34b442 /src/plugins/platforms/cocoa/qcocoawindow.mm | |
| parent | 03fd37cdf403e35aaaab874be9bad033d250e39d (diff) | |
Cocoa: clean up compiler warnings.
Change-Id: I2cb65bb455b79b218a317b21e5a3b0d9792e0e22
Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com>
Diffstat (limited to 'src/plugins/platforms/cocoa/qcocoawindow.mm')
| -rw-r--r-- | src/plugins/platforms/cocoa/qcocoawindow.mm | 22 |
1 files changed, 4 insertions, 18 deletions
diff --git a/src/plugins/platforms/cocoa/qcocoawindow.mm b/src/plugins/platforms/cocoa/qcocoawindow.mm index ffbce4084b..840d4d96da 100644 --- a/src/plugins/platforms/cocoa/qcocoawindow.mm +++ b/src/plugins/platforms/cocoa/qcocoawindow.mm @@ -54,20 +54,6 @@ #include <QDebug> -@implementation QNSWindow - -- (BOOL)canBecomeKeyWindow -{ - return YES; -} - -- (BOOL)canBecomeMainWindow -{ - return YES; -} - -@end - QCocoaWindow::QCocoaWindow(QWindow *tlw) : QPlatformWindow(tlw) , m_windowAttributes(0) @@ -285,7 +271,7 @@ void QCocoaWindow::determineWindowClass() /* */ -QNSWindow * QCocoaWindow::createWindow() +NSWindow * QCocoaWindow::createWindow() { // Determine if we need to add in our "custom window" attribute. Cocoa is rather clever // in deciding if we need the maximize button or not (i.e., it's resizable, so you @@ -306,7 +292,7 @@ QNSWindow * QCocoaWindow::createWindow() */ NSRect frame = globalGeometry(window()->geometry()); QCocoaAutoReleasePool pool; - QNSWindow *window; + NSWindow *window; switch (m_windowClass) { case kMovableModalWindowClass: @@ -318,7 +304,7 @@ QNSWindow * QCocoaWindow::createWindow() NSPanel *panel; BOOL needFloating = NO; - BOOL worksWhenModal = (this->window()->windowType() == Qt::Popup); + //BOOL worksWhenModal = (this->window()->windowType() == Qt::Popup); // Add in the extra flags if necessary. switch (m_windowClass) { @@ -345,7 +331,7 @@ QNSWindow * QCocoaWindow::createWindow() break; } default: - window = [[QNSWindow alloc] initWithContentRect:frame + window = [[NSWindow alloc] initWithContentRect:frame styleMask:(NSResizableWindowMask | NSClosableWindowMask | NSMiniaturizableWindowMask | NSTitledWindowMask) backing:NSBackingStoreBuffered defer:NO]; // Deferring window creation breaks OpenGL (the GL context is set up |