X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/26df5dd39a8c09397b19cd98ea51600af5a1dea4..8e77fd8bca165aab9709649d79a7cbc6a172d4e1:/include/wx/generic/listctrl.h diff --git a/include/wx/generic/listctrl.h b/include/wx/generic/listctrl.h index 63de1ff1ac..b824b4f008 100644 --- a/include/wx/generic/listctrl.h +++ b/include/wx/generic/listctrl.h @@ -11,11 +11,10 @@ #ifndef _WX_GENERIC_LISTCTRL_H_ #define _WX_GENERIC_LISTCTRL_H_ +#include "wx/containr.h" #include "wx/scrolwin.h" #include "wx/textctrl.h" -class WXDLLIMPEXP_FWD_CORE wxImageList; - #if wxUSE_DRAG_AND_DROP class WXDLLIMPEXP_FWD_CORE wxDropTarget; #endif @@ -31,7 +30,7 @@ class WXDLLIMPEXP_FWD_CORE wxListMainWindow; // wxListCtrl //----------------------------------------------------------------------------- -class WXDLLIMPEXP_CORE wxGenericListCtrl: public wxListCtrlBase, +class WXDLLIMPEXP_CORE wxGenericListCtrl: public wxNavigationEnabled, public wxScrollHelper { public: @@ -66,7 +65,7 @@ public: const wxString &name = wxListCtrlNameStr); bool GetColumn( int col, wxListItem& item ) const; - bool SetColumn( int col, wxListItem& item ); + bool SetColumn( int col, const wxListItem& item ); int GetColumnWidth( int col ) const; bool SetColumnWidth( int col, int width); int GetCountPerPage() const; // not the same in wxGLC as in Windows, I think @@ -134,18 +133,9 @@ public: long InsertItem( long index, const wxString& label ); long InsertItem( long index, int imageIndex ); long InsertItem( long index, const wxString& label, int imageIndex ); - long InsertColumn( long col, wxListItem& info ); - long InsertColumn( long col, const wxString& heading, - int format = wxLIST_FORMAT_LEFT, int width = -1 ); bool ScrollList( int dx, int dy ); bool SortItems( wxListCtrlCompare fn, wxIntPtr data ); - // are we in report mode? - bool InReportView() const { return HasFlag(wxLC_REPORT); } - - // are we in virtual report mode? - bool IsVirtual() const { return HasFlag(wxLC_VIRTUAL); } - // do we have a header window? bool HasHeader() const { return InReportView() && !HasFlag(wxLC_NO_HEADER); } @@ -154,6 +144,8 @@ public: void RefreshItem(long item); void RefreshItems(long itemFrom, long itemTo); + virtual void EnableBellOnNoMatch(bool on = true); + #if WXWIN_COMPATIBILITY_2_6 // obsolete, don't use wxDEPRECATED( int GetItemSpacing( bool isSmall ) const ); @@ -199,7 +191,6 @@ public: #endif virtual bool ShouldInheritColours() const { return false; } - virtual void SetFocus(); // implementation // -------------- @@ -214,12 +205,11 @@ public: wxListMainWindow *m_mainWin; protected: - virtual bool DoPopupMenu( wxMenu *menu, int x, int y ); + // Implement base class pure virtual methods. + long DoInsertColumn(long col, const wxListItem& info); + - // 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 bool DoPopupMenu( wxMenu *menu, int x, int y ); virtual wxSize DoGetBestClientSize() const; @@ -234,9 +224,6 @@ protected: // 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; - // it calls our OnGetXXX() functions friend class WXDLLIMPEXP_FWD_CORE wxListMainWindow;