diff options
author | Friedemann Kleint <Friedemann.Kleint@nokia.com> | 2012-03-08 16:13:28 +0100 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2012-03-08 21:45:34 +0100 |
commit | c35d65e27d9232452d2e57973cdb132181440bbf (patch) | |
tree | aa1249f940e36e1c83cafef5f897a907efd170c0 /src/plugins/platforms/windows | |
parent | 4c0df9feb2b44d0c4fcaa5076f00aa08fbc1dda5 (diff) |
Windows: Fix flag handling.
Fix a typo that caused a variable to be hidden such that
the Qt::WindowFlags were not used.
Change-Id: Iea4456b0cd4c968e0fbfdd53e5006ffee0298b24
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Diffstat (limited to 'src/plugins/platforms/windows')
-rw-r--r-- | src/plugins/platforms/windows/qwindowswindow.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/plugins/platforms/windows/qwindowswindow.cpp b/src/plugins/platforms/windows/qwindowswindow.cpp index 1edb243f4e..fa3661db22 100644 --- a/src/plugins/platforms/windows/qwindowswindow.cpp +++ b/src/plugins/platforms/windows/qwindowswindow.cpp @@ -441,17 +441,17 @@ void WindowCreationData::initialize(HWND hwnd, bool frameChange) const { if (desktop || !hwnd) return; - UINT flags = SWP_NOMOVE | SWP_NOSIZE; + UINT swpFlags = SWP_NOMOVE | SWP_NOSIZE; if (frameChange) - flags |= SWP_FRAMECHANGED; + swpFlags |= SWP_FRAMECHANGED; if (topLevel) { - flags |= SWP_NOACTIVATE; + swpFlags |= SWP_NOACTIVATE; if ((flags & Qt::WindowStaysOnTopHint) || (type == Qt::ToolTip)) { - SetWindowPos(hwnd, HWND_TOPMOST, 0, 0, 0, 0, flags); + SetWindowPos(hwnd, HWND_TOPMOST, 0, 0, 0, 0, swpFlags); if (flags & Qt::WindowStaysOnBottomHint) qWarning() << "QWidget: Incompatible window flags: the window can't be on top and on bottom at the same time"; } else if (flags & Qt::WindowStaysOnBottomHint) { - SetWindowPos(hwnd, HWND_BOTTOM, 0, 0, 0, 0, flags); + SetWindowPos(hwnd, HWND_BOTTOM, 0, 0, 0, 0, swpFlags); } if (flags & (Qt::CustomizeWindowHint|Qt::WindowTitleHint)) { HMENU systemMenu = GetSystemMenu(hwnd, FALSE); @@ -461,7 +461,7 @@ void WindowCreationData::initialize(HWND hwnd, bool frameChange) const EnableMenuItem(systemMenu, SC_CLOSE, MF_BYCOMMAND|MF_GRAYED); } } else { // child. - SetWindowPos(hwnd, HWND_TOP, 0, 0, 0, 0, flags); + SetWindowPos(hwnd, HWND_TOP, 0, 0, 0, 0, swpFlags); } } |