X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/52f2ad0899c3e625b6ae1449524993ed8be39d7a..a4301b8f14d21b7d28fc4f6a247b740d945ca6dc:/include/wx/os2/listctrl.h?ds=inline diff --git a/include/wx/os2/listctrl.h b/include/wx/os2/listctrl.h index e2400943dd..8514bf5c5d 100644 --- a/include/wx/os2/listctrl.h +++ b/include/wx/os2/listctrl.h @@ -1,9 +1,9 @@ /////////////////////////////////////////////////////////////////////////////// // Name: wx/os2/listctrl.h // Purpose: wxListCtrl class -// Author: +// Author: // Modified by: -// Created: +// Created: // RCS-ID: $Id$ // Copyright: (c) wxWidgets team // Licence: wxWindows licence @@ -12,10 +12,6 @@ #ifndef _WX_LISTCTRL_H_ #define _WX_LISTCTRL_H_ -#ifdef __GNUG__ - #pragma interface "listctrl.h" -#endif - #if wxUSE_LISTCTRL #include "wx/control.h" @@ -24,11 +20,11 @@ #include "wx/textctrl.h" -class WXDLLEXPORT wxImageList; +class WXDLLIMPEXP_FWD_CORE wxImageList; typedef int (wxCALLBACK *wxListCtrlCompare)(long lItem1, long lItem2, long lSortData); -class WXDLLEXPORT wxListCtrl: public wxControl +class WXDLLIMPEXP_CORE wxListCtrl: public wxControl { public: wxListCtrl() { Init(); } @@ -137,6 +133,10 @@ public: ,int nImage ,int lSelImage ); + bool SetItemColumnImage( long lItem + ,long lColumn + ,int nImage + ); // // Item text @@ -150,9 +150,8 @@ public: // Item data // long GetItemData(long lItem) const; - bool SetItemData( long lItem - ,long lData - ); + bool SetItemPtrData(long item, wxUIntPtr data); + bool SetItemData(long item, long data) { return SetItemPtrData(item, data); } // // Gets the item rectangle @@ -309,7 +308,7 @@ public: // Edit the label // wxTextCtrl* EditLabel( long lItem - ,wxClassInfo* pTextControlClass = CLASSINFO(wxTextCtrl) + ,wxClassInfo* pTextControlClass = wxCLASSINFO(wxTextCtrl) ); // @@ -507,10 +506,17 @@ protected: ) 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 lItem) const; + // + // Return the icon for the given item and column + // + virtual int OnGetItemColumnImage(long lItem, long lColumn) const; + // // Return the attribute for the item (may return NULL if none) // @@ -525,7 +531,7 @@ private: DECLARE_DYNAMIC_CLASS(wxListCtrl) DECLARE_EVENT_TABLE() - DECLARE_NO_COPY_CLASS(wxListCtrl) + wxDECLARE_NO_COPY_CLASS(wxListCtrl); }; // end of CLASS wxListCtrl #endif // wxUSE_LISTCTRL