[ros-diffs] [cwittich] 30901: remove ros specific hack

Author: cwittich
Date: Thu Nov 29 23:50:06 2007
New Revision: 30901

URL: http://svn.reactos.org/svn/reactos?rev=30901&view=rev
Log:
remove ros specific hack

Modified:
    trunk/reactos/dll/win32/comctl32/comctl32_ros.diff
    trunk/reactos/dll/win32/comctl32/listview.c

Modified: trunk/reactos/dll/win32/comctl32/comctl32_ros.diff
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/comctl3…
==============================================================================
--- trunk/reactos/dll/win32/comctl32/comctl32_ros.diff (original)
+++ trunk/reactos/dll/win32/comctl32/comctl32_ros.diff Thu Nov 29 23:50:06 2007
@@ -1,19 +1,3 @@
-Index: listview.c
-===================================================================
---- listview.c	(revision 23123)
-+++ listview.c	(working copy)
-@@ -3810,9 +3810,8 @@
-     if (himl && lvItem.iImage >= 0 && !IsRectEmpty(&rcIcon))
-     {
-         TRACE("iImage=%d\n", lvItem.iImage);
-+        ImageList_Draw(himl, lvItem.iImage, hdc, rcIcon.left, rcIcon.top,
-+                       (lvItem.state & LVIS_SELECTED) &&
(infoPtr->bFocus) ? ILD_SELECTED : ILD_NORMAL);
--        ImageList_DrawEx(himl, lvItem.iImage, hdc, rcIcon.left, rcIcon.top,
--                         rcIcon.right - rcIcon.left, rcIcon.bottom - rcIcon.top,
infoPtr->clrBk, CLR_DEFAULT,
--                         (lvItem.state & LVIS_SELECTED) &&
(infoPtr->bFocus) ? ILD_SELECTED : ILD_NORMAL);
-     }
- 
-     /* Don't bother painting item being edited */
 Index: propsheet.c
 ===================================================================
 --- propsheet.c	(revision 25766)

Modified: trunk/reactos/dll/win32/comctl32/listview.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/listvie…
==============================================================================
--- trunk/reactos/dll/win32/comctl32/listview.c (original)
+++ trunk/reactos/dll/win32/comctl32/listview.c Thu Nov 29 23:50:06 2007
@@ -3810,8 +3810,9 @@
     if (himl && lvItem.iImage >= 0 && !IsRectEmpty(&rcIcon))
     {
         TRACE("iImage=%d\n", lvItem.iImage);
-        ImageList_Draw(himl, lvItem.iImage, hdc, rcIcon.left, rcIcon.top,
-                       (lvItem.state & LVIS_SELECTED) && (infoPtr->bFocus)
? ILD_SELECTED : ILD_NORMAL);
+        ImageList_DrawEx(himl, lvItem.iImage, hdc, rcIcon.left, rcIcon.top,
+                         rcIcon.right - rcIcon.left, rcIcon.bottom - rcIcon.top,
infoPtr->clrBk, CLR_DEFAULT,
+                         (lvItem.state & LVIS_SELECTED) &&
(infoPtr->bFocus) ? ILD_SELECTED : ILD_NORMAL);
     }
 
     /* Don't bother painting item being edited */