X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/0188c7023303963bac25241ebc26575b49fd7156..d32011d4064f1411280b5708562cce86bd6d12ec:/include/wx/listctrl.h diff --git a/include/wx/listctrl.h b/include/wx/listctrl.h index f0630f8a8f..b6ee6e27ef 100644 --- a/include/wx/listctrl.h +++ b/include/wx/listctrl.h @@ -362,8 +362,8 @@ public: wxListEvent(wxEventType commandType = wxEVT_NULL, int id = 0); int m_code; + long m_oldItemIndex; // only for wxEVT_COMMAND_LIST_CACHE_HINT long m_itemIndex; - long m_oldItemIndex; int m_col; bool m_cancelled; wxPoint m_pointDrag; @@ -372,8 +372,6 @@ public: int GetCode() const { return m_code; } long GetIndex() const { return m_itemIndex; } - long GetOldIndex() const { return m_oldItemIndex; } - long GetOldItem() const { return m_oldItemIndex; } int GetColumn() const { return m_col; } bool Cancelled() const { return m_cancelled; } wxPoint GetPoint() const { return m_pointDrag; } @@ -388,6 +386,12 @@ public: long GetCacheFrom() const { return m_oldItemIndex; } long GetCacheTo() const { return m_itemIndex; } + // these methods don't do anything at all +#if WXWIN_COMPATIBILITY_2_2 + long GetOldIndex() const { return 0; } + long GetOldItem() const { return 0; } +#endif // WXWIN_COMPATIBILITY_2_2 + void CopyObject(wxObject& object_dest) const; private: @@ -420,6 +424,7 @@ BEGIN_DECLARE_EVENT_TYPES() DECLARE_EVENT_TYPE(wxEVT_COMMAND_LIST_COL_BEGIN_DRAG, 718) DECLARE_EVENT_TYPE(wxEVT_COMMAND_LIST_COL_DRAGGING, 719) DECLARE_EVENT_TYPE(wxEVT_COMMAND_LIST_COL_END_DRAG, 720) + DECLARE_EVENT_TYPE(wxEVT_COMMAND_LIST_ITEM_FOCUSED, 721) END_DECLARE_EVENT_TYPES() typedef void (wxEvtHandler::*wxListEventFunction)(wxListEvent&); @@ -446,6 +451,7 @@ typedef void (wxEvtHandler::*wxListEventFunction)(wxListEvent&); #define EVT_LIST_ITEM_RIGHT_CLICK(id, fn) DECLARE_EVENT_TABLE_ENTRY( wxEVT_COMMAND_LIST_ITEM_RIGHT_CLICK, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxListEventFunction) & fn, (wxObject *) NULL ), #define EVT_LIST_ITEM_MIDDLE_CLICK(id, fn) DECLARE_EVENT_TABLE_ENTRY( wxEVT_COMMAND_LIST_ITEM_MIDDLE_CLICK, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxListEventFunction) & fn, (wxObject *) NULL ), #define EVT_LIST_ITEM_ACTIVATED(id, fn) DECLARE_EVENT_TABLE_ENTRY( wxEVT_COMMAND_LIST_ITEM_ACTIVATED, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxListEventFunction) & fn, (wxObject *) NULL ), +#define EVT_LIST_ITEM_FOCUSED(id, fn) DECLARE_EVENT_TABLE_ENTRY( wxEVT_COMMAND_LIST_ITEM_FOCUSED, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxListEventFunction) & fn, (wxObject *) NULL ), #define EVT_LIST_CACHE_HINT(id, fn) DECLARE_EVENT_TABLE_ENTRY( wxEVT_COMMAND_LIST_CACHE_HINT, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxListEventFunction) & fn, (wxObject *) NULL ),