Enable wxListCtrl in report mode to be able to use images in other

columns, if ComCtl32 >= 470.  All it needed was to add the
LVS_EX_SUBITEMIMAGES style, everything else was already in place, and
the generic control already supports it too.

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

diff --git a/docs/changes.txt b/docs/changes.txt
index 24db2be8000a7920ebef9214986cbc0e94b5e523..8617a58f4d3ec3b00fa027b7ea22eddf970baed6 100644 (file)
--- a/docs/changes.txt
+++ b/docs/changes.txt
@@ -73,6 +73,8 @@ wxMSW:
   to the link command.
 - wxStatusBar::GetFieldRect now returns correct values under XP.
 - wxStatusBar no longer corrupts surrounding windows on resize.
+- Enable wxListCtrl in report mode to be able to use images in other
+  columns, if ComCtl32 >= 470.
 
 wxGTK:
 

diff --git a/include/wx/msw/missing.h b/include/wx/msw/missing.h
index fda8af03a7fc21117db0840c86243fb8c9097ed6..1702717ce4fb660122793c82b059d347ebcd90ee 100644 (file)
--- a/include/wx/msw/missing.h
+++ b/include/wx/msw/missing.h
@@ -109,6 +109,10 @@
     #define LVS_EX_LABELTIP 0x00004000
 #endif
 
+#ifndef LVS_EX_SUBITEMIMAGES
+    #define LVS_EX_SUBITEMIMAGES 0x00000002
+#endif
+
  /*
   * In addition to the above, the following are required for several compilers.
   */

diff --git a/src/msw/listctrl.cpp b/src/msw/listctrl.cpp
index ae0826d047045538a753b250063fc06834bf7bea..cbedea6f7388219fadaaa102bb6d9e42da8945df 100644 (file)
--- a/src/msw/listctrl.cpp
+++ b/src/msw/listctrl.cpp
@@ -371,7 +371,7 @@ bool wxListCtrl::Create(wxWindow *parent,
     if ( InReportView() && wxApp::GetComCtl32Version() >= 470 )
     {
         ::SendMessage(GetHwnd(), LVM_SETEXTENDEDLISTVIEWSTYLE,
-                      0, LVS_EX_LABELTIP | LVS_EX_FULLROWSELECT);
+                      0, LVS_EX_LABELTIP | LVS_EX_FULLROWSELECT | LVS_EX_SUBITEMIMAGES);
     }
 
     return true;