Corrected/added support for column headers with icon and text

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

diff --git a/include/wx/palmos/listctrl.h b/include/wx/palmos/listctrl.h
index 04baabc2e124ca2d0e35228df08679c75540c962..88372b49ade151a20dfbb0c70d2961c38730bdab 100644 (file)
--- a/include/wx/palmos/listctrl.h
+++ b/include/wx/palmos/listctrl.h
@@ -2,7 +2,7 @@
 // Name:        wx/palmos/listctrl.h
 // Purpose:     wxListCtrl class
 // Author:      William Osborne - minimal working wxPalmOS port
 // Name:        wx/palmos/listctrl.h
 // Purpose:     wxListCtrl class
 // Author:      William Osborne - minimal working wxPalmOS port

-// Modified by:
+// Modified by: Yunhui Fu

 // Created:     10/13/04
 // RCS-ID:      $Id$
 // Copyright:   (c) William Osborne
 // Created:     10/13/04
 // RCS-ID:      $Id$
 // Copyright:   (c) William Osborne


@@ -20,7 +20,7 @@
 #include "wx/textctrl.h"
 
 
 #include "wx/textctrl.h"
 
 

-class WXDLLEXPORT wxImageList;
+class WXDLLIMPEXP_FWD_CORE wxImageList;

 
 /*
     The wxListCtrl can show lists of items in four different modes:
 
 /*
     The wxListCtrl can show lists of items in four different modes:


@@ -73,7 +73,7 @@ class WXDLLEXPORT wxImageList;
 
  */
 
 
  */
 

-class WXDLLEXPORT wxListCtrl: public wxControl
+class WXDLLIMPEXP_CORE wxListCtrl: public wxControl

 {
 public:
     /*
 {
 public:
     /*


@@ -154,6 +154,7 @@ public:
 
     // Sets the item image
     bool SetItemImage(long item, int image, int selImage) ;
 
     // Sets the item image
     bool SetItemImage(long item, int image, int selImage) ;

+    bool SetItemColumnImage(long item, long column, int image);

 
     // Gets the item text
     wxString GetItemText(long item) const ;
 
     // Gets the item text
     wxString GetItemText(long item) const ;


@@ -165,7 +166,8 @@ public:
     long GetItemData(long item) const ;
 
     // Sets the item data
     long GetItemData(long item) const ;
 
     // Sets the item data

-    bool SetItemData(long item, long data) ;
+    bool SetItemPtrData(long item, wxUIntPtr data);
+    bool SetItemData(long item, long data) { return SetItemPtrData(item, data); }

 
     // Gets the item rectangle
     bool GetItemRect(long item, wxRect& rect, int code = wxLIST_RECT_BOUNDS) const ;
 
     // Gets the item rectangle
     bool GetItemRect(long item, wxRect& rect, int code = wxLIST_RECT_BOUNDS) const ;


@@ -374,7 +376,9 @@ 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;
 
     // return the attribute for the item (may return NULL if none)
     virtual int OnGetItemImage(long item) const;
 
     // return the attribute for the item (may return NULL if none)