re-fix operator?: involving wxNodes and compatibility_iterators
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38360 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -375,7 +375,7 @@ wxMenuItemIter wxPopupMenuWindow::GetPrevNode() const
|
|||||||
{
|
{
|
||||||
// return the last node if there had been no previously selected one
|
// return the last node if there had been no previously selected one
|
||||||
return m_nodeCurrent ? GetPrevNode(m_nodeCurrent)
|
return m_nodeCurrent ? GetPrevNode(m_nodeCurrent)
|
||||||
: m_menu->GetMenuItems().GetLast();
|
: wxMenuItemIter(m_menu->GetMenuItems().GetLast());
|
||||||
}
|
}
|
||||||
|
|
||||||
wxMenuItemIter
|
wxMenuItemIter
|
||||||
@@ -398,7 +398,7 @@ wxMenuItemIter wxPopupMenuWindow::GetNextNode() const
|
|||||||
{
|
{
|
||||||
// return the first node if there had been no previously selected one
|
// return the first node if there had been no previously selected one
|
||||||
return m_nodeCurrent ? GetNextNode(m_nodeCurrent)
|
return m_nodeCurrent ? GetNextNode(m_nodeCurrent)
|
||||||
: m_menu->GetMenuItems().GetFirst();
|
: wxMenuItemIter(m_menu->GetMenuItems().GetFirst());
|
||||||
}
|
}
|
||||||
|
|
||||||
wxMenuItemIter
|
wxMenuItemIter
|
||||||
|
Reference in New Issue
Block a user