From 023149a023772214caf16a6a0a2d0bccbbfcef99 Mon Sep 17 00:00:00 2001 From: zneix Date: Fri, 30 Jul 2021 17:40:25 +0200 Subject: [PATCH] Updated BaseWindow::nativeEvent References: - https://doc.qt.io/qt-5/qwidget.html#nativeEvent - https://doc.qt.io/qt-6/qwidget.html#nativeEvent --- src/widgets/BaseWindow.cpp | 6 +++--- src/widgets/BaseWindow.hpp | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/widgets/BaseWindow.cpp b/src/widgets/BaseWindow.cpp index 649f2f6da..032167c00 100644 --- a/src/widgets/BaseWindow.cpp +++ b/src/widgets/BaseWindow.cpp @@ -638,7 +638,7 @@ void BaseWindow::moveIntoDesktopRect(QWidget *parent, QPoint point) } bool BaseWindow::nativeEvent(const QByteArray &eventType, void *message, - long *result) + qintptr *result) { #ifdef USEWINSDK # if (QT_VERSION == QT_VERSION_CHECK(5, 11, 1)) @@ -823,7 +823,7 @@ bool BaseWindow::handleSHOWWINDOW(MSG *msg) #endif } -bool BaseWindow::handleNCCALCSIZE(MSG *msg, long *result) +bool BaseWindow::handleNCCALCSIZE(MSG *msg, qintptr *result) { #ifdef USEWINSDK if (this->hasCustomWindowFrame()) @@ -909,7 +909,7 @@ bool BaseWindow::handleMOVE(MSG *msg) return false; } -bool BaseWindow::handleNCHITTEST(MSG *msg, long *result) +bool BaseWindow::handleNCHITTEST(MSG *msg, qintptr *result) { #ifdef USEWINSDK const LONG border_width = 8; // in pixels diff --git a/src/widgets/BaseWindow.hpp b/src/widgets/BaseWindow.hpp index 913e66511..587dc4926 100644 --- a/src/widgets/BaseWindow.hpp +++ b/src/widgets/BaseWindow.hpp @@ -65,7 +65,7 @@ public: protected: virtual bool nativeEvent(const QByteArray &eventType, void *message, - long *result) override; + qintptr *result) override; virtual void scaleChangedEvent(float) override; virtual void paintEvent(QPaintEvent *) override; @@ -100,10 +100,10 @@ private: bool handleDPICHANGED(MSG *msg); bool handleSHOWWINDOW(MSG *msg); - bool handleNCCALCSIZE(MSG *msg, long *result); + bool handleNCCALCSIZE(MSG *msg, qintptr *result); bool handleSIZE(MSG *msg); bool handleMOVE(MSG *msg); - bool handleNCHITTEST(MSG *msg, long *result); + bool handleNCHITTEST(MSG *msg, qintptr *result); bool enableCustomFrame_; ActionOnFocusLoss actionOnFocusLoss_ = Nothing;