From 93daabe060101c5609e32fe667b411cd14a705f2 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Wed, 7 Mar 2007 19:23:13 +0000 Subject: [PATCH] removed WXWIN_COMPATIBILITY_2_4 git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44632 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- samples/listctrl/listtest.cpp | 39 ----------------------------------- samples/listctrl/listtest.h | 4 ---- 2 files changed, 43 deletions(-) diff --git a/samples/listctrl/listtest.cpp b/samples/listctrl/listtest.cpp index cc6106c9bf..864a49dbfb 100644 --- a/samples/listctrl/listtest.cpp +++ b/samples/listctrl/listtest.cpp @@ -105,10 +105,6 @@ BEGIN_EVENT_TABLE(MyListCtrl, wxListCtrl) EVT_LIST_END_LABEL_EDIT(LIST_CTRL, MyListCtrl::OnEndLabelEdit) EVT_LIST_DELETE_ITEM(LIST_CTRL, MyListCtrl::OnDeleteItem) EVT_LIST_DELETE_ALL_ITEMS(LIST_CTRL, MyListCtrl::OnDeleteAllItems) -#if WXWIN_COMPATIBILITY_2_4 - EVT_LIST_GET_INFO(LIST_CTRL, MyListCtrl::OnGetInfo) - EVT_LIST_SET_INFO(LIST_CTRL, MyListCtrl::OnSetInfo) -#endif EVT_LIST_ITEM_SELECTED(LIST_CTRL, MyListCtrl::OnSelected) EVT_LIST_ITEM_DESELECTED(LIST_CTRL, MyListCtrl::OnDeselected) EVT_LIST_KEY_DOWN(LIST_CTRL, MyListCtrl::OnListKeyDown) @@ -843,41 +839,6 @@ void MyListCtrl::OnDeleteAllItems(wxListEvent& event) LogEvent(event, _T("OnDeleteAllItems")); } -#if WXWIN_COMPATIBILITY_2_4 -void MyListCtrl::OnGetInfo(wxListEvent& event) -{ - wxString msg; - - msg << _T("OnGetInfo (") << event.m_item.m_itemId << _T(", ") << event.m_item.m_col << _T(")"); - if ( event.m_item.m_mask & wxLIST_MASK_STATE ) - msg << _T(" wxLIST_MASK_STATE"); - if ( event.m_item.m_mask & wxLIST_MASK_TEXT ) - msg << _T(" wxLIST_MASK_TEXT"); - if ( event.m_item.m_mask & wxLIST_MASK_IMAGE ) - msg << _T(" wxLIST_MASK_IMAGE"); - if ( event.m_item.m_mask & wxLIST_MASK_DATA ) - msg << _T(" wxLIST_MASK_DATA"); - if ( event.m_item.m_mask & wxLIST_SET_ITEM ) - msg << _T(" wxLIST_SET_ITEM"); - if ( event.m_item.m_mask & wxLIST_MASK_WIDTH ) - msg << _T(" wxLIST_MASK_WIDTH"); - if ( event.m_item.m_mask & wxLIST_MASK_FORMAT ) - msg << _T(" wxLIST_MASK_WIDTH"); - - if ( event.m_item.m_mask & wxLIST_MASK_TEXT ) - { - event.m_item.m_text = _T("My callback text"); - } - - wxLogMessage(msg); -} - -void MyListCtrl::OnSetInfo(wxListEvent& event) -{ - LogEvent(event, _T("OnSetInfo")); -} -#endif - void MyListCtrl::OnSelected(wxListEvent& event) { LogEvent(event, _T("OnSelected")); diff --git a/samples/listctrl/listtest.h b/samples/listctrl/listtest.h index 03ce8f19d0..abc2db98bf 100644 --- a/samples/listctrl/listtest.h +++ b/samples/listctrl/listtest.h @@ -59,10 +59,6 @@ public: void OnEndLabelEdit(wxListEvent& event); void OnDeleteItem(wxListEvent& event); void OnDeleteAllItems(wxListEvent& event); -#if WXWIN_COMPATIBILITY_2_4 - void OnGetInfo(wxListEvent& event); - void OnSetInfo(wxListEvent& event); -#endif void OnSelected(wxListEvent& event); void OnDeselected(wxListEvent& event); void OnListKeyDown(wxListEvent& event); -- 2.47.2