diff options
| author | Oliver Wolff <oliver.wolff@nokia.com> | 2011-10-24 09:25:32 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2011-10-25 15:55:10 +0200 |
| commit | 318a274381c441b13ce67517cad3fd74985c73a8 (patch) | |
| tree | 3b845a73ea431267f565a4d4a88b5aeb16ff9672 /src/printsupport/dialogs/qprintdialog_win.cpp | |
| parent | 54c132480b171518328f39bcf3f0faf0ea50ef0b (diff) | |
Readded PrintSupport for Windows
The prepared plugin architecture for
printing support was used as much as
possible but some functionality had to
be done in src/printsupport.
Change-Id: Ic8446cb8018a0970b4da97c1912ba6dc20d2a09f
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Diffstat (limited to 'src/printsupport/dialogs/qprintdialog_win.cpp')
| -rw-r--r-- | src/printsupport/dialogs/qprintdialog_win.cpp | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/src/printsupport/dialogs/qprintdialog_win.cpp b/src/printsupport/dialogs/qprintdialog_win.cpp index c8d92d45f2..d413faeb18 100644 --- a/src/printsupport/dialogs/qprintdialog_win.cpp +++ b/src/printsupport/dialogs/qprintdialog_win.cpp @@ -48,9 +48,9 @@ #include <qmessagebox.h> #include <private/qapplication_p.h> -#include <private/qabstractprintdialog_p.h> -#include <private/qprintengine_win_p.h> -#include <private/qprinter_p.h> +#include "qabstractprintdialog_p.h" +#include "../kernel/qprintengine_win_p.h" +#include "../kernel/qprinter_p.h" #if !defined(PD_NOCURRENTPAGE) #define PD_NOCURRENTPAGE 0x00800000 @@ -61,7 +61,7 @@ QT_BEGIN_NAMESPACE -extern void qt_win_eatMouseMove(); +//extern void qt_win_eatMouseMove(); class QPrintDialogPrivate : public QAbstractPrintDialogPrivate { @@ -142,7 +142,8 @@ static void qt_win_setup_PRINTDLGEX(PRINTDLGEX *pd, QWidget *parent, if (d->ep->printToFile) pd->Flags |= PD_PRINTTOFILE; Q_ASSERT(parent); - pd->hwndOwner = parent->window()->winId(); + QWindow *parentWindow = parent->windowHandle(); + pd->hwndOwner = parentWindow ? (HWND)QGuiApplication::platformNativeInterface()->nativeResourceForWindow("handle", parentWindow) : 0; pd->lpPageRanges[0].nFromPage = qMax(pdlg->fromPage(), pdlg->minPage()); pd->lpPageRanges[0].nToPage = (pdlg->toPage() > 0) ? qMin(pdlg->toPage(), pdlg->maxPage()) : 1; pd->nCopies = d->ep->num_copies; @@ -275,7 +276,7 @@ int QPrintDialogPrivate::openWindowsPrintDialogModally() QApplicationPrivate::leaveModal(&modal_widget); - qt_win_eatMouseMove(); +// qt_win_eatMouseMove(); // write values back... if (result && (pd.dwResultAction == PD_RESULT_PRINT |