diff options
author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2017-09-28 14:31:53 +0200 |
---|---|---|
committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2017-09-28 19:30:18 +0000 |
commit | 07f6d25a00af112d46e939992fb9cf42879fc7c1 (patch) | |
tree | d2f426385c637b918f569877ea6d3e1b9b20c042 /src/winextras/qwinthumbnailtoolbar.cpp | |
parent | 98d263a673921b70d13f5aec336b371a0eec574e (diff) |
Directly link to functions available from Windows 7 onwards
Change-Id: I8033100c34c703e6119e4b1f322b795b0cc1ff4a
Reviewed-by: Andre de la Rocha <andre.rocha@qt.io>
Reviewed-by: Jake Petroules <jake.petroules@qt.io>
Diffstat (limited to 'src/winextras/qwinthumbnailtoolbar.cpp')
-rw-r--r-- | src/winextras/qwinthumbnailtoolbar.cpp | 22 |
1 files changed, 12 insertions, 10 deletions
diff --git a/src/winextras/qwinthumbnailtoolbar.cpp b/src/winextras/qwinthumbnailtoolbar.cpp index d7e4ced..f09eb15 100644 --- a/src/winextras/qwinthumbnailtoolbar.cpp +++ b/src/winextras/qwinthumbnailtoolbar.cpp @@ -38,6 +38,13 @@ ** ****************************************************************************/ +#if defined(_WIN32_WINNT) && _WIN32_WINNT < 0x0601 +# undef _WIN32_WINNT +#endif +#if !defined(_WIN32_WINNT) +# define _WIN32_WINNT 0x0601 // Enable functions for MinGW +#endif + #include "qwinthumbnailtoolbar.h" #include "qwinthumbnailtoolbar_p.h" #include "qwinthumbnailtoolbutton.h" @@ -228,18 +235,15 @@ int QWinThumbnailToolBar::count() const void QWinThumbnailToolBarPrivate::updateIconicPixmapsEnabled(bool invalidate) { Q_Q(QWinThumbnailToolBar); - qtDwmApiDll.init(); const HWND hwnd = handle(); if (!hwnd) { qWarning() << Q_FUNC_INFO << "invoked with hwnd=0"; return; } - if (!qtDwmApiDll.dwmInvalidateIconicBitmaps) - return; const bool enabled = iconicThumbnail || iconicLivePreview; q->setIconicPixmapNotificationsEnabled(enabled); if (enabled && invalidate) { - const HRESULT hr = qtDwmApiDll.dwmInvalidateIconicBitmaps(hwnd); + const HRESULT hr = DwmInvalidateIconicBitmaps(hwnd); if (FAILED(hr)) qWarning() << QWinThumbnailToolBarPrivate::msgComFailed("DwmInvalidateIconicBitmaps", hr); } @@ -385,12 +389,11 @@ QPixmap QWinThumbnailToolBar::iconicLivePreviewPixmap() const inline void QWinThumbnailToolBarPrivate::updateIconicThumbnail(const MSG *message) { - qtDwmApiDll.init(); - if (!qtDwmApiDll.dwmSetIconicThumbnail || !iconicThumbnail) + if (!iconicThumbnail) return; const QSize maxSize(HIWORD(message->lParam), LOWORD(message->lParam)); if (const HBITMAP bitmap = iconicThumbnail.bitmap(maxSize)) { - const HRESULT hr = qtDwmApiDll.dwmSetIconicThumbnail(message->hwnd, bitmap, dWM_SIT_DISPLAYFRAME); + const HRESULT hr = DwmSetIconicThumbnail(message->hwnd, bitmap, dWM_SIT_DISPLAYFRAME); if (FAILED(hr)) qWarning() << QWinThumbnailToolBarPrivate::msgComFailed("DwmSetIconicThumbnail", hr); } @@ -398,15 +401,14 @@ inline void QWinThumbnailToolBarPrivate::updateIconicThumbnail(const MSG *messag inline void QWinThumbnailToolBarPrivate::updateIconicLivePreview(const MSG *message) { - qtDwmApiDll.init(); - if (!qtDwmApiDll.dwmSetIconicLivePreviewBitmap || !iconicLivePreview) + if (!iconicLivePreview) return; RECT rect; GetClientRect(message->hwnd, &rect); const QSize maxSize(rect.right, rect.bottom); POINT offset = {0, 0}; if (const HBITMAP bitmap = iconicLivePreview.bitmap(maxSize)) { - const HRESULT hr = qtDwmApiDll.dwmSetIconicLivePreviewBitmap(message->hwnd, bitmap, &offset, dWM_SIT_DISPLAYFRAME); + const HRESULT hr = DwmSetIconicLivePreviewBitmap(message->hwnd, bitmap, &offset, dWM_SIT_DISPLAYFRAME); if (FAILED(hr)) qWarning() << QWinThumbnailToolBarPrivate::msgComFailed("DwmSetIconicLivePreviewBitmap", hr); } |