From 73bb565476333d8446e556cc39fa22a778075585 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Thu, 28 Jul 2005 23:01:36 +0000 Subject: [PATCH] don't reserve space in the header for the column image if there is none (patch 1225522) git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34970 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- docs/changes.txt | 1 + src/msw/listctrl.cpp | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/docs/changes.txt b/docs/changes.txt index 1a9d7c4512..f69f4b42f3 100644 --- a/docs/changes.txt +++ b/docs/changes.txt @@ -27,6 +27,7 @@ wxMSW: - Fixed wxSlider::GetSelEnd() (Atilim Cetin). - Fixed accelerators of menu items added to already attached submenus. - Position of wxEVT_MOUSEWHEEL events is now in client, not screen, coordinates. +- Handle absence of wxListCtrl column image better (Zbigniew Zagórski) wxWinCE: diff --git a/src/msw/listctrl.cpp b/src/msw/listctrl.cpp index 578af99fef..c371406b3e 100644 --- a/src/msw/listctrl.cpp +++ b/src/msw/listctrl.cpp @@ -2828,7 +2828,8 @@ static void wxConvertToMSWListCol(int WXUNUSED(col), const wxListItem& item, // // we don't use LVCFMT_COL_HAS_IMAGES because it doesn't seem to // make any difference in my tests -- but maybe we should? - lvCol.fmt |= LVCFMT_BITMAP_ON_RIGHT | LVCFMT_IMAGE; + if ( item.m_image != -1 ) + lvCol.fmt |= LVCFMT_BITMAP_ON_RIGHT | LVCFMT_IMAGE; lvCol.iImage = item.m_image; } -- 2.50.0