X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/324eeecb3cdc9522e136af6670443148772b412a..f1a73c6a816aeba155e88c628a0a778a2fe068bd:/include/wx/palmos/listctrl.h diff --git a/include/wx/palmos/listctrl.h b/include/wx/palmos/listctrl.h index 7f4271c3f4..91a6eaf5e4 100644 --- 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 -// Modified by: +// Modified by: Yunhui Fu // Created: 10/13/04 // RCS-ID: $Id$ // Copyright: (c) William Osborne @@ -12,10 +12,6 @@ #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" @@ -24,7 +20,7 @@ #include "wx/textctrl.h" -class WXDLLEXPORT wxImageList; +class WXDLLIMPEXP_FWD_CORE wxImageList; /* The wxListCtrl can show lists of items in four different modes: @@ -77,7 +73,7 @@ class WXDLLEXPORT wxImageList; */ -class WXDLLEXPORT wxListCtrl: public wxControl +class WXDLLIMPEXP_CORE wxListCtrl: public wxControl { public: /* @@ -158,6 +154,7 @@ public: // 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 ; @@ -169,7 +166,8 @@ public: 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 ; @@ -378,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 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) @@ -388,7 +388,7 @@ private: DECLARE_DYNAMIC_CLASS(wxListCtrl) DECLARE_EVENT_TABLE() - DECLARE_NO_COPY_CLASS(wxListCtrl) + wxDECLARE_NO_COPY_CLASS(wxListCtrl); }; #endif // wxUSE_LISTCTRL