Mikołaj Zalewski : comctl32: header: Don' t send HDN_GETDISPINFO during HDM_SET/INSERTITEM.

[Alexandre Julliard]

Module: wine
Branch: refs/heads/master
Commit: 15e71a0a86745282be91d1b80a12b64b7b0866e1
URL:    http://source.winehq.org/git/?p=wine.git;a=commit;h=15e71a0a86745282be91d1b8...

Author: Mikołaj Zalewski <mikolaj(a)zalewski.pl>
Date:   Sat May 13 21:09:53 2006 +0200

comctl32: header: Don't send HDN_GETDISPINFO during HDM_SET/INSERTITEM.

---

 dlls/comctl32/header.c |   22 ++--------------------
 1 files changed, 2 insertions(+), 20 deletions(-)

diff --git a/dlls/comctl32/header.c b/dlls/comctl32/header.c
index cab8cc7..bf8581d 100644
--- a/dlls/comctl32/header.c
+++ b/dlls/comctl32/header.c
@@ -1104,15 +1104,7 @@ HEADER_InsertItemT (HWND hwnd, INT nItem
 
     if (phdi->mask & HDI_IMAGE) 
     {
-        if (phdi->iImage != I_IMAGECALLBACK) 
-        {
-            lpItem->iImage = phdi->iImage;
-        } 
-        else 
-        {
-            lpItem->iImage = phdi->iImage;
-            HEADER_SendHeaderDispInfoNotify(hwnd, nItem, HDI_IMAGE, NULL, lpItem, bUnicode);
-        }
+        lpItem->iImage = phdi->iImage;
     }
 
     if (phdi->mask & HDI_TEXT)
@@ -1128,7 +1120,6 @@ HEADER_InsertItemT (HWND hwnd, INT nItem
         else 
         {
             lpItem->pszText = phdi->pszText;
-            HEADER_SendHeaderDispInfoNotify(hwnd, nItem, HDI_TEXT, NULL, lpItem, bUnicode);
         }
         lpItem->fmt |= HDF_STRING;
     }
@@ -1244,15 +1235,7 @@ HEADER_SetItemT (HWND hwnd, INT nItem, L
 
     if (phdi->mask & HDI_IMAGE) 
     {
-        if (phdi->iImage != I_IMAGECALLBACK) 
-        {
-            lpItem->iImage = phdi->iImage;
-        } 
-        else 
-        {
-            lpItem->iImage = phdi->iImage;
-            HEADER_SendHeaderDispInfoNotify(hwnd, nItem, HDI_IMAGE, NULL, lpItem, bUnicode);
-        }
+        lpItem->iImage = phdi->iImage;
     }
 
     if (phdi->mask & HDI_TEXT)
@@ -1276,7 +1259,6 @@ HEADER_SetItemT (HWND hwnd, INT nItem, L
 	else 
 	{
             lpItem->pszText = phdi->pszText;
-            HEADER_SendHeaderDispInfoNotify(hwnd, nItem, HDI_TEXT, NULL, lpItem, bUnicode);
         }  
     }