Ignore:
Timestamp:
May 5, 2011, 5:36:53 AM (14 years ago)
Author:
Dmitry A. Kuminov
Message:

trunk: Merged in qt 4.7.2 sources from branches/vendor/nokia/qt.

Location:
trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk

  • trunk/src/gui/dialogs/qprintdialog_mac.mm

    r651 r846  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation (qt-info@nokia.com)
     
    125125#ifdef QT_MAC_USE_COCOA
    126126
    127 @class QCocoaPrintPanelDelegate;
    128 
    129 @interface QCocoaPrintPanelDelegate : NSObject {
     127@class QT_MANGLE_NAMESPACE(QCocoaPrintPanelDelegate);
     128
     129@interface QT_MANGLE_NAMESPACE(QCocoaPrintPanelDelegate) : NSObject {
    130130}
    131131- (void)printPanelDidEnd:(NSPrintPanel *)printPanel
     
    133133@end
    134134
    135 @implementation QCocoaPrintPanelDelegate
     135@implementation QT_MANGLE_NAMESPACE(QCocoaPrintPanelDelegate)
    136136- (void)printPanelDidEnd:(NSPrintPanel *)printPanel
    137137        returnCode:(int)returnCode contextInfo:(void *)contextInfo
     
    141141    QPrintDialogPrivate *d = static_cast<QPrintDialogPrivate *>(contextInfo);
    142142    QPrintDialog *dialog = d->printDialog();
    143     // temporary hack to work around bug in deleteLater() in Qt/Mac Cocoa
    144 #if 1
    145     bool deleteDialog = dialog->testAttribute(Qt::WA_DeleteOnClose);
    146     dialog->setAttribute(Qt::WA_DeleteOnClose, false);
    147 #endif
    148143
    149144    if (returnCode == NSOKButton) {
     
    193188
    194189    dialog->done((returnCode == NSOKButton) ? QDialog::Accepted : QDialog::Rejected);
    195 #if 1
    196     if (deleteDialog)
    197         delete dialog;
    198 #endif
    199190}
    200191@end
     
    314305    macStartInterceptWindowTitle(q);
    315306    printPanel = [NSPrintPanel printPanel];
    316     QCocoaPrintPanelDelegate *delegate = [[QCocoaPrintPanelDelegate alloc] init];
     307    QT_MANGLE_NAMESPACE(QCocoaPrintPanelDelegate) *delegate = [[QT_MANGLE_NAMESPACE(QCocoaPrintPanelDelegate) alloc] init];
    317308    [printPanel setOptions:macOptions];
    318309
Note: See TracChangeset for help on using the changeset viewer.