From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Sat, 25 Mar 2006 03:14:13 +0000 (+0000)
Subject: re-fix operator?: involving wxNodes and compatibility_iterators
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/e633eb2f36ebdfafffbbf6b4cc0f5ae6e498b54e?ds=inline

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 13ba039b27..c77350cc1e 100644
--- 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