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

moved wxNotebook::HitTest() to the base book control class; implemented it for wxList/Treebook

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@39339 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2006-05-26 02:09:44 +00:00
parent 61d702d9e6
commit 851b88c310
5 changed files with 63 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
src/generic/treebkg.cpp
View File

@@ -650,6 +650,20 @@ int wxTreebook::DoSetSelection(size_t pagePos)
return oldSel;
}
wxTreebookPage *wxTreebook::DoGetCurrentPage() const
{
if ( m_selection == wxNOT_FOUND )
return NULL;
wxTreebookPage *page = wxBookCtrlBase::GetPage(m_selection);
if ( !page && m_actualSelection != wxNOT_FOUND )
{
page = wxBookCtrlBase::GetPage(m_actualSelection);
}
return page;
}
void wxTreebook::SetImageList(wxImageList *imageList)
{
wxBookCtrlBase::SetImageList(imageList);
@@ -709,18 +723,25 @@ void wxTreebook::OnTreeNodeExpandedCollapsed(wxTreeEvent & event)
// wxTreebook geometry management
// ----------------------------------------------------------------------------
wxTreebookPage * wxTreebook::DoGetCurrentPage() const
int wxTreebook::HitTest(wxPoint const & pt, long * WXUNUSED(flags)) const
{
if ( m_selection == wxNOT_FOUND )
return NULL;
int pagePos = wxNOT_FOUND;
wxTreebookPage *page = wxBookCtrlBase::GetPage(m_selection);
if ( !page && m_actualSelection != wxNOT_FOUND )
wxTreeCtrl * const tree = GetTreeCtrl();
const wxPoint treePt = ClientToScreen(tree->ScreenToClient(pt));
if ( wxRect(tree->GetSize()).Inside(treePt) )
{
page = wxBookCtrlBase::GetPage(m_actualSelection);
int flagsTree;
wxTreeItemId id = tree->HitTest(treePt, flagsTree);
if ( id.IsOk() && (flagsTree & wxTREE_HITTEST_ONITEM) )
{
pagePos = DoInternalFindPageById(id);
}
}
return page;
return pagePos;
}
#endif // wxUSE_TREEBOOK