X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/81ce36aa591e89a802e0d900ac3c4bdbbacce48c..54aa3821fc7c1df012efc5e5dd4a09ab5ed8d90d:/include/wx/generic/listctrl.h?ds=sidebyside diff --git a/include/wx/generic/listctrl.h b/include/wx/generic/listctrl.h index dbc93a9a85..0224f03c14 100644 --- a/include/wx/generic/listctrl.h +++ b/include/wx/generic/listctrl.h @@ -3,7 +3,7 @@ // Purpose: Generic list control // Author: Robert Roebling // Created: 01/02/97 -// Id: +// RCS-ID: $Id$ // Copyright: (c) 1998 Robert Roebling and Julian Smart // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -11,13 +11,13 @@ #ifndef __LISTCTRLH_G__ #define __LISTCTRLH_G__ -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) -#pragma interface "listctrl.h" -#endif - #include "wx/defs.h" #include "wx/object.h" +#ifdef __WXMAC__ +#include "wx/imaglist.h" +#else #include "wx/generic/imaglist.h" +#endif #include "wx/control.h" #include "wx/timer.h" @@ -25,6 +25,7 @@ #include "wx/scrolwin.h" #include "wx/settings.h" #include "wx/listbase.h" +#include "wx/textctrl.h" #if wxUSE_DRAG_AND_DROP class WXDLLEXPORT wxDropTarget; @@ -72,7 +73,7 @@ public: const wxSize &size = wxDefaultSize, long style = wxLC_ICON, const wxValidator& validator = wxDefaultValidator, - const wxString &name = wxT("listctrl") ) + const wxString &name = wxListCtrlNameStr) { Create(parent, winid, pos, size, style, validator, name); } @@ -84,7 +85,7 @@ public: const wxSize &size = wxDefaultSize, long style = wxLC_ICON, const wxValidator& validator = wxDefaultValidator, - const wxString &name = wxT("listctrl") ); + const wxString &name = wxListCtrlNameStr); bool GetColumn( int col, wxListItem& item ) const; bool SetColumn( int col, wxListItem& item ); @@ -98,7 +99,8 @@ public: long SetItem( long index, int col, const wxString& label, int imageId = -1 ); int GetItemState( long item, long stateMask ) const; bool SetItemState( long item, long state, long stateMask); - bool SetItemImage( long item, int image, int selImage); + bool SetItemImage( long item, int image, int selImage = -1 ); + bool SetItemColumnImage( long item, long column, int image ); wxString GetItemText( long item ) const; void SetItemText( long item, const wxString& str ); wxUIntPtr GetItemData( long item ) const; @@ -114,6 +116,8 @@ public: wxColour GetItemTextColour( long item ) const; void SetItemBackgroundColour( long item, const wxColour &col); wxColour GetItemBackgroundColour( long item ) const; + void SetItemFont( long item, const wxFont &f); + wxFont GetItemFont( long item ) const; int GetSelectedItemCount() const; wxColour GetTextColour() const; void SetTextColour(const wxColour& col); @@ -136,14 +140,16 @@ public: void SetItemCount(long count); - void EditLabel( long item ) { Edit(item); } - void Edit( long item ); + wxTextCtrl *EditLabel(long item, + wxClassInfo* textControlClass = CLASSINFO(wxTextCtrl)); + wxTextCtrl* GetEditControl() const; + void Edit( long item ) { EditLabel(item); } bool EnsureVisible( long item ); long FindItem( long start, const wxString& str, bool partial = false ); long FindItem( long start, wxUIntPtr data ); long FindItem( long start, const wxPoint& pt, int direction ); // not supported in wxGLC - long HitTest( const wxPoint& point, int& flags); + long HitTest( const wxPoint& point, int& flags, long *pSubItem = NULL ) const; long InsertItem(wxListItem& info); long InsertItem( long index, const wxString& label ); long InsertItem( long index, int imageIndex ); @@ -154,6 +160,8 @@ public: bool ScrollList( int dx, int dy ); bool SortItems( wxListCtrlCompare fn, long data ); bool Update( long item ); + // Must provide overload to avoid hiding it (and warnings about it) + virtual void Update() { wxControl::Update(); } // are we in report mode? bool InReportView() const { return HasFlag(wxLC_REPORT); } @@ -169,9 +177,10 @@ public: void RefreshItem(long item); void RefreshItems(long itemFrom, long itemTo); +#if WXWIN_COMPATIBILITY_2_6 // obsolete, don't use wxDEPRECATED( int GetItemSpacing( bool isSmall ) const ); - +#endif // WXWIN_COMPATIBILITY_2_6 virtual wxVisualAttributes GetDefaultAttributes() const { @@ -206,13 +215,9 @@ public: virtual wxDropTarget *GetDropTarget() const; #endif - virtual bool DoPopupMenu( wxMenu *menu, int x, int y ); - virtual bool ShouldInheritColours() const { return false; } virtual void SetFocus(); - virtual wxSize DoGetBestSize() const; - // implementation // -------------- @@ -227,12 +232,26 @@ public: wxCoord m_headerHeight; protected: + virtual bool DoPopupMenu( wxMenu *menu, int x, int y ); + + // take into account the coordinates difference between the container + // window and the list control window itself here + virtual void DoClientToScreen( int *x, int *y ) const; + virtual void DoScreenToClient( int *x, int *y ) const; + + virtual wxSize DoGetBestSize() 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 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; @@ -240,9 +259,6 @@ protected: friend class WXDLLEXPORT wxListMainWindow; private: - // Virtual function hiding supression - virtual void Update() { wxWindow::Update(); } - // create the header window void CreateHeaderWindow(); @@ -254,7 +270,7 @@ private: void ResizeReportView(bool showHeader); DECLARE_EVENT_TABLE() - DECLARE_DYNAMIC_CLASS(wxGenericListCtrl); + DECLARE_DYNAMIC_CLASS(wxGenericListCtrl) }; #if !defined(__WXMSW__) || defined(__WXUNIVERSAL__) @@ -275,7 +291,7 @@ public: const wxSize& size = wxDefaultSize, long style = wxLC_ICON, const wxValidator &validator = wxDefaultValidator, - const wxString &name = wxT("listctrl") ) + const wxString &name = wxListCtrlNameStr) : wxGenericListCtrl(parent, winid, pos, size, style, validator, name) { }