Changeset 846 for trunk/src/gui/dialogs/qprintdialog_mac.mm
- Timestamp:
- May 5, 2011, 5:36:53 AM (14 years ago)
- Location:
- trunk
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk
- Property svn:mergeinfo changed
/branches/vendor/nokia/qt/4.7.2 (added) merged: 845 /branches/vendor/nokia/qt/current merged: 844 /branches/vendor/nokia/qt/4.6.3 removed
- Property svn:mergeinfo changed
-
trunk/src/gui/dialogs/qprintdialog_mac.mm
r651 r846 1 1 /**************************************************************************** 2 2 ** 3 ** Copyright (C) 201 0Nokia Corporation and/or its subsidiary(-ies).3 ** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies). 4 4 ** All rights reserved. 5 5 ** Contact: Nokia Corporation (qt-info@nokia.com) … … 125 125 #ifdef QT_MAC_USE_COCOA 126 126 127 @class Q CocoaPrintPanelDelegate;128 129 @interface Q CocoaPrintPanelDelegate: NSObject {127 @class QT_MANGLE_NAMESPACE(QCocoaPrintPanelDelegate); 128 129 @interface QT_MANGLE_NAMESPACE(QCocoaPrintPanelDelegate) : NSObject { 130 130 } 131 131 - (void)printPanelDidEnd:(NSPrintPanel *)printPanel … … 133 133 @end 134 134 135 @implementation Q CocoaPrintPanelDelegate135 @implementation QT_MANGLE_NAMESPACE(QCocoaPrintPanelDelegate) 136 136 - (void)printPanelDidEnd:(NSPrintPanel *)printPanel 137 137 returnCode:(int)returnCode contextInfo:(void *)contextInfo … … 141 141 QPrintDialogPrivate *d = static_cast<QPrintDialogPrivate *>(contextInfo); 142 142 QPrintDialog *dialog = d->printDialog(); 143 // temporary hack to work around bug in deleteLater() in Qt/Mac Cocoa144 #if 1145 bool deleteDialog = dialog->testAttribute(Qt::WA_DeleteOnClose);146 dialog->setAttribute(Qt::WA_DeleteOnClose, false);147 #endif148 143 149 144 if (returnCode == NSOKButton) { … … 193 188 194 189 dialog->done((returnCode == NSOKButton) ? QDialog::Accepted : QDialog::Rejected); 195 #if 1196 if (deleteDialog)197 delete dialog;198 #endif199 190 } 200 191 @end … … 314 305 macStartInterceptWindowTitle(q); 315 306 printPanel = [NSPrintPanel printPanel]; 316 Q CocoaPrintPanelDelegate *delegate = [[QCocoaPrintPanelDelegatealloc] init];307 QT_MANGLE_NAMESPACE(QCocoaPrintPanelDelegate) *delegate = [[QT_MANGLE_NAMESPACE(QCocoaPrintPanelDelegate) alloc] init]; 317 308 [printPanel setOptions:macOptions]; 318 309
Note:
See TracChangeset
for help on using the changeset viewer.