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

diff --git a/src/univ/menu.cpp b/src/univ/menu.cpp
index 13ba039b2759ca3a851e8f66b280383e5396e839..c77350cc1e7b9c1f162027b3cdb64cede6831b3c 100644 (file)
--- a/src/univ/menu.cpp
+++ b/src/univ/menu.cpp
@@ -375,7 +375,7 @@ wxMenuItemIter wxPopupMenuWindow::GetPrevNode() const
 {
     // return the last node if there had been no previously selected one
     return m_nodeCurrent ? GetPrevNode(m_nodeCurrent)
-                         : m_menu->GetMenuItems().GetLast();
+                         : wxMenuItemIter(m_menu->GetMenuItems().GetLast());
 }
 
 wxMenuItemIter
@@ -398,7 +398,7 @@ wxMenuItemIter wxPopupMenuWindow::GetNextNode() const
 {
     // return the first node if there had been no previously selected one
     return m_nodeCurrent ? GetNextNode(m_nodeCurrent)
-                         : m_menu->GetMenuItems().GetFirst();
+                         : wxMenuItemIter(m_menu->GetMenuItems().GetFirst());
 }
 
 wxMenuItemIter