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 25847467f1c1d75dab6fc299864f342eb7dbf747..ecb38b67615ac5b995fbc2573bce73705b36a423 100644 (file)
--- a/include/wx/xrc/xh_listc.h
+++ b/include/wx/xrc/xh_listc.h
@@ -15,14 +15,30 @@
 
 #if wxUSE_XRC && wxUSE_LISTCTRL
 
 
 #if wxUSE_XRC && wxUSE_LISTCTRL
 

+class WXDLLIMPEXP_FWD_CORE wxListCtrl;
+class WXDLLIMPEXP_FWD_CORE wxListItem;
+

 class WXDLLIMPEXP_XRC wxListCtrlXmlHandler : public wxXmlResourceHandler
 {
 class WXDLLIMPEXP_XRC wxListCtrlXmlHandler : public wxXmlResourceHandler
 {

-    DECLARE_DYNAMIC_CLASS(wxListCtrlXmlHandler)
-

 public:
     wxListCtrlXmlHandler();
     virtual wxObject *DoCreateResource();
     virtual bool CanHandle(wxXmlNode *node);
 public:
     wxListCtrlXmlHandler();
     virtual wxObject *DoCreateResource();
     virtual bool CanHandle(wxXmlNode *node);

+
+private:
+    // 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)
+    long GetImageIndex(wxListCtrl *listctrl, int which);
+
+    DECLARE_DYNAMIC_CLASS(wxListCtrlXmlHandler)

 };
 
 #endif // wxUSE_XRC && wxUSE_LISTCTRL
 };
 
 #endif // wxUSE_XRC && wxUSE_LISTCTRL