Changeset 508 for trunk/src

Timestamp:

Feb 4, 2010, 2:24:14 AM (15 years ago)

Author:

Dmitry A. Kuminov

Message:

gui: Fixed: The default application icon embedded into the executable was not actually used as the default window icon for top-level widgets.

File:

• trunk/src/gui/kernel/qwidget_pm.cpp (modified) (1 diff)

trunk/src/gui/kernel/qwidget_pm.cpp

@@ -1157 +1157 @@
                          "failed with 0x%08lX", WinGetLastError(0));
 
+            if (fcData.flCreateFlags & FCF_ICON) {
+                // mark that we already have the window icon taken from .EXE to
+                // prevent setWindowIcon_sys() from resetting it to nothing
+                createTLExtra();
+                extra->topextra->iconPointer =
+                    (HPOINTER)WinSendMsg(fId, WM_QUERYICON, 0, 0);
+            }
+
             PFNWP oldProc = WinSubclassWindow(fId, QtFrameProc);
             // remember QtOldFrameProc only once: it's the same for