[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE/kdelibs/kdeui/windowmanagement
From:       Carlo Segato <brandon.ml () gmail ! com>
Date:       2010-04-22 13:26:44
Message-ID: 20100422132644.3AD7BAC8A1 () svn ! kde ! org
[Download RAW message or body]

SVN commit 1117555 by segato:

use QPixmap::fromWinHICON instead of our own implementation, it works better

 M  +1 -9      kwindowsystem_win.cpp  


--- trunk/KDE/kdelibs/kdeui/windowmanagement/kwindowsystem_win.cpp #1117554:1117555
@@ -134,16 +134,8 @@
 
 static QPixmap HIcon2QPixmap( HICON hIcon )
 {
-    ICONINFO ii;
-    if( GetIconInfo( hIcon, &ii ) == 0 )
-        return QPixmap();
+    QPixmap pix  = QPixmap::fromWinHICON( hIcon );
 
-    QPixmap pix  = QPixmap::fromWinHBITMAP( ii.hbmColor );
-    pix.setMask( QPixmap::fromWinHBITMAP( ii.hbmMask ) );
-
-    DeleteObject( ii.hbmMask );
-    DeleteObject( ii.hbmColor );
-
     return pix;
 }
 
[prev in list] [next in list] [prev in thread] [next in thread]