Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove the unused code instead of commenting it out.

Browse Source 
Just clean up the fixes of r74197.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74233 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2013-06-13 13:58:15 +00:00
parent 2e1e56d0ce
commit 56d85ddeec
2 changed files with 0 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
include/wx/generic/listctrl.h
View File

@@ -211,11 +211,6 @@ protected:
virtual bool DoPopupMenu( wxMenu *menu, int x, int y ); 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; virtual wxSize DoGetBestClientSize() const;
// return the text for the given column of the given item // return the text for the given column of the given item

28
src/generic/listctrl.cpp
View File

@@ -5299,34 +5299,6 @@ bool wxGenericListCtrl::DoPopupMenu( wxMenu *menu, int x, int y )
#endif #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 wxSize wxGenericListCtrl::DoGetBestClientSize() const
{ {
// The base class version can compute the best size in report view only. // The base class version can compute the best size in report view only.