Changeset 309 for trunk/src/gui/kernel/qwidget_pm.cpp

Timestamp:

Nov 10, 2009, 3:22:35 PM (16 years ago)

Author:

Dmitry A. Kuminov

Message:

gui: Implemented setting window icons for top-level windows with QWidget::setWindowIcon() (closes #55).

File:

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

trunk/src/gui/kernel/qwidget_pm.cpp

@@ -1022 +1022 @@
     if (desktop && !q->testAttribute(Qt::WA_DontShowOnScreen)) { // desktop widget
         popup = false; // force this flags off
-        // @todo use WinGetMaxPositionto take into account such things as XCenter?
+        // @todo use WinGetMaxPosition?
         data.crect.setRect(0, 0, sw, sh);
     }
@@ -1571 +1571 @@
 void QWidgetPrivate::setWindowIcon_sys(bool forceReset)
 {
-    // @todo implement, depends on #38
+    Q_Q(QWidget);
+    if (!q->testAttribute(Qt::WA_WState_Created) || !q->isWindow())
+        return;
+    QTLWExtra *x = this->topData();
+    if (x->iconPointer != NULLHANDLE && !forceReset)
+        // already been set
+        return;
+
+    if (x->iconPointer != NULLHANDLE)
+        WinDestroyPointer(x->iconPointer);
+
+    x->iconPointer = QPixmap::toPmHPOINTER(q->windowIcon());
+    WinSendMsg(frameWinId(), WM_SETICON, (MPARAM)x->iconPointer, NULL);
 }
 
@@ -2314 +2326 @@
     extra->topextra->fId = NULLHANDLE;
     extra->topextra->swEntry = NULLHANDLE;
+
 }
 
 void QWidgetPrivate::deleteTLSysExtra()
 {
+
+
     if (extra->topextra->swEntry != NULLHANDLE)
         WinRemoveSwitchEntry(extra->topextra->swEntry);