Fixed interpretation of selection and added selection/check notification

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

diff --git a/include/wx/msw/listctrl.h b/include/wx/msw/listctrl.h
index eb08f739c0c0d4c4786fa1a3f9ca34867065fb9e..cb2f5cac3dd41aa23591947bee7e9e2173689d9b 100644 (file)
--- a/include/wx/msw/listctrl.h
+++ b/include/wx/msw/listctrl.h
@@ -12,10 +12,6 @@
 #ifndef _WX_LISTCTRL_H_
 #define _WX_LISTCTRL_H_
 
 #ifndef _WX_LISTCTRL_H_
 #define _WX_LISTCTRL_H_
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-    #pragma interface "listctrl.h"
-#endif
-

 #if wxUSE_LISTCTRL
 
 #include "wx/control.h"
 #if wxUSE_LISTCTRL
 
 #include "wx/control.h"


@@ -124,7 +120,7 @@ public:
     bool GetColumn(int col, wxListItem& item) const;
 
     // Sets information about this column
     bool GetColumn(int col, wxListItem& item) const;
 
     // Sets information about this column

-    bool SetColumn(int col, wxListItem& item) ;
+    bool SetColumn(int col, const wxListItem& item) ;

 
     // Gets the column width
     int GetColumnWidth(int col) const;
 
     // Gets the column width
     int GetColumnWidth(int col) const;


@@ -200,11 +196,9 @@ public:
     void SetItemBackgroundColour( long item, const wxColour &col);
     wxColour GetItemBackgroundColour( long item ) const;
 
     void SetItemBackgroundColour( long item, const wxColour &col);
     wxColour GetItemBackgroundColour( long item ) const;
 

-#if wxABI_VERSION >= 20602

     // Font of an item.
     void SetItemFont( long item, const wxFont &f);
     wxFont GetItemFont( long item ) const;
     // Font of an item.
     void SetItemFont( long item, const wxFont &f);
     wxFont GetItemFont( long item ) const;

-#endif

 
     // Gets the number of selected items in the list control
     int GetSelectedItemCount() const;
 
     // Gets the number of selected items in the list control
     int GetSelectedItemCount() const;


@@ -302,7 +296,7 @@ public:
 
     // Inserts an item, returning the index of the new item if successful,
     // -1 otherwise.
 
     // Inserts an item, returning the index of the new item if successful,
     // -1 otherwise.

-    long InsertItem(wxListItem& info);
+    long InsertItem(const wxListItem& info);

 
     // Insert a string item
     long InsertItem(long index, const wxString& label);
 
     // Insert a string item
     long InsertItem(long index, const wxString& label);


@@ -314,7 +308,7 @@ public:
     long InsertItem(long index, const wxString& label, int imageIndex);
 
     // For list view mode (only), inserts a column.
     long InsertItem(long index, const wxString& label, int imageIndex);
 
     // For list view mode (only), inserts a column.

-    long InsertColumn(long col, wxListItem& info);
+    long InsertColumn(long col, const wxListItem& info);

 
     long InsertColumn(long col,
                       const wxString& heading,
 
     long InsertColumn(long col,
                       const wxString& heading,


@@ -371,13 +365,6 @@ public:
     // obsolete stuff, for compatibility only -- don't use
     wxDEPRECATED( int GetItemSpacing(bool isSmall) const);
 
     // obsolete stuff, for compatibility only -- don't use
     wxDEPRECATED( int GetItemSpacing(bool isSmall) const);
 

-protected:
-    // common part of all ctors
-    void Init();
-
-    // free memory taken by all internal data
-    void FreeAllInternalData();
-

     // convert our styles to Windows
     virtual WXDWORD MSWGetStyle(long style, WXDWORD *exstyle) const;
 
     // convert our styles to Windows
     virtual WXDWORD MSWGetStyle(long style, WXDWORD *exstyle) const;
 


@@ -386,6 +373,17 @@ protected:
                                     WXWPARAM wParam,
                                     WXLPARAM lParam);
 
                                     WXWPARAM wParam,
                                     WXLPARAM lParam);
 

+protected:
+    // common part of all ctors
+    void Init();
+
+    // free memory taken by all internal data
+    void FreeAllInternalData();
+
+    // 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;
+

 
     wxTextCtrl*       m_textCtrl;        // The control used for editing a label
     wxImageList *     m_imageListNormal; // The image list for normal icons
 
     wxTextCtrl*       m_textCtrl;        // The control used for editing a label
     wxImageList *     m_imageListNormal; // The image list for normal icons


@@ -413,9 +411,14 @@ protected:
     // return the text for the given column of the given item
     virtual wxString OnGetItemText(long item, long column) const;
 
     // return the text for the given column of the given item
     virtual wxString OnGetItemText(long item, long column) const;
 

-    // return the icon for the given item
+    // return the icon for the given item. In report view, OnGetItemImage will
+    // only be called for the first column. See OnGetItemColumnImage for 
+    // details.

     virtual int OnGetItemImage(long item) const;
 
     virtual int OnGetItemImage(long item) const;
 

+    // return the icon for the given item and column.
+    virtual int OnGetItemColumnImage(long item, long column) const;
+

     // 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;