include wx/arrstr.h as it's needed by wxImageHandler and may not be implicitly includ...

[wxWidgets.git] / include / wx / msw / listctrl.h

diff --git a/include/wx/msw/listctrl.h b/include/wx/msw/listctrl.h
index ea13f0b6a6806c9d45b08494d33c271e4477aa38..4309527a72eeab2e24c671e5a48ca730224a3b4d 100644 (file)
--- a/include/wx/msw/listctrl.h
+++ b/include/wx/msw/listctrl.h
@@ -14,8 +14,10 @@
 
 #include "wx/textctrl.h"
 #include "wx/dynarray.h"
 
 #include "wx/textctrl.h"
 #include "wx/dynarray.h"

+#include "wx/vector.h"

 
 class WXDLLIMPEXP_FWD_CORE wxImageList;
 
 class WXDLLIMPEXP_FWD_CORE wxImageList;

+class wxMSWListItemData;

 
 // define this symbol to indicate the availability of SetColumnsOrder() and
 // related functions
 
 // define this symbol to indicate the availability of SetColumnsOrder() and
 // related functions


@@ -353,7 +355,7 @@ public:
     // or zero if the two items are equivalent.
 
     // data is arbitrary data to be passed to the sort function.
     // or zero if the two items are equivalent.
 
     // data is arbitrary data to be passed to the sort function.

-    bool SortItems(wxListCtrlCompare fn, long data);
+    bool SortItems(wxListCtrlCompare fn, wxIntPtr data);

 
     // IMPLEMENTATION
     virtual bool MSWCommand(WXUINT param, WXWORD id);
 
     // IMPLEMENTATION
     virtual bool MSWCommand(WXUINT param, WXWORD id);


@@ -400,9 +402,12 @@ protected:
     // free memory taken by all internal data
     void FreeAllInternalData();
 
     // free memory taken by all internal data
     void FreeAllInternalData();
 

+    // get the internal data object for this item (may return NULL)
+    wxMSWListItemData *MSWGetItemData(long item) const;
+

     // get the item attribute, either by quering it for virtual control, or by
     // returning the one previously set using setter methods for a normal one
     // get the item attribute, either by quering it for virtual control, or by
     // returning the one previously set using setter methods for a normal one

-    wxListItemAttr *DoGetItemAttr(long item) const;
+    wxListItemAttr *DoGetItemColumnAttr(long item, long column) const;

 
 
     wxTextCtrl*       m_textCtrl;        // The control used for editing a label
 
 
     wxTextCtrl*       m_textCtrl;        // The control used for editing a label


@@ -417,10 +422,9 @@ protected:
                                     // keep track of inserted/deleted columns
     long              m_count;      // Keep track of item count to save calls to
                                     // ListView_GetItemCount
                                     // keep track of inserted/deleted columns
     long              m_count;      // Keep track of item count to save calls to
                                     // ListView_GetItemCount

-    bool              m_ignoreChangeMessages;

 
 

-    // true if we have any internal data (user data & attributes)
-    bool m_AnyInternalData;
+    // all wxMSWListItemData objects we use
+    wxVector<wxMSWListItemData *> m_internalData;

 
     // true if we have any items with custom attributes
     bool m_hasAnyAttr;
 
     // true if we have any items with custom attributes
     bool m_hasAnyAttr;


@@ -442,6 +446,12 @@ protected:
     // return the attribute for the item (may return NULL if none)
     virtual wxListItemAttr *OnGetItemAttr(long item) const;
 
     // return the attribute for the item (may return NULL if none)
     virtual wxListItemAttr *OnGetItemAttr(long item) const;
 

+    // return the attribute for the given item and column (may return NULL if none)
+    virtual wxListItemAttr *OnGetItemColumnAttr(long item, long WXUNUSED(column)) const
+    {
+        return OnGetItemAttr(item);
+    }
+

 private:
     // process NM_CUSTOMDRAW notification message
     WXLPARAM OnCustomDraw(WXLPARAM lParam);
 private:
     // process NM_CUSTOMDRAW notification message
     WXLPARAM OnCustomDraw(WXLPARAM lParam);


@@ -459,7 +469,7 @@ private:
 
     DECLARE_DYNAMIC_CLASS(wxListCtrl)
     DECLARE_EVENT_TABLE()
 
     DECLARE_DYNAMIC_CLASS(wxListCtrl)
     DECLARE_EVENT_TABLE()

-    DECLARE_NO_COPY_CLASS(wxListCtrl)
+    wxDECLARE_NO_COPY_CLASS(wxListCtrl);

 };
 
 #endif // _WX_LISTCTRL_H_
 };
 
 #endif // _WX_LISTCTRL_H_