Applied colspan corrections, #15274 and #15275 (dghart)

[wxWidgets.git] / src / xrc / xh_listc.cpp

diff --git a/src/xrc/xh_listc.cpp b/src/xrc/xh_listc.cpp
index a6499e422aa3c91e967892019fc809235fd56d55..b9a9c2d059770f14566770cf307fab173ba12cb9 100644 (file)
--- a/src/xrc/xh_listc.cpp
+++ b/src/xrc/xh_listc.cpp
@@ -128,6 +128,8 @@ void wxListCtrlXmlHandler::HandleListCol()
     HandleCommonItemAttrs(item);
     if (HasParam(wxT("width")))
         item.SetWidth((int)GetLong(wxT("width")));
+    if (HasParam(wxT("image")))
+        item.SetImage((int)GetLong(wxT("image")));
 
     list->InsertColumn(list->GetColumnCount(), item);
 }
@@ -148,7 +150,7 @@ void wxListCtrlXmlHandler::HandleListItem()
     if (HasParam(wxT("data")))
         item.SetData(GetLong(wxT("data")));
     if (HasParam(wxT("font")))
-        item.SetFont(GetFont());
+        item.SetFont(GetFont(wxT("font"), list));
     if (HasParam(wxT("state")))
         item.SetState(GetStyle(wxT("state")));
     if (HasParam(wxT("textcolour")))
@@ -160,7 +162,7 @@ void wxListCtrlXmlHandler::HandleListItem()
     int image;
     if ( list->HasFlag(wxLC_ICON) )
         image = GetImageIndex(list, wxIMAGE_LIST_NORMAL);
-    else if ( list->HasFlag(wxLC_SMALL_ICON) )
+    else if ( list->HasFlag(wxLC_SMALL_ICON) || list->HasFlag(wxLC_REPORT) || list->HasFlag(wxLC_LIST) )
         image = GetImageIndex(list, wxIMAGE_LIST_SMALL);
     else
         image = wxNOT_FOUND;