Don't take hidden wxGrid row/columns into account when auto-sizing.

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

diff --git a/src/xrc/xh_listc.cpp b/src/xrc/xh_listc.cpp
index a6499e422aa3c91e967892019fc809235fd56d55..c4fb4e4468a9695d4ab974d1ef814f6455973978 100644 (file)
--- a/src/xrc/xh_listc.cpp
+++ b/src/xrc/xh_listc.cpp
@@ -3,7 +3,6 @@
 // Purpose:     XRC resource for wxListCtrl
 // Author:      Brian Gavin, Kinaou Hervé, Vadim Zeitlin
 // Created:     2000/09/09
-// RCS-ID:      $Id$
 // Copyright:   (c) 2000 Brian Gavin
 //              (c) 2009 Vadim Zeitlin
 // Licence:     wxWindows licence
@@ -128,6 +127,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 +149,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 +161,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;