X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/27b436242eb0257ef471839961250bb3f184fafc..87419e97c6f15a9906de69690e7ba59ec0ffd119:/src/univ/menu.cpp diff --git a/src/univ/menu.cpp b/src/univ/menu.cpp index 13ba039b27..57e7fda1c5 100644 --- a/src/univ/menu.cpp +++ b/src/univ/menu.cpp @@ -32,12 +32,12 @@ #include "wx/settings.h" #include "wx/accel.h" #include "wx/log.h" + #include "wx/frame.h" + #include "wx/dcclient.h" #endif // WX_PRECOMP #include "wx/popupwin.h" #include "wx/evtloop.h" -#include "wx/dcclient.h" -#include "wx/frame.h" #include "wx/univ/renderer.h" @@ -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