diff options
| author | Friedemann Kleint <Friedemann.Kleint@nokia.com> | 2012-01-27 14:09:36 +0100 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-01-30 16:40:02 +0100 |
| commit | 870f19f44b1eb2b93c7151dd48b8d9cd471acae8 (patch) | |
| tree | 111a6ae7cf59b83ca6f872bd537b4c8a635d8800 /src/widgets/dialogs/qwizard.cpp | |
| parent | b3a978d661b7d85b637e8e8a134bd1df925947f8 (diff) | |
Add native event filters to Windows, forward to Widgets.
Use prototypically for qwizard_win.cpp.
Change-Id: I075e81ae1bc3d62d9f27e51c73c800ffd71cbcd6
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
Diffstat (limited to 'src/widgets/dialogs/qwizard.cpp')
| -rw-r--r-- | src/widgets/dialogs/qwizard.cpp | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/src/widgets/dialogs/qwizard.cpp b/src/widgets/dialogs/qwizard.cpp index 2c56ffc391..4e707ab7c1 100644 --- a/src/widgets/dialogs/qwizard.cpp +++ b/src/widgets/dialogs/qwizard.cpp @@ -3205,16 +3205,17 @@ void QWizard::paintEvent(QPaintEvent * event) #endif } -#if defined(Q_WS_WIN) +#if defined(Q_OS_WIN) /*! \reimp */ -bool QWizard::winEvent(MSG *message, long *result) +bool QWizard::nativeEvent(const QByteArray &eventType, void *message, long *result) { #if !defined(QT_NO_STYLE_WINDOWSVISTA) Q_D(QWizard); - if (d->isVistaThemeEnabled()) { - const bool winEventResult = d->vistaHelper->handleWinEvent(message, result); + if (d->isVistaThemeEnabled() && eventType == QByteArrayLiteral("windows_generic_MSG")) { + MSG *windowsMessage = static_cast<MSG *>(message); + const bool winEventResult = d->vistaHelper->handleWinEvent(windowsMessage, result); if (QVistaHelper::vistaState() != d->vistaState) { d->vistaState = QVistaHelper::vistaState(); d->vistaStateChanged = true; @@ -3222,10 +3223,10 @@ bool QWizard::winEvent(MSG *message, long *result) } return winEventResult; } else { - return QDialog::winEvent(message, result); + return QDialog::nativeEvent(eventType, message, result); } #else - return QDialog::winEvent(message, result); + return QDialog::nativeEvent(eventType, message, result); #endif } #endif |