]> git.saurik.com Git - wxWidgets.git/commitdiff
correct the assert added by r60056 to not trigger in non-report modes (see #10687)
authorVadim Zeitlin <vadim@wxwidgets.org>
Tue, 21 Apr 2009 17:58:35 +0000 (17:58 +0000)
committerVadim Zeitlin <vadim@wxwidgets.org>
Tue, 21 Apr 2009 17:58:35 +0000 (17:58 +0000)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@60277 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

src/msw/listctrl.cpp

index baf52465add37cf90e254a1c0b16d13a1e3f4535..9c925a1bbbc30c61cfc85f9761b09e7aef43016b 100644 (file)
@@ -3200,8 +3200,15 @@ static void wxConvertToMSWListItem(const wxListCtrl *ctrl,
                                    const wxListItem& info,
                                    LV_ITEM& lvItem)
 {
-    wxASSERT_MSG( 0 <= info.m_col && info.m_col < ctrl->GetColumnCount(),
-                  "wxListCtrl column index out of bounds" );
+    if ( ctrl->InReportView() )
+    {
+        wxASSERT_MSG( 0 <= info.m_col && info.m_col < ctrl->GetColumnCount(),
+                      "wxListCtrl column index out of bounds" );
+    }
+    else // not in report view
+    {
+        wxASSERT_MSG( info.m_col == 0, "columns only exist in report view" );
+    }
 
     lvItem.iItem = (int) info.m_itemId;