From 56d85ddeece939e0d2cf602a45286e8368544320 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Thu, 13 Jun 2013 13:58:15 +0000 Subject: [PATCH] Remove the unused code instead of commenting it out. Just clean up the fixes of r74197. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74233 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/generic/listctrl.h | 5 ----- src/generic/listctrl.cpp | 28 ---------------------------- 2 files changed, 33 deletions(-) diff --git a/include/wx/generic/listctrl.h b/include/wx/generic/listctrl.h index 7caa1fc14f..b824b4f008 100644 --- a/include/wx/generic/listctrl.h +++ b/include/wx/generic/listctrl.h @@ -211,11 +211,6 @@ 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 DoGetBestClientSize() const; // return the text for the given column of the given item diff --git a/src/generic/listctrl.cpp b/src/generic/listctrl.cpp index 1ababf3a26..6575083534 100644 --- a/src/generic/listctrl.cpp +++ b/src/generic/listctrl.cpp @@ -5299,34 +5299,6 @@ bool wxGenericListCtrl::DoPopupMenu( wxMenu *menu, int x, int y ) #endif } -void wxGenericListCtrl::DoClientToScreen( int *x, int *y ) const -{ - // having (0,0) at the origin of the m_mainWin seems wrong compared to - // the other code like in Refresh -#if 0 - // It's not clear whether this can be called before m_mainWin is created - // but it seems better to be on the safe side and check. - if ( m_mainWin ) - m_mainWin->DoClientToScreen(x, y); - else -#endif - wxListCtrlBase::DoClientToScreen(x, y); -} - -void wxGenericListCtrl::DoScreenToClient( int *x, int *y ) const -{ - // having (0,0) at the origin of the m_mainWin seems wrong compared to - // the other code like in Refresh -#if 0 - // At least in wxGTK/Univ build this method can be called before m_mainWin - // is created so avoid crashes in this case. - if ( m_mainWin ) - m_mainWin->DoScreenToClient(x, y); - else -#endif - wxListCtrlBase::DoScreenToClient(x, y); -} - wxSize wxGenericListCtrl::DoGetBestClientSize() const { // The base class version can compute the best size in report view only. -- 2.45.2