Ensure there is valid context for DrawRectangle

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

diff --git a/src/xrc/xh_listc.cpp b/src/xrc/xh_listc.cpp
index d0a7e78b0404fd547be288fa995ef3fde8f80884..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")));
     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);
 }
 
     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")))
     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")))
     if (HasParam(wxT("state")))
         item.SetState(GetStyle(wxT("state")));
     if (HasParam(wxT("textcolour")))