Applied rowspan patch #15276 (dghart)

[wxWidgets.git] / include / wx / xrc / xh_listc.h

diff --git a/include/wx/xrc/xh_listc.h b/include/wx/xrc/xh_listc.h
index 5ca936f28bb1382ae8dfe35a4881647077aea254..ecb38b67615ac5b995fbc2573bce73705b36a423 100644 (file)
--- a/include/wx/xrc/xh_listc.h
+++ b/include/wx/xrc/xh_listc.h
@@ -16,6 +16,7 @@
 #if wxUSE_XRC && wxUSE_LISTCTRL
 
 class WXDLLIMPEXP_FWD_CORE wxListCtrl;
+class WXDLLIMPEXP_FWD_CORE wxListItem;
 
 class WXDLLIMPEXP_XRC wxListCtrlXmlHandler : public wxXmlResourceHandler
 {
@@ -25,8 +26,13 @@ public:
     virtual bool CanHandle(wxXmlNode *node);
 
 private:
-    long Handle_wxListItem();
-    wxObject* Handle_wxListCtrl();
+    // handlers for wxListCtrl itself and its listcol and listitem children
+    wxListCtrl *HandleListCtrl();
+    void HandleListCol();
+    void HandleListItem();
+
+    // common part to HandleList{Col,Item}()
+    void HandleCommonItemAttrs(wxListItem& item);
 
     // gets the items image index in the corresponding image list (normal if
     // which is wxIMAGE_LIST_NORMAL or small if it is wxIMAGE_LIST_SMALL)