Changeset 1108 for trunk/src

Timestamp:

Oct 23, 2012, 8:26:42 PM (13 years ago)

Author:

Silvan Scherrer

Message:

fix seWindowsIcon problem, reverted 1107 and did different

Location:

trunk/src/gui/kernel

Files:

• qwidget.cpp (modified) (1 diff)
• qwidget_pm.cpp (modified) (1 diff)

trunk/src/gui/kernel/qwidget.cpp

@@ -6060 +6060 @@
     d->extra->topextra->iconPixmap = 0;
 
-    d->setWindowIcon_sys();
+    d->setWindowIcon_sys(true);
     d->setWindowIcon_helper();
 }

trunk/src/gui/kernel/qwidget_pm.cpp

@@ -1697 +1697 @@
         return;
     QTLWExtra *x = this->topData();
-    if (x->iconPixmap && !forceReset)
+    if (x->iconPointer != NULLHANDLE && !forceReset)
         // already been set
         return;
-    x->iconPixmap = new QPixmap;
+
     if (x->iconPointer != NULLHANDLE)
         WinDestroyPointer(x->iconPointer);