Changeset 1016 for trunk/src

Timestamp:

Aug 20, 2011, 10:07:07 PM (14 years ago)

Author:

Dmitry A. Kuminov

Message:

OS/2: Don't destroy widget's HWND on reparent until children are reparented.

Destroying the window handle destroys all child windows so it is necessary to
associate them with a new parent handle before the old one is destroyed.

This fixes a problem of disappeared child widgets which had native IDs after
reparenting in e.g. QT_USE_NATIVE_WINDOWS=1 mode (when all widgets
have native IDs).
native IDs also in normwhen groups of windows
with native

File:

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

trunk/src/gui/kernel/qwidget_pm.cpp

@@ -1512 +1512 @@
     }
 
-    if (old_fid != NULLHANDLE && q->windowType() != Qt::Desktop) {
-        // destroy HWND
-#if defined(QT_DEBUGWINCREATEDESTROY)
-            qDebug() << "|Destroying window" << q
-                     << "\n|  hwnd"  << qDebugFmtHex(old_fid);
-            if (old_fid != data.winid)
-                qDebug() << "|  hwnd" << qDebugFmtHex(data.winid) << "(client)";
-#endif
-        qt_WinDestroyWindow(old_fid);
-    }
-
-    QTLWExtra *top = maybeTopData();
-    if (top)
-        top->fId = 0;
+    if ((q->windowType() == Qt::Desktop))
+        old_fid = 0;
+
+    if (extra && extra->topextra)
+        extra->topextra->fId = 0;
     setWinId(0);
 
@@ -1557 +1548 @@
         setWindowIcon_sys(true);
         setWindowTitle_helper(extra->topextra->caption);
+
+
+
+
+
+
+
+
+
+
     }