fix to last custom draw fix: only leave space for the image in the first column

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37817 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/msw/listctrl.cpp b/src/msw/listctrl.cpp
index 2406e000c19c882ecc77a9627c8b068843a6002c..9ad44f0969236b29c1a548bf608c9de4a6353b67 100644 (file)
--- a/src/msw/listctrl.cpp
+++ b/src/msw/listctrl.cpp
@@ -2420,12 +2420,16 @@ static void HandleSubItemPrepaint(LPNMLVCUSTOMDRAW pLVCD, HFONT hfont)
         }
 
         // notice that even if this item doesn't have any image, the list
         }
 
         // notice that even if this item doesn't have any image, the list

-        // control still leaves space for the image if the image list is not
-        // empty (presumably so that items with and without images align?)
-        int wImage, hImage;
-        ImageList_GetIconSize(himl, &wImage, &hImage);
+        // control still leaves space for the image in the first column if the
+        // image list is not empty (presumably so that items with and without
+        // images align?)
+        if ( it.iImage != -1 || it.iSubItem == 0 )
+        {
+            int wImage, hImage;
+            ImageList_GetIconSize(himl, &wImage, &hImage);

 
 

-        rc.left += wImage + 2;
+            rc.left += wImage + 2;
+        }

     }
 
     ::SetBkMode(hdc, TRANSPARENT);
     }
 
     ::SetBkMode(hdc, TRANSPARENT);