1 files changed, 14 insertions, 8 deletions
diff --git a/src/widgets/dialogs/qwizard.cpp b/src/widgets/dialogs/qwizard.cpp
index 5ba48aeff3..0295241a74 100644
--- a/src/widgets/dialogs/qwizard.cpp
+++ b/src/widgets/dialogs/qwizard.cpp
@@ -1299,7 +1299,7 @@ void QWizardPrivate::updateMinMaxSizes(const QWizardLayoutInfo &info)
     int extraHeight = 0;
 #if QT_CONFIG(style_windowsvista)
     if (isVistaThemeEnabled())
-        extraHeight = vistaHelper->titleBarSize() + vistaHelper->topOffset();
+        extraHeight = vistaHelper->titleBarSize() + vistaHelper->topOffset(q);
 #endif
     QSize minimumSize = mainLayout->totalMinimumSize() + QSize(0, extraHeight);
     QSize maximumSize = mainLayout->totalMaximumSize();
@@ -1565,23 +1565,25 @@ bool QWizardPrivate::handleAeroStyleChange()
     bool vistaMargins = false;
 
     if (isVistaThemeEnabled()) {
+        const int topOffset = vistaHelper->topOffset(q);
+        const int topPadding = vistaHelper->topPadding(q);
         if (isVistaThemeEnabled(QVistaHelper::VistaAero)) {
             if (isWindow) {
                 vistaHelper->setDWMTitleBar(QVistaHelper::ExtendedTitleBar);
                 q->installEventFilter(vistaHelper);
             }
             q->setMouseTracking(true);
-            antiFlickerWidget->move(0, vistaHelper->titleBarSize() + vistaHelper->topOffset());
+            antiFlickerWidget->move(0, vistaHelper->titleBarSize() + topOffset);
             vistaHelper->backButton()->move(
-                0, vistaHelper->topOffset() // ### should ideally work without the '+ 1'
-                - qMin(vistaHelper->topOffset(), vistaHelper->topPadding() + 1));
+                0, topOffset // ### should ideally work without the '+ 1'
+                - qMin(topOffset, topPadding + 1));
             vistaMargins = true;
             vistaHelper->backButton()->show();
         } else {
             if (isWindow)
                 vistaHelper->setDWMTitleBar(QVistaHelper::NormalTitleBar);
             q->setMouseTracking(true);
-            antiFlickerWidget->move(0, vistaHelper->topOffset());
+            antiFlickerWidget->move(0, topOffset);
             vistaHelper->backButton()->move(0, -1); // ### should ideally work with (0, 0)
         }
         if (isWindow)
@@ -2545,7 +2547,7 @@ void QWizard::setWizardStyle(WizardStyle style)
             //Send a resizeevent since the antiflicker widget probably needs a new size
             //because of the backbutton in the window title
             QResizeEvent ev(geometry().size(), geometry().size());
-            QApplication::sendEvent(this, &ev);
+            QCoreApplication::sendEvent(this, &ev);
         }
 #endif
         d->updateLayout();
@@ -3182,7 +3184,7 @@ void QWizard::resizeEvent(QResizeEvent *event)
     int heightOffset = 0;
 #if QT_CONFIG(style_windowsvista)
     if (d->isVistaThemeEnabled()) {
-        heightOffset = d->vistaHelper->topOffset();
+        heightOffset = d->vistaHelper->topOffset(this);
         if (d->isVistaThemeEnabled(QVistaHelper::VistaAero))
             heightOffset += d->vistaHelper->titleBarSize();
     }
@@ -3214,7 +3216,7 @@ void QWizard::paintEvent(QPaintEvent * event)
         if (d->isVistaThemeEnabled(QVistaHelper::VistaBasic)) {
             QPainter painter(this);
             QColor color = d->vistaHelper->basicWindowFrameColor();
-            painter.fillRect(0, 0, width(), QVistaHelper::topOffset(), color);
+            painter.fillRect(0, 0, width(), QVistaHelper::topOffset(this), color);
         }
         d->vistaHelper->paintEvent(event);
     }
@@ -3227,7 +3229,11 @@ void QWizard::paintEvent(QPaintEvent * event)
 /*!
     \reimp
 */
+#  if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
+bool QWizard::nativeEvent(const QByteArray &eventType, void *message, qintptr *result)
+#  else
 bool QWizard::nativeEvent(const QByteArray &eventType, void *message, long *result)
+#  endif
 {
 #if QT_CONFIG(style_windowsvista)
     Q_D(QWizard);