diff options
Diffstat (limited to 'src/winextras/qwinfunctions.cpp')
| -rw-r--r-- | src/winextras/qwinfunctions.cpp | 26 |
1 files changed, 15 insertions, 11 deletions
diff --git a/src/winextras/qwinfunctions.cpp b/src/winextras/qwinfunctions.cpp index 692bcb0..7b102a8 100644 --- a/src/winextras/qwinfunctions.cpp +++ b/src/winextras/qwinfunctions.cpp @@ -38,6 +38,13 @@ ** ****************************************************************************/ +#if defined(NTDDI_VERSION) && NTDDI_VERSION < 0x06010000 // NTDDI_WIN7 +# undef NTDDI_VERSION +#endif +#if !defined(NTDDI_VERSION) +# define NTDDI_VERSION 0x06010000 // Enable functions for MinGW +#endif + #include "qwinfunctions.h" #include "qwinfunctions_p.h" #include "qwineventfilter_p.h" @@ -169,15 +176,15 @@ HRGN qt_RectToHRGN(const QRect &rc) */ HRGN QtWin::toHRGN(const QRegion ®ion) { - if (region.isNull() || region.rectCount() == 0) { + const int size = region.rectCount(); + if (size == 0) return 0; - } + HRGN resultRgn = 0; - QVector<QRect> rects = region.rects(); - resultRgn = qt_RectToHRGN(rects.at(0)); - const int size = rects.size(); + const auto rects = region.begin(); + resultRgn = qt_RectToHRGN(rects[0]); for (int i = 1; i < size; i++) { - HRGN tmpRgn = qt_RectToHRGN(rects.at(i)); + HRGN tmpRgn = qt_RectToHRGN(rects[i]); int err = CombineRgn(resultRgn, resultRgn, tmpRgn, RGN_OR); if (err == ERROR) qWarning("Error combining HRGNs."); @@ -1812,11 +1819,8 @@ bool QtWin::isCompositionOpaque() */ void QtWin::setCurrentProcessExplicitAppUserModelID(const QString &id) { - qtShell32Dll.init(); - if (qtShell32Dll.setCurrentProcessExplicitAppUserModelID) { - QScopedArrayPointer<wchar_t> wid(qt_qstringToNullTerminated(id)); - qtShell32Dll.setCurrentProcessExplicitAppUserModelID(wid.data()); - } + QScopedArrayPointer<wchar_t> wid(qt_qstringToNullTerminated(id)); + SetCurrentProcessExplicitAppUserModelID(wid.data()); } /*! |