Upported combobox changes and another fix.

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

diff --git a/include/wx/msw/listctrl.h b/include/wx/msw/listctrl.h
index 47c58d65fe3c58fb076b746370c8222ee6c1bfe9..eaf82c0cd6b5b16c0cb79be16442531546f8f3c5 100644 (file)
--- a/include/wx/msw/listctrl.h
+++ b/include/wx/msw/listctrl.h
@@ -191,6 +191,14 @@ public:
     // view, otherwise the large icon view.
     int GetItemSpacing(bool isSmall) const;
 
+    // Foreground colour of an item.
+    void SetItemTextColour( long item, const wxColour& col);
+    wxColour GetItemTextColour( long item ) const;
+
+    // Background colour of an item.
+    void SetItemBackgroundColour( long item, const wxColour &col);
+    wxColour GetItemBackgroundColour( long item ) const;
+
     // Gets the number of selected items in the list control
     int GetSelectedItemCount() const;
 
@@ -348,8 +356,8 @@ protected:
     // common part of all ctors
     void Init();
 
-    // free memory taken by all attributes and recreate the hash table
-    void FreeAllAttrs(bool dontRecreate = FALSE);
+    // free memory taken by all internal data
+    void FreeAllInternalData();
 
     wxTextCtrl*       m_textCtrl;        // The control used for editing a label
     wxImageList *     m_imageListNormal; // The image list for normal icons
@@ -362,9 +370,12 @@ protected:
     long              m_baseStyle;  // Basic Windows style flags, for recreation purposes
     int               m_colCount;   // Windows doesn't have GetColumnCount so must
                                     // keep track of inserted/deleted columns
+    long              m_count;      // Keep track of item count to save calls to
+                                    // ListView_GetItemCount
+    bool              m_ignoreChangeMessages;
 
-    // the hash table we use for storing pointers to the items attributes
-    wxHashTable m_attrs;
+    // TRUE if we have any internal data (user data & attributes)
+    bool m_AnyInternalData;
 
     // TRUE if we have any items with custom attributes
     bool m_hasAnyAttr;
@@ -389,9 +400,10 @@ private:
 
     DECLARE_DYNAMIC_CLASS(wxListCtrl)
     DECLARE_EVENT_TABLE()
+    DECLARE_NO_COPY_CLASS(wxListCtrl)
 };
 
 #endif // wxUSE_LISTCTRL
 
-#endif
-    // _WX_LISTCTRL_H_
+#endif // _WX_LISTCTRL_H_
+