Changeset 1007

Timestamp:

Aug 19, 2011, 12:33:16 AM (14 years ago)

Author:

Dmitry A. Kuminov

Message:

OS/2: Do not attempt to natively hide widgets with no handle.

This would just always fail due to an invalid window handle being
passed to the PM APIs.

File:

• trunk/src/gui/kernel/qwidget_pm.cpp (modified) (7 diffs)

trunk/src/gui/kernel/qwidget_pm.cpp

@@ -1804 +1804 @@
 }
 
+/*
+    \internal
+    Platform-specific part of QWidget::hide().
+*/
 void QWidgetPrivate::hide_sys()
 {
@@ -1810 +1814 @@
     Q_ASSERT(q->testAttribute(Qt::WA_WState_Created));
     if (q->windowFlags() != Qt::Desktop) {
-        ULONG fl = SWP_HIDE;
-        if (q->isWindow() && frameWinId() != NULLHANDLE) {
-            if ((q->windowFlags() & Qt::Popup) != Qt::Popup)
-                fl |= SWP_DEACTIVATE;
-        }
-        qt_WinSetWindowPos(frameWinId(), 0, 0, 0, 0, 0, fl);
-        HSWITCH swEntry = maybeTopData() ? maybeTopData()->swEntry : NULLHANDLE;
-        if (swEntry != NULLHANDLE) {
-            SWCNTRL swc;
-            WinQuerySwitchEntry(swEntry, &swc);
-            swc.uchVisibility = SWL_INVISIBLE;
-            WinChangeSwitchEntry(swEntry, &swc);
+        HWND wid = frameWinId();
+        if (wid != NULLHANDLE) {
+            ULONG fl = SWP_HIDE;
+            if (q->isWindow()) {
+                if ((q->windowFlags() & Qt::Popup) != Qt::Popup)
+                    fl |= SWP_DEACTIVATE;
+            }
+            qt_WinSetWindowPos(wid, 0, 0, 0, 0, 0, fl);
+            HSWITCH swEntry = maybeTopData() ? maybeTopData()->swEntry : NULLHANDLE;
+            if (swEntry != NULLHANDLE) {
+                SWCNTRL swc;
+                WinQuerySwitchEntry(swEntry, &swc);
+                swc.uchVisibility = SWL_INVISIBLE;
+                WinChangeSwitchEntry(swEntry, &swc);
+            }
         }
     }
@@ -1833 +1840 @@
 }
 
+/*
+    \internal
+    Platform-specific part of QWidget::show().
+*/
 void QWidgetPrivate::show_sys()
 {
@@ -1846 +1857 @@
     }
 
-    if (frameWinId() != NULLHANDLE) {
+    HWND wid = frameWinId();
+    if (wid != NULLHANDLE) {
         ULONG fl = SWP_SHOW;
         if (q->isWindow()) {
@@ -1865 +1877 @@
         }
 
-        qt_WinSetWindowPos(frameWinId(), 0, 0, 0, 0, 0, fl);
+        qt_WinSetWindowPos(wid, 0, 0, 0, 0, 0, fl);
 
         if (q->isWindow()) {
@@ -1878 +1890 @@
                 if (!swEntry) {
                     // lazily create a new window list entry
-                    HWND id = frameWinId();
                     PID pid;
-                    WinQueryWindowProcess(id, &pid, NULL);
+                    WinQueryWindowProcess(wid, &pid, NULL);
                     SWCNTRL swc;
                     memset(&swc, 0, sizeof(SWCNTRL));
-                    swc.hwnd = id;
+                    swc.hwnd = wid;
                     swc.idProcess = pid;
                     swc.uchVisibility = SWL_VISIBLE;
                     swc.fbJump = SWL_JUMPABLE;
-                    WinQueryWindowText(id, sizeof(swc.szSwtitle), swc.szSwtitle);
+                    WinQueryWindowText(wid, sizeof(swc.szSwtitle), swc.szSwtitle);
                     swEntry = WinAddSwitchEntry(&swc);
                 } else {
@@ -1897 +1908 @@
             }
 
-            ULONG wstyle = WinQueryWindowULong(frameWinId(), QWL_STYLE);
+            ULONG wstyle = WinQueryWindowULong(wid, QWL_STYLE);
             if (wstyle & WS_MINIMIZED)
                 data.window_state |= Qt::WindowMinimized;